Moving sensor definitions to sensor_types.h and cleanup of event definitions

Change-Id: Ic3e1d7c098594134aba1f90da639b01f2f4c8908

diff --git a/src/client/client_common.cpp b/src/client/client_common.cpp
index 9efccee..ecbcf1f 100755 (executable)
--- a/src/client/client_common.cpp
+++ b/src/client/client_common.cpp
@@ -49,12 +49,10 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, ULTRAVIOLET_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, BIO_LED_RED_SENSOR, 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_CHANGE_LEVEL_EVENT, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_STATE_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_DISTANCE_DATA_EVENT, 0, 10),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, CONTEXT_REPORT_EVENT, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, AUTO_ROTATION_CHANGE_STATE_EVENT, 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),
@@ -173,7 +171,6 @@ bool is_panning_event(unsigned int event_type)
 bool is_single_state_event(unsigned int event_type)
 {
        switch (event_type) {
-       case GEOMAGNETIC_CALIBRATION_NEEDED_EVENT:
        case LIGHT_CHANGE_LEVEL_EVENT:
        case PROXIMITY_CHANGE_STATE_EVENT:
        case AUTO_ROTATION_CHANGE_STATE_EVENT:
@@ -191,10 +188,6 @@ unsigned int get_calibration_event_type(unsigned int event_type)
        sensor = (sensor_type_t)(event_type >> SENSOR_TYPE_SHIFT);
 
        switch (sensor) {
-       case GEOMAGNETIC_SENSOR:
-               return GEOMAGNETIC_CALIBRATION_NEEDED_EVENT;
-       case ORIENTATION_SENSOR:
-               return ORIENTATION_CALIBRATION_NEEDED_EVENT;
        default:
                return 0;
        }

diff --git a/src/server/plugins/geo/geo_sensor.cpp b/src/server/plugins/geo/geo_sensor.cpp
index 616f759..0b86a0f 100755 (executable)
--- a/src/server/plugins/geo/geo_sensor.cpp
+++ b/src/server/plugins/geo/geo_sensor.cpp
@@ -35,7 +35,6 @@ geo_sensor::geo_sensor()
        m_name = string(SENSOR_NAME);
 
        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);

diff --git a/src/server/plugins/rotation_vector/rv_raw/rv_raw_sensor.cpp b/src/server/plugins/rotation_vector/rv_raw/rv_raw_sensor.cpp
index d617857..e816baf 100755 (executable)
--- a/src/server/plugins/rotation_vector/rv_raw/rv_raw_sensor.cpp
+++ b/src/server/plugins/rotation_vector/rv_raw/rv_raw_sensor.cpp
@@ -34,7 +34,6 @@ rv_raw_sensor::rv_raw_sensor()
        m_name = string(SENSOR_NAME);
 
        register_supported_event(RV_RAW_RAW_DATA_EVENT);
-       register_supported_event(RV_RAW_CALIBRATION_NEEDED_EVENT);
 
        physical_sensor::set_poller(rv_raw_sensor::working, this);
 }

diff --git a/src/server/sensor_plugin_loader.h b/src/server/sensor_plugin_loader.h
index 6b5c726..35a1fb5 100755 (executable)
--- a/src/server/sensor_plugin_loader.h
+++ b/src/server/sensor_plugin_loader.h
@@ -21,6 +21,7 @@
 #define _SENSOR_PLUGIN_LOADER_CLASS_H_
 
 #include <sensor_common.h>
+#include <sensor_types.h>
 #include <sensor_hal.h>
 
 #include <cmutex.h>

diff --git a/src/shared/sensor_common.h b/src/shared/sensor_common.h
index 16dfd26..170c26e 100644 (file)
--- a/src/shared/sensor_common.h
+++ b/src/shared/sensor_common.h
@@ -42,45 +42,6 @@ extern "C"
  * @{
  */
 
-typedef enum {
-       ALL_SENSOR = -1,
-       UNKNOWN_SENSOR = 0,
-       ACCELEROMETER_SENSOR,
-       GEOMAGNETIC_SENSOR,
-       LIGHT_SENSOR,
-       PROXIMITY_SENSOR,
-       THERMOMETER_SENSOR,
-       GYROSCOPE_SENSOR,
-       PRESSURE_SENSOR,
-       MOTION_SENSOR,
-       FUSION_SENSOR,
-       PEDOMETER_SENSOR,
-       CONTEXT_SENSOR,
-       FLAT_SENSOR,
-       BIO_SENSOR,
-       BIO_HRM_SENSOR,
-       AUTO_ROTATION_SENSOR,
-       GRAVITY_SENSOR,
-       LINEAR_ACCEL_SENSOR,
-       ROTATION_VECTOR_SENSOR,
-       GEOMAGNETIC_RV_SENSOR,
-       GAMING_RV_SENSOR,
-       ORIENTATION_SENSOR,
-       TILT_SENSOR,
-       PIR_SENSOR,
-       PIR_LONG_SENSOR,
-       TEMPERATURE_SENSOR,
-       HUMIDITY_SENSOR,
-       ULTRAVIOLET_SENSOR,
-       DUST_SENSOR,
-       BIO_LED_GREEN_SENSOR,
-       BIO_LED_IR_SENSOR,
-       BIO_LED_RED_SENSOR,
-       RV_RAW_SENSOR,
-       UNCAL_GYROSCOPE_SENSOR,
-       UNCAL_GEOMAGNETIC_SENSOR
-} sensor_type_t;
-
 typedef unsigned int sensor_id_t;
 
 typedef void *sensor_t;

diff --git a/src/shared/sensor_info.h b/src/shared/sensor_info.h
index 53c57da..28a35a2 100644 (file)
--- a/src/shared/sensor_info.h
+++ b/src/shared/sensor_info.h
@@ -22,6 +22,7 @@
 
 #include <sf_common.h>
 #include <sensor_common.h>
+#include <sensor_types.h>
 #include <string>
 #include <vector>
 

diff --git a/src/shared/sensor_logs.cpp b/src/shared/sensor_logs.cpp
index b1b5c0f..28e19bb 100644 (file)
--- a/src/shared/sensor_logs.cpp
+++ b/src/shared/sensor_logs.cpp
@@ -29,6 +29,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <sf_common.h>
+#include <sensor_types.h>
 
 #ifndef EXTAPI
 #define EXTAPI __attribute__((visibility("default")))

diff --git a/src/shared/sensor_types.h b/src/shared/sensor_types.h
index 75e0e70..29a16e9 100644 (file)
--- a/src/shared/sensor_types.h
+++ b/src/shared/sensor_types.h
@@ -6,128 +6,87 @@ extern "C"
 {
 #endif
 
-// Accelerometer
-enum accelerometer_event_type {
+
+typedef enum {
+       ALL_SENSOR = -1,
+       UNKNOWN_SENSOR = 0,
+       ACCELEROMETER_SENSOR,
+       GEOMAGNETIC_SENSOR,
+       LIGHT_SENSOR,
+       PROXIMITY_SENSOR,
+       THERMOMETER_SENSOR,
+       GYROSCOPE_SENSOR,
+       PRESSURE_SENSOR,
+       MOTION_SENSOR,
+       FUSION_SENSOR,
+       PEDOMETER_SENSOR,
+       CONTEXT_SENSOR,
+       FLAT_SENSOR,
+       BIO_SENSOR,
+       BIO_HRM_SENSOR,
+       AUTO_ROTATION_SENSOR,
+       GRAVITY_SENSOR,
+       LINEAR_ACCEL_SENSOR,
+       ROTATION_VECTOR_SENSOR,
+       GEOMAGNETIC_RV_SENSOR,
+       GAMING_RV_SENSOR,
+       ORIENTATION_SENSOR,
+       TILT_SENSOR,
+       PIR_SENSOR,
+       PIR_LONG_SENSOR,
+       TEMPERATURE_SENSOR,
+       HUMIDITY_SENSOR,
+       ULTRAVIOLET_SENSOR,
+       DUST_SENSOR,
+       BIO_LED_GREEN_SENSOR,
+       BIO_LED_IR_SENSOR,
+       BIO_LED_RED_SENSOR,
+       RV_RAW_SENSOR,
+       UNCAL_GYROSCOPE_SENSOR,
+       UNCAL_GEOMAGNETIC_SENSOR
+} sensor_type_t;
+
+// Sensor Event Types
+enum event_types_t {
        ACCELEROMETER_RAW_DATA_EVENT                                    = (ACCELEROMETER_SENSOR << 16) | 0x0001,
        ACCELEROMETER_UNPROCESSED_DATA_EVENT                    = (ACCELEROMETER_SENSOR << 16) | 0x0002,
-};
 
-// Gyroscope
-enum gyro_event_type {
        GYROSCOPE_RAW_DATA_EVENT        = (GYROSCOPE_SENSOR << 16) | 0x0001,
        GYROSCOPE_UNPROCESSED_DATA_EVENT        = (GYROSCOPE_SENSOR << 16) | 0x0002,
-};
 
-// Geomagnetic
-enum geomag_event_type {
        GEOMAGNETIC_RAW_DATA_EVENT      = (GEOMAGNETIC_SENSOR << 16) | 0x0001,
-       GEOMAGNETIC_CALIBRATION_NEEDED_EVENT    = (GEOMAGNETIC_SENSOR << 16) | 0x0002,
-       GEOMAGNETIC_UNPROCESSED_DATA_EVENT      = (GEOMAGNETIC_SENSOR << 16) | 0x0003,
-};
+       GEOMAGNETIC_UNPROCESSED_DATA_EVENT      = (GEOMAGNETIC_SENSOR << 16) | 0x0002,
 
-// Proximity
-enum proxi_event_type {
        PROXIMITY_CHANGE_STATE_EVENT    = (PROXIMITY_SENSOR << 16) | 0x0001,
        PROXIMITY_STATE_EVENT   = (PROXIMITY_SENSOR << 16) | 0x0002,
-       PROXIMITY_DISTANCE_DATA_EVENT   = (PROXIMITY_SENSOR << 16) | 0x0004,
-};
-
-enum proxi_change_state {
-       PROXIMITY_STATE_FAR     = 0,
-       PROXIMITY_STATE_NEAR    = 1,
-};
-
-enum proxi_property_id {
-       PROXIMITY_PROPERTY_UNKNOWN = 0,
-};
+       PROXIMITY_DISTANCE_DATA_EVENT   = (PROXIMITY_SENSOR << 16) | 0x0003,
 
-// Pressure
-enum pressure_event_type {
        PRESSURE_RAW_DATA_EVENT         = (PRESSURE_SENSOR << 16) | 0x0001,
-};
 
-// Temperature
-enum temperature_event_type {
        TEMPERATURE_RAW_DATA_EVENT      = (TEMPERATURE_SENSOR << 16) | 0x0001,
-};
 
-// Light
-enum light_event_type {
        LIGHT_LUX_DATA_EVENT    = (LIGHT_SENSOR << 16) | 0x0001,
        LIGHT_LEVEL_DATA_EVENT  = (LIGHT_SENSOR << 16) | 0x0002,
-       LIGHT_CHANGE_LEVEL_EVENT        = (LIGHT_SENSOR << 16) | 0x0004,
-};
+       LIGHT_CHANGE_LEVEL_EVENT        = (LIGHT_SENSOR << 16) | 0x0003,
 
-enum light_property_id {
-       LIGHT_PROPERTY_UNKNOWN = 0,
-};
-
-// Rotation Vector
-enum rot_event_type {
        ROTATION_VECTOR_RAW_DATA_EVENT  = (ROTATION_VECTOR_SENSOR << 16) | 0x0001,
-};
 
-// Rotation Vector Raw
-enum rv_raw_event_type {
        RV_RAW_RAW_DATA_EVENT   = (RV_RAW_SENSOR << 16) | 0x0001,
-       RV_RAW_CALIBRATION_NEEDED_EVENT = (RV_RAW_SENSOR << 16) | 0x0002
-};
-
 
-// Ultraviolet
-enum ultraviolet_event_type {
        ULTRAVIOLET_RAW_DATA_EVENT      = (ULTRAVIOLET_SENSOR << 16) | 0x0001,
-};
 
-// Auto rotation
-enum auto_rotation_event_type {
        AUTO_ROTATION_CHANGE_STATE_EVENT = (AUTO_ROTATION_SENSOR << 16) | 0x0001,
-};
 
-enum auto_rotation_state {
-       AUTO_ROTATION_DEGREE_UNKNOWN = 0,
-       AUTO_ROTATION_DEGREE_0,
-       AUTO_ROTATION_DEGREE_90,
-       AUTO_ROTATION_DEGREE_180,
-       AUTO_ROTATION_DEGREE_270,
-};
-
-// Bio LED Red
-enum bio_led_green_event_type {
        BIO_LED_RED_RAW_DATA_EVENT      = (BIO_LED_RED_SENSOR << 16) | 0x0001,
-};
 
-// Gaming RV
-enum gaming_rv_event_type {
        GAMING_RV_RAW_DATA_EVENT        = (GAMING_RV_SENSOR << 16) | 0x0001,
-};
-
-// Context
-enum context_event_type {
-       CONTEXT_REPORT_EVENT    = (CONTEXT_SENSOR << 16) | 0x0001,
-};
 
-enum context_property_id {
-       CONTEXT_PROPERTY_UNKNOWN        = 0,
-};
-
-// Geomagnetic RV
-enum geomagnetic_rv_event_type {
        GEOMAGNETIC_RV_RAW_DATA_EVENT   = (GEOMAGNETIC_RV_SENSOR << 16) | 0x0001,
-};
 
-// Gravity
-enum gravity_event_type {
        GRAVITY_RAW_DATA_EVENT  = (GRAVITY_SENSOR << 16) | 0x0001,
-};
 
-// Linear Acceleration
-enum linear_accel_event_type {
        LINEAR_ACCEL_RAW_DATA_EVENT     = (LINEAR_ACCEL_SENSOR << 16) | 0x0001,
-};
 
-// Motion
-enum motion_event_type {
        MOTION_ENGINE_EVENT_SNAP                                = (MOTION_SENSOR << 16) | 0x0001,
        MOTION_ENGINE_EVENT_SHAKE                               = (MOTION_SENSOR << 16) | 0x0002,
        MOTION_ENGINE_EVENT_DOUBLETAP                   = (MOTION_SENSOR << 16) | 0x0004,
@@ -142,6 +101,35 @@ enum motion_event_type {
        MOTION_ENGINE_EVENT_NO_MOVE                             = (MOTION_SENSOR << 16) | 0x0800,
        MOTION_ENGINE_EVENT_SHAKE_ALWAYS_ON     = (MOTION_SENSOR << 16) | 0x1000,
        MOTION_ENGINE_EVENT_SMART_RELAY         = (MOTION_SENSOR << 16) | 0x2000,
+
+       ORIENTATION_RAW_DATA_EVENT      = (ORIENTATION_SENSOR << 16) | 0x0001,
+
+       TILT_RAW_DATA_EVENT     = (TILT_SENSOR << 16) | 0x0001,
+
+       UNCAL_GYRO_RAW_DATA_EVENT       = (UNCAL_GYROSCOPE_SENSOR << 16) | 0x0001,
+
+       FUSION_EVENT = (FUSION_SENSOR << 16) | 0x0001,
+       FUSION_UNCAL_GYRO_EVENT = (FUSION_SENSOR << 16) | 0x0002,
+       FUSION_CALIBRATION_NEEDED_EVENT = (FUSION_SENSOR << 16) | 0x0003,
+       FUSION_ORIENTATION_ENABLED = (FUSION_SENSOR << 16) | 0x0004,
+       FUSION_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0005,
+       FUSION_GAMING_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0006,
+       FUSION_GEOMAGNETIC_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0007,
+       FUSION_TILT_ENABLED = (FUSION_SENSOR << 16) | 0x0008,
+       FUSION_UNCAL_GYRO_ENABLED = (FUSION_SENSOR << 16) | 0x0009,
+};
+
+enum proxi_change_state {
+       PROXIMITY_STATE_FAR     = 0,
+       PROXIMITY_STATE_NEAR    = 1,
+};
+
+enum auto_rotation_state {
+       AUTO_ROTATION_DEGREE_UNKNOWN = 0,
+       AUTO_ROTATION_DEGREE_0,
+       AUTO_ROTATION_DEGREE_90,
+       AUTO_ROTATION_DEGREE_180,
+       AUTO_ROTATION_DEGREE_270,
 };
 
 enum motion_snap_event {
@@ -237,36 +225,6 @@ enum motion_property_id {
        MOTION_PROPERTY_CHECK_GYRO_CAL_STATUS,
 };
 
-// Orientation
-enum orientation_event_type {
-       ORIENTATION_RAW_DATA_EVENT      = (ORIENTATION_SENSOR << 16) | 0x0001,
-       ORIENTATION_CALIBRATION_NEEDED_EVENT    = (ORIENTATION_SENSOR << 16) | 0x0002,
-};
-
-// Tilt
-enum tilt_event_type {
-       TILT_RAW_DATA_EVENT     = (TILT_SENSOR << 16) | 0x0001,
-};
-
-// Uncalibrated Gyroscope
-enum uncal_gyro_event_type {
-       UNCAL_GYRO_RAW_DATA_EVENT       = (UNCAL_GYROSCOPE_SENSOR << 16) | 0x0001,
-};
-
-// Fusion
-enum fusion_event_type {
-       FUSION_EVENT = (FUSION_SENSOR << 16) | 0x0001,
-       FUSION_UNCAL_GYRO_EVENT = (FUSION_SENSOR << 16) | 0x0002,
-       FUSION_CALIBRATION_NEEDED_EVENT = (FUSION_SENSOR << 16) | 0x0003,
-       FUSION_ORIENTATION_ENABLED = (FUSION_SENSOR << 16) | 0x0004,
-       FUSION_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0005,
-       FUSION_GAMING_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0006,
-       FUSION_GEOMAGNETIC_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0007,
-       FUSION_TILT_ENABLED = (FUSION_SENSOR << 16) | 0x0008,
-       FUSION_UNCAL_GYRO_ENABLED = (FUSION_SENSOR << 16) | 0x0009,
-};
-
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/test/src/check-sensor.h b/test/src/check-sensor.h
index a53602a..042dc87 100644 (file)
--- a/test/src/check-sensor.h
+++ b/test/src/check-sensor.h
@@ -19,6 +19,8 @@
 #ifndef CHECK_SENSOR_H
 #define CHECK_SENSOR_H
 
+#include <sensor_types.h>
+
 #define DEFAULT_EVENT_INTERVAL 100
 
 int get_event(sensor_type_t sensor_type, char str[]);

diff --git a/test/src/multi-process-performance-test.c b/test/src/multi-process-performance-test.c
index 20d8ea2..c3555e2 100755 (executable)
--- a/test/src/multi-process-performance-test.c
+++ b/test/src/multi-process-performance-test.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sensor_common.h>
+#include <sensor_types.h>
 
 #include "check-sensor.h"