sensord: rename and reorder sensor types

- EXERCISE_COACH -> EXERCISE_STANDALONE
- EXERCISE       -> EXERCISE_COMPANION
- EXERCISE_STAIR_CLIMBING -> X

Change-Id: I43290e81ad9175bc2c63b46db7d6c98dcea62046
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/src/hal/sensor_hal_types.h b/src/hal/sensor_hal_types.h
index 9b7ccde..ffa96f1 100644 (file)
--- a/src/hal/sensor_hal_types.h
+++ b/src/hal/sensor_hal_types.h
@@ -78,7 +78,6 @@ typedef enum {
        SENSOR_DEVICE_EXERCISE_RUNNING,
        SENSOR_DEVICE_EXERCISE_HIKING,
        SENSOR_DEVICE_EXERCISE_CYCLING,
-       SENSOR_DEVICE_EXERCISE_STAIR_CLIMBING,
        SENSOR_DEVICE_EXERCISE_ELLIPTICAL,
        SENSOR_DEVICE_EXERCISE_INDOOR_CYCLING,
        SENSOR_DEVICE_EXERCISE_ROWING,
@@ -97,7 +96,6 @@ typedef enum {
        SENSOR_DEVICE_ACTIVITY_TRACKER,
 
        SENSOR_DEVICE_HRM_CTRL = 0x1A80,
-       SENSOR_DEVICE_EXERCISE_COACH,
        SENSOR_DEVICE_ACTIVITY_LEVEL_MONITOR,
 
        SENSOR_DEVICE_WEAR_STATUS = 0x2000,
@@ -105,7 +103,7 @@ typedef enum {
        SENSOR_DEVICE_NO_MOVE_DETECTOR,
        SENSOR_DEVICE_RESTING_HR,
        SENSOR_DEVICE_STEP_LEVEL_MONITOR,
-       SENSOR_DEVICE_EXERCISE,
+       SENSOR_DEVICE_EXERCISE_STANDALONE,
        SENSOR_DEVICE_EXERCISE_HR,
        SENSOR_DEVICE_WORKOUT,
        SENSOR_DEVICE_CYCLE_MONITOR,
@@ -219,8 +217,10 @@ typedef struct {
        } diffs[SENSOR_PEDOMETER_DATA_DIFFS_SIZE];
 } sensor_pedometer_data_t;
 
+#define CONVERT_TYPE_ATTR(type, index) ((type) << 8 | 0x80 | (index))
+
 enum sensor_attribute {
-       SENSOR_ATTR_ACTIVITY = 0x100,
+       SENSOR_ATTR_ACTIVITY = CONVERT_TYPE_ATTR(SENSOR_DEVICE_ACTIVITY_TRACKER, 0x1),
 };
 
 enum sensor_activity {

diff --git a/src/shared/sensor_types.h b/src/shared/sensor_types.h
index 5c890b9..0612f72 100644 (file)
--- a/src/shared/sensor_types.h
+++ b/src/shared/sensor_types.h
@@ -61,7 +61,6 @@ extern "C"
        DEF_SENSOR(EXERCISE_RUNNING_SENSOR) \
        DEF_SENSOR(EXERCISE_HIKING_SENSOR) \
        DEF_SENSOR(EXERCISE_CYCLING_SENSOR) \
-       DEF_SENSOR(EXERCISE_STAIR_CLIMBING_SENSOR) \
        DEF_SENSOR(EXERCISE_ELLIPTICAL_SENSOR) \
        DEF_SENSOR(EXERCISE_INDOOR_CYCLING_SENSOR) \
        DEF_SENSOR(EXERCISE_ROWING_SENSOR) \
@@ -78,9 +77,9 @@ extern "C"
        \
        DEF_SENSOR_VALUE(GPS_BATCH_SENSOR, 0x1A00) \
        DEF_SENSOR(ACTIVITY_TRACKER_SENSOR) \
+       DEF_SENSOR(EXERCISE_COMPANION_SENSOR) \
        \
        DEF_SENSOR_VALUE(HRM_CTRL_SENSOR, 0x1A80) \
-       DEF_SENSOR(EXERCISE_COACH_SENSOR) \
        DEF_SENSOR(ACTIVITY_LEVEL_MONITOR_SENSOR) \
        \
        DEF_SENSOR_VALUE(WEAR_STATUS_SENSOR, 0x2000) \
@@ -88,7 +87,7 @@ extern "C"
        DEF_SENSOR(NO_MOVE_DETECTOR_SENSOR) \
        DEF_SENSOR(RESTING_HR_SENSOR) \
        DEF_SENSOR(STEP_LEVEL_MONITOR_SENSOR) \
-       DEF_SENSOR(EXERCISE_SENSOR) \
+       DEF_SENSOR(EXERCISE_STANDALONE_SENSOR) \
        DEF_SENSOR(EXERCISE_HR_SENSOR) \
        DEF_SENSOR(WORKOUT_SENSOR) \
        DEF_SENSOR(CYCLE_MONITOR_SENSOR) \
@@ -114,6 +113,8 @@ extern "C"
 #define SLEEP_DETECTOR_SENSOR       HUMAN_SLEEP_DETECTOR_SENSOR
 #define STRESS_MONITOR_SENSOR       HUMAN_STRESS_MONITOR_SENSOR
 #define AUTOSESSION_EXERCISE_SENSOR WORKOUT_SENSOR
+#define EXERCISE_COACH_SENSOR       EXERCISE_STANDALONE_SENSOR
+#define EXERCISE_SENSOR             EXERCISE_COMPANION_SENSOR
 
 DECLARE_SENSOR_ENUM(sensor_type_t, SENSOR_TYPE)