From 61f313be33ef4017cc02f370d5c7018380528363 Mon Sep 17 00:00:00 2001 From: "hs81.go" Date: Fri, 1 Jul 2016 14:05:45 +0900 Subject: [PATCH] sensord: modify enum values for classification Change-Id: I0db7552f2c29f1805a20f13f47a7d79a73f0adec Signed-off-by: kibak.yoon --- src/hal/sensor_hal_types.h | 6 +++--- src/shared/sensor_types.h | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/hal/sensor_hal_types.h b/src/hal/sensor_hal_types.h index ffa96f1..6c30f47 100644 --- a/src/hal/sensor_hal_types.h +++ b/src/hal/sensor_hal_types.h @@ -92,11 +92,11 @@ typedef enum { SENSOR_DEVICE_GESTURE_WRIST_DOWN, SENSOR_DEVICE_GESTURE_MOVEMENT_STATE, - SENSOR_DEVICE_GPS_BATCH = 0x1A00, - SENSOR_DEVICE_ACTIVITY_TRACKER, + SENSOR_DEVICE_ACTIVITY_TRACKER = 0x1A00, + SENSOR_DEVICE_ACTIVITY_LEVEL_MONITOR, + SENSOR_DEVICE_GPS_BATCH, SENSOR_DEVICE_HRM_CTRL = 0x1A80, - SENSOR_DEVICE_ACTIVITY_LEVEL_MONITOR, SENSOR_DEVICE_WEAR_STATUS = 0x2000, SENSOR_DEVICE_WEAR_ON_MONITOR, diff --git a/src/shared/sensor_types.h b/src/shared/sensor_types.h index 0612f72..277cbc4 100644 --- a/src/shared/sensor_types.h +++ b/src/shared/sensor_types.h @@ -75,12 +75,11 @@ extern "C" DEF_SENSOR(GESTURE_WRIST_DOWN_SENSOR) \ DEF_SENSOR(GESTURE_MOVEMENT_STATE_SENSOR) \ \ - DEF_SENSOR_VALUE(GPS_BATCH_SENSOR, 0x1A00) \ - DEF_SENSOR(ACTIVITY_TRACKER_SENSOR) \ - DEF_SENSOR(EXERCISE_COMPANION_SENSOR) \ + DEF_SENSOR_VALUE(ACTIVITY_TRACKER_SENSOR, 0x1A00) \ + DEF_SENSOR(ACTIVITY_LEVEL_MONITOR_SENSOR) \ + DEF_SENSOR(GPS_BATCH_SENSOR) \ \ DEF_SENSOR_VALUE(HRM_CTRL_SENSOR, 0x1A80) \ - DEF_SENSOR(ACTIVITY_LEVEL_MONITOR_SENSOR) \ \ DEF_SENSOR_VALUE(WEAR_STATUS_SENSOR, 0x2000) \ DEF_SENSOR(WEAR_ON_MONITOR_SENSOR) \ @@ -114,7 +113,6 @@ extern "C" #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) -- 2.7.4