Updating event representation for rotation vector virtual sensor

-Updating rpresentation from ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME to ROTATION_VECTOR_RAW_DATA_EVENT

Change-Id: Iaee8da2a4523f48a08a251ab931e4fc82ccb0911

diff --git a/src/libsensord/client_common.cpp b/src/libsensord/client_common.cpp
index dc00b87..c051c8c 100755 (executable)
--- a/src/libsensord/client_common.cpp
+++ b/src/libsensord/client_common.cpp
@@ -63,7 +63,7 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_EVENT, ORIENTATION_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, TEMPERATURE_RAW_DATA_EVENT, 0, 10),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
+       FILL_LOG_ELEMENT(LOG_ID_EVENT, ROTATION_VECTOR_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_RV_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GAMING_RV_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, FUSION_EVENT, 0, 10),

diff --git a/src/libsensord/sensor_rv.h b/src/libsensord/sensor_rv.h
index a7d6a99..3e65acc 100755 (executable)
--- a/src/libsensord/sensor_rv.h
+++ b/src/libsensord/sensor_rv.h
@@ -37,7 +37,7 @@ extern "C"
  */
 
 enum rot_event_type {
-       ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME   = (ROTATION_VECTOR_SENSOR << 16) | 0x0001,
+       ROTATION_VECTOR_RAW_DATA_EVENT  = (ROTATION_VECTOR_SENSOR << 16) | 0x0001,
 };
 
 /**

diff --git a/src/rotation_vector/rv/rv_sensor.cpp b/src/rotation_vector/rv/rv_sensor.cpp
index b3330f1..f647ef0 100755 (executable)
--- a/src/rotation_vector/rv/rv_sensor.cpp
+++ b/src/rotation_vector/rv/rv_sensor.cpp
@@ -62,7 +62,7 @@ rv_sensor::rv_sensor()
        cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance();
 
        m_name = string(SENSOR_NAME);
-       register_supported_event(ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME);
+       register_supported_event(ROTATION_VECTOR_RAW_DATA_EVENT);
        m_enable_orientation = 0;
 
        if (!config.get(SENSOR_TYPE_RV, ELEMENT_VENDOR, m_vendor)) {
@@ -199,7 +199,7 @@ void rv_sensor::synthesize(const sensor_event_t &event, vector<sensor_event_t> &
 
                m_time = get_timestamp();
                rv_event.sensor_id = get_id();
-               rv_event.event_type = ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME;
+               rv_event.event_type = ROTATION_VECTOR_RAW_DATA_EVENT;
                rv_event.data.accuracy = SENSOR_ACCURACY_GOOD;
                rv_event.data.timestamp = m_time;
                rv_event.data.value_count = 4;
@@ -218,7 +218,7 @@ int rv_sensor::get_sensor_data(unsigned int event_type, sensor_data_t &data)
 {
        sensor_data_t fusion_data;
 
-       if (event_type != ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME)
+       if (event_type != ROTATION_VECTOR_RAW_DATA_EVENT)
                return -1;
 
        m_fusion_sensor->get_sensor_data(FUSION_ORIENTATION_ENABLED, fusion_data);

diff --git a/src/server/command_worker.cpp b/src/server/command_worker.cpp
index 19965a0..7a8c59e 100755 (executable)
--- a/src/server/command_worker.cpp
+++ b/src/server/command_worker.cpp
@@ -852,7 +852,7 @@ void insert_priority_list(unsigned int event_type)
        if (event_type == ORIENTATION_RAW_DATA_EVENT ||
                        event_type == LINEAR_ACCEL_RAW_DATA_EVENT ||
                        event_type == GRAVITY_RAW_DATA_EVENT ||
-                       event_type == ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME) {
+                       event_type == ROTATION_VECTOR_RAW_DATA_EVENT) {
                priority_list.insert(ACCELEROMETER_RAW_DATA_EVENT);
                priority_list.insert(GYROSCOPE_RAW_DATA_EVENT);
                priority_list.insert(GEOMAGNETIC_RAW_DATA_EVENT);

diff --git a/test/src/auto_test.c b/test/src/auto_test.c
index 6bb0d29..67f5319 100644 (file)
--- a/test/src/auto_test.c
+++ b/test/src/auto_test.c
@@ -223,7 +223,7 @@ int main(int argc, char **argv)
        result = check_sensor_api(PRESSURE_RAW_DATA_EVENT, interval);
        fprintf(fp, "Pressure - RAW_DATA_REPORT_ON_TIME - %d\n", result);
 
-       result = check_sensor_api(ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME, interval);
+       result = check_sensor_api(ROTATION_VECTOR_RAW_DATA_EVENT, interval);
        fprintf(fp, "Rotation Vector - RAW_DATA_REPORT_ON_TIME - %d\n", result);
 
        result = check_sensor_api(GEOMAGNETIC_RV_RAW_DATA_EVENT, interval);

diff --git a/test/src/tc-common.c b/test/src/tc-common.c
index 8606165..634af34 100644 (file)
--- a/test/src/tc-common.c
+++ b/test/src/tc-common.c
@@ -104,7 +104,7 @@ int get_event_driven(sensor_type_t sensor_type, char str[])
                break;
        case ROTATION_VECTOR_SENSOR:
                if (strcmp(str, "RAW_DATA_REPORT_ON_TIME") == 0)
-                       return ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME;
+                       return ROTATION_VECTOR_RAW_DATA_EVENT;
                break;
        case GEOMAGNETIC_RV_SENSOR:
                if (strcmp(str, "RAW_DATA_REPORT_ON_TIME") == 0)
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
        }
        else if (strcmp(argv[1], "rotation_vector") == 0) {
                 sensor_type = ROTATION_VECTOR_SENSOR;
-                event = ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME;
+                event = ROTATION_VECTOR_RAW_DATA_EVENT;
        }
        else if (strcmp(argv[1], "geomagnetic_rv") == 0) {
                 sensor_type = GEOMAGNETIC_RV_SENSOR;