Removed redundant gravity events

GRAVITY_BASE_DATA_SET and GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME were the same
GRAVITY_BASE_DATA_SET has been removed.

GRAVITY_BASE_DATA_SET was used for polling events and GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME was used for event driven
Since both these represent the same gravity sensor event, DATA_SET type has been removed.

And GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME has been renamed to GRAVITY_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: I224d0ccfd8b4e48c132a357f410028d6a1cfe7de

diff --git a/src/gravity/gravity_sensor.cpp b/src/gravity/gravity_sensor.cpp
index 69afaa4..8fa44f2 100755 (executable)
--- a/src/gravity/gravity_sensor.cpp
+++ b/src/gravity/gravity_sensor.cpp
@@ -58,7 +58,7 @@ gravity_sensor::gravity_sensor()
        cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance();
 
        m_name = std::string(SENSOR_NAME);
-       register_supported_event(GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME);
+       register_supported_event(GRAVITY_RAW_DATA_EVENT);
 
        if (!config.get(SENSOR_TYPE_GRAVITY, ELEMENT_VENDOR, m_vendor)) {
                ERR("[VENDOR] is empty\n");
@@ -187,7 +187,7 @@ void gravity_sensor::synthesize(const sensor_event_t &event, vector<sensor_event
                m_time = get_timestamp();
 
                gravity_event.sensor_id = get_id();
-               gravity_event.event_type = GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME;
+               gravity_event.event_type = GRAVITY_RAW_DATA_EVENT;
                if ((roll >= (M_PI/2)-DEVIATION && roll <= (M_PI/2)+DEVIATION) ||
                                (roll >= -(M_PI/2)-DEVIATION && roll <= -(M_PI/2)+DEVIATION)) {
                        gravity_event.data.values[0] = m_gravity_sign_compensation[0] * GRAVITY * sin(roll) * cos(azimuth);
@@ -228,7 +228,7 @@ int gravity_sensor::get_sensor_data(const unsigned int event_type, sensor_data_t
                roll *= DEG2RAD;
        }
 
-       if (event_type != GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME)
+       if (event_type != GRAVITY_RAW_DATA_EVENT)
                return -1;
 
        data.accuracy = SENSOR_ACCURACY_GOOD;

diff --git a/src/libsensord/client_common.cpp b/src/libsensord/client_common.cpp
index 1b0cc59..5b7eb35 100755 (executable)
--- a/src/libsensord/client_common.cpp
+++ b/src/libsensord/client_common.cpp
@@ -57,7 +57,7 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_LEVEL_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_LUX_DATA_EVENT, 0, 10),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
+       FILL_LOG_ELEMENT(LOG_ID_EVENT, GRAVITY_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, LINEAR_ACCEL_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, ORIENTATION_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_RAW_DATA_EVENT, 0, 10),
@@ -67,7 +67,6 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GAMING_RV_RAW_DATA_EVENT, 0, 10),
 
        FILL_LOG_ELEMENT(LOG_ID_DATA, CONTEXT_BASE_DATA_SET, 0, 25),
-       FILL_LOG_ELEMENT(LOG_ID_DATA, GRAVITY_BASE_DATA_SET, 0, 25),
        FILL_LOG_ELEMENT(LOG_ID_DATA, LINEAR_ACCEL_BASE_DATA_SET, 0, 25),
        FILL_LOG_ELEMENT(LOG_ID_DATA, ORIENTATION_BASE_DATA_SET, 0, 25),
 };
@@ -151,7 +150,7 @@ bool is_ontime_event(unsigned int event_type)
        case GEOMAGNETIC_RAW_DATA_EVENT:
        case LIGHT_LUX_DATA_EVENT:
        case PROXIMITY_DISTANCE_DATA_EVENT:
-       case GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME:
+       case GRAVITY_RAW_DATA_EVENT:
        case LINEAR_ACCEL_EVENT_RAW_DATA_REPORT_ON_TIME:
        case ORIENTATION_EVENT_RAW_DATA_REPORT_ON_TIME:
        case PRESSURE_RAW_DATA_EVENT:

diff --git a/src/libsensord/sensor_deprecated.h b/src/libsensord/sensor_deprecated.h
index 5ebedfe..3f751b4 100644 (file)
--- a/src/libsensord/sensor_deprecated.h
+++ b/src/libsensord/sensor_deprecated.h
@@ -73,6 +73,9 @@ extern "C"
 #define LIGHT_EVENT_LEVEL_DATA_REPORT_ON_TIME LIGHT_LEVEL_DATA_EVENT
 #define LIGHT_EVENT_CHANGE_LEVEL LIGHT_CHANGE_LEVEL_EVENT
 
+#define GRAVITY_BASE_DATA_SET GRAVITY_RAW_DATA_EVENT
+#define GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME GRAVITY_RAW_DATA_EVENT
+
 enum accelerometer_rotate_state {
        ROTATION_UNKNOWN = 0,
        ROTATION_LANDSCAPE_LEFT = 1,

diff --git a/src/libsensord/sensor_gravity.h b/src/libsensord/sensor_gravity.h
index 2509f03..de48faa 100755 (executable)
--- a/src/libsensord/sensor_gravity.h
+++ b/src/libsensord/sensor_gravity.h
@@ -36,12 +36,8 @@ extern "C"
  * @{
  */
 
-enum gravity_data_id {
-       GRAVITY_BASE_DATA_SET                           = (GRAVITY_SENSOR << 16) | 0x0001,
-};
-
 enum gravity_event_type {
-       GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME   = (GRAVITY_SENSOR << 16) | 0x0001,
+       GRAVITY_RAW_DATA_EVENT  = (GRAVITY_SENSOR << 16) | 0x0001,
 };
 
 /**

diff --git a/src/linear_accel/linear_accel_sensor.cpp b/src/linear_accel/linear_accel_sensor.cpp
index 2ce3a78..3ccc8d5 100755 (executable)
--- a/src/linear_accel/linear_accel_sensor.cpp
+++ b/src/linear_accel/linear_accel_sensor.cpp
@@ -146,7 +146,7 @@ sensor_type_t linear_accel_sensor::get_type(void)
 bool linear_accel_sensor::on_start(void)
 {
        AUTOLOCK(m_mutex);
-       m_gravity_sensor->add_client(GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME);
+       m_gravity_sensor->add_client(GRAVITY_RAW_DATA_EVENT);
        m_gravity_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
        m_gravity_sensor->start();
 
@@ -161,7 +161,7 @@ bool linear_accel_sensor::on_start(void)
 bool linear_accel_sensor::on_stop(void)
 {
        AUTOLOCK(m_mutex);
-       m_gravity_sensor->delete_client(GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME);
+       m_gravity_sensor->delete_client(GRAVITY_RAW_DATA_EVENT);
        m_gravity_sensor->delete_interval((intptr_t)this, false);
        m_gravity_sensor->stop();
 
@@ -211,7 +211,7 @@ void linear_accel_sensor::synthesize(const sensor_event_t &event, vector<sensor_
 
                m_enable_linear_accel |= ACCELEROMETER_ENABLED;
        }
-       else if (event.event_type == GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME) {
+       else if (event.event_type == GRAVITY_RAW_DATA_EVENT) {
                diff_time = event.data.timestamp - m_time;
 
                if (m_time && (diff_time < m_interval * MIN_DELIVERY_DIFF_FACTOR))
@@ -247,7 +247,7 @@ void linear_accel_sensor::synthesize(const sensor_event_t &event, vector<sensor_
 int linear_accel_sensor::get_sensor_data(const unsigned int event_type, sensor_data_t &data)
 {
        sensor_data_t gravity_data, accel_data;
-       ((virtual_sensor *)m_gravity_sensor)->get_sensor_data(GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME, gravity_data);
+       ((virtual_sensor *)m_gravity_sensor)->get_sensor_data(GRAVITY_RAW_DATA_EVENT, gravity_data);
        m_accel_sensor->get_sensor_data(ACCELEROMETER_RAW_DATA_EVENT, accel_data);
 
        accel_data.values[0] = m_accel_rotation_direction_compensation[0] * (accel_data.values[0] - m_accel_static_bias[0]) / m_accel_scale;

diff --git a/src/server/command_worker.cpp b/src/server/command_worker.cpp
index 6c52743..a467b39 100755 (executable)
--- a/src/server/command_worker.cpp
+++ b/src/server/command_worker.cpp
@@ -851,7 +851,7 @@ void insert_priority_list(unsigned int event_type)
 {
        if (event_type == ORIENTATION_EVENT_RAW_DATA_REPORT_ON_TIME ||
                        event_type == LINEAR_ACCEL_EVENT_RAW_DATA_REPORT_ON_TIME ||
-                       event_type == GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME ||
+                       event_type == GRAVITY_RAW_DATA_EVENT ||
                        event_type == ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME) {
                priority_list.insert(ACCELEROMETER_RAW_DATA_EVENT);
                priority_list.insert(GYROSCOPE_RAW_DATA_EVENT);

diff --git a/test/src/auto_test.c b/test/src/auto_test.c
index 64857db..fdf0e1c 100644 (file)
--- a/test/src/auto_test.c
+++ b/test/src/auto_test.c
@@ -205,7 +205,7 @@ int main(int argc, char **argv)
        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);
+       result = check_sensor_api(GRAVITY_RAW_DATA_EVENT, interval);
        fprintf(fp, "Gravity - RAW_DATA_REPORT_ON_TIME - %d\n", result);
 
        result = check_sensor_api(GYROSCOPE_RAW_DATA_EVENT, interval);

diff --git a/test/src/tc-common.c b/test/src/tc-common.c
index defded2..2d0fa0a 100644 (file)
--- a/test/src/tc-common.c
+++ b/test/src/tc-common.c
@@ -96,7 +96,7 @@ unsigned int get_event_driven(sensor_type_t sensor_type, char str[])
                break;
        case GRAVITY_SENSOR:
                if (strcmp(str, "RAW_DATA_REPORT_ON_TIME") == 0)
-                       return GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME;
+                       return GRAVITY_RAW_DATA_EVENT;
                break;
        case LINEAR_ACCEL_SENSOR:
                if (strcmp(str, "RAW_DATA_REPORT_ON_TIME") == 0)
@@ -209,7 +209,7 @@ int main(int argc, char **argv)
        }
        else if (strcmp(argv[1], "gravity") == 0) {
                 sensor_type = GRAVITY_SENSOR;
-                event = GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME;
+                event = GRAVITY_RAW_DATA_EVENT;
        }
        else if (strcmp(argv[1], "linear_accel") == 0) {
                 sensor_type = LINEAR_ACCEL_SENSOR;