Fix invalid rotation vector variable name

-It just changes the name. There is no effect on the behavior.

Change-Id: I744e88d32c7a7a4aa8028ee346285e0557a817e1
Signed-off-by: TaeminYeom <taemin.yeom@samsung.com>

diff --git a/src/fusion-sensor/rotation_vector/gyro_rv_sensor.cpp b/src/fusion-sensor/rotation_vector/gyro_rv_sensor.cpp
index a3057766973e404098670c93ab1eafbdf2b236ec..6f6d842dd98244ce42e5373c7e3062ef620420df 100644 (file)
--- a/src/fusion-sensor/rotation_vector/gyro_rv_sensor.cpp
+++ b/src/fusion-sensor/rotation_vector/gyro_rv_sensor.cpp
@@ -89,7 +89,7 @@ int gyro_rv_sensor::update(uint32_t id, sensor_data_t *data, int len)
        else if (id == SRC_ID_GYRO)
                m_fusion.push_gyro(*data);
 
-       if (!m_fusion.get_rv(timestamp, m_w, m_x, m_y, m_z))
+       if (!m_fusion.get_rv(timestamp, m_x, m_y, m_z, m_w))
                return OP_ERROR;
 
        if (timestamp == m_time)
@@ -116,10 +116,10 @@ int gyro_rv_sensor::get_data(sensor_data_t **data, int *length)
        sensor_data->accuracy = m_accuracy;
        sensor_data->timestamp = m_time;
        sensor_data->value_count = 4;
-       sensor_data->values[0] = m_w;
-       sensor_data->values[1] = m_x;
-       sensor_data->values[2] = m_y;
-       sensor_data->values[3] = m_z;
+       sensor_data->values[0] = m_x;
+       sensor_data->values[1] = m_y;
+       sensor_data->values[2] = m_z;
+       sensor_data->values[3] = m_w;
 
        *data = sensor_data;
        *length = sizeof(sensor_data_t);

diff --git a/src/fusion-sensor/rotation_vector/magnetic_rv_sensor.cpp b/src/fusion-sensor/rotation_vector/magnetic_rv_sensor.cpp
index 225ca239b07d304ca47a8ff0758b2564ea03c4a2..c0c8ab2f1201357b34fbae91be7c0f40eb014fc7 100644 (file)
--- a/src/fusion-sensor/rotation_vector/magnetic_rv_sensor.cpp
+++ b/src/fusion-sensor/rotation_vector/magnetic_rv_sensor.cpp
@@ -89,7 +89,7 @@ int magnetic_rv_sensor::update(uint32_t id, sensor_data_t *data, int len)
        else if (id == SRC_ID_MAG)
                m_fusion.push_mag(*data);
 
-       if (!m_fusion.get_rv(timestamp, m_w, m_x, m_y, m_z))
+       if (!m_fusion.get_rv(timestamp, m_x, m_y, m_z, m_w))
                return OP_ERROR;
 
        if (timestamp == m_time)
@@ -116,10 +116,10 @@ int magnetic_rv_sensor::get_data(sensor_data_t **data, int *length)
        sensor_data->accuracy = m_accuracy;
        sensor_data->timestamp = m_time;
        sensor_data->value_count = 4;
-       sensor_data->values[0] = m_w;
-       sensor_data->values[1] = m_x;
-       sensor_data->values[2] = m_y;
-       sensor_data->values[3] = m_z;
+       sensor_data->values[0] = m_x;
+       sensor_data->values[1] = m_y;
+       sensor_data->values[2] = m_z;
+       sensor_data->values[3] = m_w;
 
        *data = sensor_data;
        *length = sizeof(sensor_data_t);

diff --git a/src/fusion-sensor/rotation_vector/rv_sensor.cpp b/src/fusion-sensor/rotation_vector/rv_sensor.cpp
index ef57a40ca1409b7e6f64747a102fdb1ea7cb7c6c..2f43eddf07d37adb0d13ade4a6179de4647e6bf0 100644 (file)
--- a/src/fusion-sensor/rotation_vector/rv_sensor.cpp
+++ b/src/fusion-sensor/rotation_vector/rv_sensor.cpp
@@ -95,7 +95,7 @@ int rv_sensor::update(uint32_t id, sensor_data_t *data, int len)
        else if (id == SRC_ID_GYRO)
                m_fusion.push_gyro(*data);
 
-       if (!m_fusion.get_rv(timestamp, m_w, m_x, m_y, m_z))
+       if (!m_fusion.get_rv(timestamp, m_x, m_y, m_z, m_w))
                return OP_ERROR;
 
        if (timestamp == m_time)
@@ -122,10 +122,10 @@ int rv_sensor::get_data(sensor_data_t **data, int *length)
        sensor_data->accuracy = m_accuracy;
        sensor_data->timestamp = m_time;
        sensor_data->value_count = 4;
-       sensor_data->values[0] = m_w;
-       sensor_data->values[1] = m_x;
-       sensor_data->values[2] = m_y;
-       sensor_data->values[3] = m_z;
+       sensor_data->values[0] = m_x;
+       sensor_data->values[1] = m_y;
+       sensor_data->values[2] = m_z;
+       sensor_data->values[3] = m_w;
 
        *data = sensor_data;
        *length = sizeof(sensor_data_t);