Removing redundant geomagnetic sensor events

GEOMAGNETIC_BASE_DATA_SET and GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME were the same GEOMAGNETIC_BASE_DATA_SET has been removed.
GEOMAGNETIC_BASE_DATA_SET was used for polling events and GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME was used for event driven.
Since both these represent the same pressure event, DATA_SET type has been removed.

And GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME has been renamed to GEOMAGNETIC_RAW_DATA_EVENT to make it simpler.

The change has been tested on rd-pq device for all sensord API and all API were found to be working.

Change-Id: Idacbdd970cb3d701ee7fbb0a882b7899fffc9fce

diff --git a/src/geo/geo_sensor.cpp b/src/geo/geo_sensor.cpp
index 7843935..02609ca 100755 (executable)
--- a/src/geo/geo_sensor.cpp
+++ b/src/geo/geo_sensor.cpp
@@ -31,9 +31,9 @@ geo_sensor::geo_sensor()
 {
        m_name = string(SENSOR_NAME);
 
-       register_supported_event(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME);
-       register_supported_event(GEOMAGNETIC_EVENT_CALIBRATION_NEEDED);
-       register_supported_event(GEOMAGNETIC_EVENT_UNPROCESSED_DATA_REPORT_ON_TIME);
+       register_supported_event(GEOMAGNETIC_RAW_DATA_EVENT);
+       register_supported_event(GEOMAGNETIC_CALIBRATION_NEEDED_EVENT);
+       register_supported_event(GEOMAGNETIC_UNPROCESSED_DATA_EVENT);
 
        physical_sensor::set_poller(geo_sensor::working, this);
 }
@@ -89,15 +89,15 @@ bool geo_sensor::process_event(void)
        AUTOLOCK(m_client_info_mutex);
        AUTOLOCK(m_mutex);
 
-       if (get_client_cnt(GEOMAGNETIC_EVENT_UNPROCESSED_DATA_REPORT_ON_TIME)) {
+       if (get_client_cnt(GEOMAGNETIC_UNPROCESSED_DATA_EVENT)) {
                event.sensor_id = get_id();
-               event.event_type = GEOMAGNETIC_EVENT_UNPROCESSED_DATA_REPORT_ON_TIME;
+               event.event_type = GEOMAGNETIC_UNPROCESSED_DATA_EVENT;
                push(event);
        }
 
-       if (get_client_cnt(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME)) {
+       if (get_client_cnt(GEOMAGNETIC_RAW_DATA_EVENT)) {
                event.sensor_id = get_id();
-               event.event_type = GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME;
+               event.event_type = GEOMAGNETIC_RAW_DATA_EVENT;
                raw_to_base(event.data);
                push(event);
        }
@@ -134,7 +134,7 @@ int geo_sensor::get_sensor_data(unsigned int type, sensor_data_t &data)
 {
        int state;
 
-       if (type != GEOMAGNETIC_BASE_DATA_SET)
+       if (type != GEOMAGNETIC_RAW_DATA_EVENT)
                return -1;
 
        state = m_sensor_hal->get_sensor_data(data);

diff --git a/src/libsensord/client_common.cpp b/src/libsensord/client_common.cpp
index ba15264..1e3b344 100755 (executable)
--- a/src/libsensord/client_common.cpp
+++ b/src/libsensord/client_common.cpp
@@ -43,7 +43,7 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, ROTATION_VECTOR_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, GEOMAGNETIC_RV_SENSOR, 0, 1),
 
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_EVENT_CALIBRATION_NEEDED, 0, 1),
+       FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_CALIBRATION_NEEDED_EVENT, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_CHANGE_STATE_EVENT, 0,1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_EVENT_CHANGE_LEVEL, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_STATE_EVENT, 0, 10),
@@ -52,7 +52,7 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_EVENT, AUTO_ROTATION_EVENT_CHANGE_STATE, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, ACCELEROMETER_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GYROSCOPE_RAW_DATA_EVENT, 0, 10),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
+       FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_EVENT_LEVEL_DATA_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_EVENT_LUX_DATA_REPORT_ON_TIME, 0, 10),
@@ -64,7 +64,6 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_EVENT, ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
 
-       FILL_LOG_ELEMENT(LOG_ID_DATA, GEOMAGNETIC_BASE_DATA_SET, 0, 25),
        FILL_LOG_ELEMENT(LOG_ID_DATA, LIGHT_BASE_DATA_SET, 0, 25),
        FILL_LOG_ELEMENT(LOG_ID_DATA, LIGHT_LUX_DATA_SET, 0, 25),
        FILL_LOG_ELEMENT(LOG_ID_DATA, CONTEXT_BASE_DATA_SET, 0, 25),
@@ -151,7 +150,7 @@ bool is_ontime_event(unsigned int event_type)
        case PROXIMITY_STATE_EVENT:
        case GYROSCOPE_RAW_DATA_EVENT:
        case LIGHT_EVENT_LEVEL_DATA_REPORT_ON_TIME:
-       case GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME:
+       case GEOMAGNETIC_RAW_DATA_EVENT:
        case LIGHT_EVENT_LUX_DATA_REPORT_ON_TIME:
        case PROXIMITY_DISTANCE_DATA_EVENT:
        case GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME:
@@ -173,7 +172,7 @@ bool is_panning_event(unsigned int event_type)
 bool is_single_state_event(unsigned int event_type)
 {
        switch (event_type) {
-       case GEOMAGNETIC_EVENT_CALIBRATION_NEEDED:
+       case GEOMAGNETIC_CALIBRATION_NEEDED_EVENT:
        case LIGHT_EVENT_CHANGE_LEVEL:
        case PROXIMITY_CHANGE_STATE_EVENT:
        case AUTO_ROTATION_EVENT_CHANGE_STATE:
@@ -192,7 +191,7 @@ unsigned int get_calibration_event_type(unsigned int event_type)
 
        switch (sensor) {
        case GEOMAGNETIC_SENSOR:
-               return GEOMAGNETIC_EVENT_CALIBRATION_NEEDED;
+               return GEOMAGNETIC_CALIBRATION_NEEDED_EVENT;
        case ORIENTATION_SENSOR:
                return ORIENTATION_EVENT_CALIBRATION_NEEDED;
        default:

diff --git a/src/libsensord/sensor_geomag.h b/src/libsensord/sensor_geomag.h
index c3dfb51..7680ac2 100755 (executable)
--- a/src/libsensord/sensor_geomag.h
+++ b/src/libsensord/sensor_geomag.h
@@ -36,15 +36,10 @@ extern "C"
  * @{
  */
 
-enum geomag_data_id {
-       GEOMAGNETIC_BASE_DATA_SET               = (GEOMAGNETIC_SENSOR << 16) | 0x0001,
-       GEOMAGNETIC_RAW_DATA_SET                = (GEOMAGNETIC_SENSOR << 16) | 0x0001,
-};
-
 enum geomag_event_type {
-       GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME       = (GEOMAGNETIC_SENSOR << 16) | 0x0001,
-       GEOMAGNETIC_EVENT_CALIBRATION_NEEDED                    = (GEOMAGNETIC_SENSOR << 16) | 0x0002,
-       GEOMAGNETIC_EVENT_UNPROCESSED_DATA_REPORT_ON_TIME       = (GEOMAGNETIC_SENSOR << 16) | 0x0003,
+       GEOMAGNETIC_RAW_DATA_EVENT      = (GEOMAGNETIC_SENSOR << 16) | 0x0001,
+       GEOMAGNETIC_CALIBRATION_NEEDED_EVENT    = (GEOMAGNETIC_SENSOR << 16) | 0x0002,
+       GEOMAGNETIC_UNPROCESSED_DATA_EVENT      = (GEOMAGNETIC_SENSOR << 16) | 0x0003,
 };
 
 /**

diff --git a/src/orientation/orientation_sensor.cpp b/src/orientation/orientation_sensor.cpp
index 424db60..355ac12 100755 (executable)
--- a/src/orientation/orientation_sensor.cpp
+++ b/src/orientation/orientation_sensor.cpp
@@ -238,7 +238,7 @@ bool orientation_sensor::on_start(void)
        m_gyro_sensor->add_client(GYROSCOPE_RAW_DATA_EVENT);
        m_gyro_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
        m_gyro_sensor->start();
-       m_magnetic_sensor->add_client(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME);
+       m_magnetic_sensor->add_client(GEOMAGNETIC_RAW_DATA_EVENT);
        m_magnetic_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
        m_magnetic_sensor->start();
 
@@ -256,7 +256,7 @@ bool orientation_sensor::on_stop(void)
        m_gyro_sensor->delete_client(GYROSCOPE_RAW_DATA_EVENT);
        m_gyro_sensor->delete_interval((intptr_t)this, false);
        m_gyro_sensor->stop();
-       m_magnetic_sensor->delete_client(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME);
+       m_magnetic_sensor->delete_client(GEOMAGNETIC_RAW_DATA_EVENT);
        m_magnetic_sensor->delete_interval((intptr_t)this, false);
        m_magnetic_sensor->stop();
 
@@ -318,7 +318,7 @@ void orientation_sensor::synthesize(const sensor_event_t &event, vector<sensor_e
 
                m_enable_orientation |= GYROSCOPE_ENABLED;
        }
-       else if (event.event_type == GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME) {
+       else if (event.event_type == GEOMAGNETIC_RAW_DATA_EVENT) {
                diff_time = event.data.timestamp - m_time;
 
                if (m_time && (diff_time < m_interval * MIN_DELIVERY_DIFF_FACTOR))
@@ -390,7 +390,7 @@ int orientation_sensor::get_sensor_data(const unsigned int event_type, sensor_da
 
        m_accel_sensor->get_sensor_data(ACCELEROMETER_RAW_DATA_EVENT, accel_data);
        m_gyro_sensor->get_sensor_data(GYROSCOPE_RAW_DATA_EVENT, gyro_data);
-       m_magnetic_sensor->get_sensor_data(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME, magnetic_data);
+       m_magnetic_sensor->get_sensor_data(GEOMAGNETIC_RAW_DATA_EVENT, magnetic_data);
 
        pre_process_data(accel, accel_data.values, m_accel_static_bias, m_accel_rotation_direction_compensation, m_accel_scale);
        pre_process_data(gyro, gyro_data.values, m_gyro_static_bias, m_gyro_rotation_direction_compensation, m_gyro_scale);

diff --git a/src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp b/src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp
index 3f6646e..1fb050b 100755 (executable)
--- a/src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp
+++ b/src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp
@@ -174,7 +174,7 @@ bool geomagnetic_rv_sensor::on_start(void)
        m_accel_sensor->add_client(ACCELEROMETER_RAW_DATA_EVENT);
        m_accel_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
        m_accel_sensor->start();
-       m_magnetic_sensor->add_client(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME);
+       m_magnetic_sensor->add_client(GEOMAGNETIC_RAW_DATA_EVENT);
        m_magnetic_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
        m_magnetic_sensor->start();
 
@@ -189,7 +189,7 @@ bool geomagnetic_rv_sensor::on_stop(void)
        m_accel_sensor->delete_client(ACCELEROMETER_RAW_DATA_EVENT);
        m_accel_sensor->delete_interval((intptr_t)this, false);
        m_accel_sensor->stop();
-       m_magnetic_sensor->delete_client(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME);
+       m_magnetic_sensor->delete_client(GEOMAGNETIC_RAW_DATA_EVENT);
        m_magnetic_sensor->delete_interval((intptr_t)this, false);
        m_magnetic_sensor->stop();
 
@@ -237,7 +237,7 @@ void geomagnetic_rv_sensor::synthesize(const sensor_event_t& event, vector<senso
 
                m_enable_geomagnetic_rv |= ACCELEROMETER_ENABLED;
        }
-       else if (event.event_type == GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME) {
+       else if (event.event_type == GEOMAGNETIC_RAW_DATA_EVENT) {
                diff_time = event.data.timestamp - m_time;
 
                if (m_time && (diff_time < m_interval * MIN_DELIVERY_DIFF_FACTOR))
@@ -292,7 +292,7 @@ int geomagnetic_rv_sensor::get_sensor_data(unsigned int event_type, sensor_data_
                return -1;
 
        m_accel_sensor->get_sensor_data(ACCELEROMETER_RAW_DATA_EVENT, accel_data);
-       m_magnetic_sensor->get_sensor_data(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME, magnetic_data);
+       m_magnetic_sensor->get_sensor_data(GEOMAGNETIC_RAW_DATA_EVENT, magnetic_data);
 
        pre_process_data(accel, accel_data.values, m_accel_static_bias, m_accel_rotation_direction_compensation, m_accel_scale);
        pre_process_data(magnetic, magnetic_data.values, m_geomagnetic_static_bias, m_geomagnetic_rotation_direction_compensation, m_geomagnetic_scale);

diff --git a/src/rotation_vector/rv/rv_sensor.cpp b/src/rotation_vector/rv/rv_sensor.cpp
index 9c80252..a998873 100755 (executable)
--- a/src/rotation_vector/rv/rv_sensor.cpp
+++ b/src/rotation_vector/rv/rv_sensor.cpp
@@ -204,7 +204,7 @@ bool rv_sensor::on_start(void)
        m_gyro_sensor->add_client(GYROSCOPE_RAW_DATA_EVENT);
        m_gyro_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
        m_gyro_sensor->start();
-       m_magnetic_sensor->add_client(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME);
+       m_magnetic_sensor->add_client(GEOMAGNETIC_RAW_DATA_EVENT);
        m_magnetic_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
        m_magnetic_sensor->start();
 
@@ -222,7 +222,7 @@ bool rv_sensor::on_stop(void)
        m_gyro_sensor->delete_client(GYROSCOPE_RAW_DATA_EVENT);
        m_gyro_sensor->delete_interval((intptr_t)this, false);
        m_gyro_sensor->stop();
-       m_magnetic_sensor->delete_client(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME);
+       m_magnetic_sensor->delete_client(GEOMAGNETIC_RAW_DATA_EVENT);
        m_magnetic_sensor->delete_interval((intptr_t)this, false);
        m_magnetic_sensor->stop();
 
@@ -284,7 +284,7 @@ void rv_sensor::synthesize(const sensor_event_t& event, vector<sensor_event_t> &
 
                m_enable_orientation |= GYROSCOPE_ENABLED;
        }
-       else if (event.event_type == GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME) {
+       else if (event.event_type == GEOMAGNETIC_RAW_DATA_EVENT) {
                diff_time = event.data.timestamp - m_time;
 
                if (m_time && (diff_time < m_interval * MIN_DELIVERY_DIFF_FACTOR))
@@ -345,7 +345,7 @@ int rv_sensor::get_sensor_data(unsigned int event_type, sensor_data_t &data)
 
        m_accel_sensor->get_sensor_data(ACCELEROMETER_RAW_DATA_EVENT, accel_data);
        m_gyro_sensor->get_sensor_data(GYROSCOPE_RAW_DATA_EVENT, gyro_data);
-       m_magnetic_sensor->get_sensor_data(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME, magnetic_data);
+       m_magnetic_sensor->get_sensor_data(GEOMAGNETIC_RAW_DATA_EVENT, magnetic_data);
 
        pre_process_data(accel, accel_data.values, m_accel_static_bias, m_accel_rotation_direction_compensation, m_accel_scale);
        pre_process_data(gyro, gyro_data.values, m_gyro_static_bias, m_gyro_rotation_direction_compensation, m_gyro_scale);

diff --git a/src/server/command_worker.cpp b/src/server/command_worker.cpp
index 048f2d5..8b43d98 100755 (executable)
--- a/src/server/command_worker.cpp
+++ b/src/server/command_worker.cpp
@@ -855,11 +855,11 @@ void insert_priority_list(unsigned int event_type)
                        event_type == ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME) {
                priority_list.insert(ACCELEROMETER_RAW_DATA_EVENT);
                priority_list.insert(GYROSCOPE_RAW_DATA_EVENT);
-               priority_list.insert(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME);
+               priority_list.insert(GEOMAGNETIC_RAW_DATA_EVENT);
        }
 
        if (event_type == GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME) {
                priority_list.insert(ACCELEROMETER_RAW_DATA_EVENT);
-               priority_list.insert(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME);
+               priority_list.insert(GEOMAGNETIC_RAW_DATA_EVENT);
        }
 }

diff --git a/test/src/auto_test.c b/test/src/auto_test.c
index c369b26..31dd751 100644 (file)
--- a/test/src/auto_test.c
+++ b/test/src/auto_test.c
@@ -202,7 +202,7 @@ int main(int argc, char **argv)
        result = check_sensor_api(ACCELEROMETER_RAW_DATA_EVENT, interval);
        fprintf(fp, "Accelerometer - RAW_DATA_REPORT_ON_TIME - %d\n", result);
 
-       result = check_sensor_api(GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME, interval);
+       result = check_sensor_api(GEOMAGNETIC_RAW_DATA_EVENT, interval);
        fprintf(fp, "Geomagnetic - RAW_DATA_REPORT_ON_TIME - %d\n", result);
 
        result = check_sensor_api(GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME, interval);

diff --git a/test/src/tc-common.c b/test/src/tc-common.c
index 9c3b633..c94f77d 100644 (file)
--- a/test/src/tc-common.c
+++ b/test/src/tc-common.c
@@ -75,7 +75,7 @@ unsigned int get_event_driven(sensor_type_t sensor_type, char str[])
                break;
        case GEOMAGNETIC_SENSOR:
                if (strcmp(str, "RAW_DATA_REPORT_ON_TIME") == 0)
-                       return GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME;
+                       return GEOMAGNETIC_RAW_DATA_EVENT;
                break;
        case LIGHT_SENSOR:
                if (strcmp(str, "RAW_DATA_REPORT_ON_TIME") == 0)
@@ -193,7 +193,7 @@ int main(int argc, char **argv)
        }
        else if (strcmp(argv[1], "geomagnetic") == 0) {
                 sensor_type = GEOMAGNETIC_SENSOR;
-                event = GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME;
+                event = GEOMAGNETIC_RAW_DATA_EVENT;
        }
        else if (strcmp(argv[1], "orientation") == 0) {
                 sensor_type = ORIENTATION_SENSOR;