From 1f7709f7866643c29e34b6d4fac84f2de160ad8b Mon Sep 17 00:00:00 2001 From: "pr.jung" Date: Mon, 7 Sep 2015 16:28:17 +0900 Subject: [PATCH] Rearrange mobile/wearable enumerations for feedback. Remove deprecated enums of feedback. And rearrange profile specific enum and common enum values. Change-Id: I17684dd768671cdbf1f7624198f0f4beb41baf0c Signed-off-by: Pureum Jung --- CMakeLists.txt | 5 ++ common/src/check.c | 26 ++++++ include/feedback-ids.h | 148 ++++++++----------------------- mobile/include/feedback-ids-mobile.h | 59 ++++++------ mobile/src/check.c | 49 +++++----- src/vibrator.c | 17 +++- wearable/include/feedback-ids-wearable.h | 46 +++++----- wearable/src/check.c | 51 +++++------ 8 files changed, 187 insertions(+), 214 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bfef688..271bc50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,11 @@ SET(HEADERS IF(NOT "${PROFILE}" STREQUAL "common") SET(HEADERS ${HEADERS} ${FEEDBACK_PROFILE_PATH}/include/feedback-ids-${PROFILE}.h) + IF("${PROFILE}" STREQUAL "mobile") + ADD_DEFINITIONS("-DMOBILE") + ELSEIF("${PROFILE}" STREQIAL "wearable") + ADD_DEFINITIONS("-DWEARABLE") + ENDIF() ENDIF() INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) diff --git a/common/src/check.c b/common/src/check.c index e66b238..eb3936f 100644 --- a/common/src/check.c +++ b/common/src/check.c @@ -32,6 +32,10 @@ static const char *common_str_type[] = { static const char *common_str_pattern[] = { "FEEDBACK_PATTERN_TAP", "FEEDBACK_PATTERN_SIP", + "", + "", + "", + "", "FEEDBACK_PATTERN_KEY0", "FEEDBACK_PATTERN_KEY1", "FEEDBACK_PATTERN_KEY2", @@ -46,28 +50,50 @@ static const char *common_str_pattern[] = { "FEEDBACK_PATTERN_KEY_SHARP", "FEEDBACK_PATTERN_KEY_BACK", "FEEDBACK_PATTERN_HOLD", + "", "FEEDBACK_PATTERN_HW_TAP", "FEEDBACK_PATTERN_HW_HOLD", "FEEDBACK_PATTERN_MESSAGE", + "", "FEEDBACK_PATTERN_EMAIL", + "", "FEEDBACK_PATTERN_WAKEUP", + "", "FEEDBACK_PATTERN_SCHEDULE", + "", "FEEDBACK_PATTERN_TIMER", + "", "FEEDBACK_PATTERN_GENERAL", + "", + "", "FEEDBACK_PATTERN_POWERON", "FEEDBACK_PATTERN_POWEROFF", "FEEDBACK_PATTERN_CHARGERCONN", + "", "FEEDBACK_PATTERN_CHARGING_ERROR", + "", "FEEDBACK_PATTERN_FULLCHARGED", + "", "FEEDBACK_PATTERN_LOWBATT", + "", "FEEDBACK_PATTERN_LOCK", "FEEDBACK_PATTERN_UNLOCK", + "", + "", + "", + "", + "", + "", + "", "FEEDBACK_PATTERN_VIBRATION_ON", "FEEDBACK_PATTERN_SILENT_OFF", "FEEDBACK_PATTERN_BT_CONNECTED", "FEEDBACK_PATTERN_BT_DISCONNECTED", + "", + "", + "", "FEEDBACK_PATTERN_LIST_REORDER", "FEEDBACK_PATTERN_LIST_SLIDER", "FEEDBACK_PATTERN_VOLUME_KEY", diff --git a/include/feedback-ids.h b/include/feedback-ids.h index b2f0019..6560940 100644 --- a/include/feedback-ids.h +++ b/include/feedback-ids.h @@ -38,8 +38,6 @@ typedef enum FEEDBACK_TYPE_SOUND, /**< Feedback type for sound */ FEEDBACK_TYPE_VIBRATION, /**< Feedback type for vibration */ FEEDBACK_TYPE_END, - /* TODO Will be removed */ - FEEDBACK_TYPE_LED = FEEDBACK_TYPE_VIBRATION + 1, } feedback_type_e; /** @@ -54,118 +52,50 @@ typedef enum { FEEDBACK_PATTERN_NONE = -1, - FEEDBACK_PATTERN_TAP = 0, /**< Feedback pattern when general touch */ - FEEDBACK_PATTERN_SIP, /**< Feedback pattern when touch text key */ - FEEDBACK_PATTERN_KEY0, /**< Feedback pattern when touch numeric 0 key */ - FEEDBACK_PATTERN_KEY1, /**< Feedback pattern when touch numeric 1 key */ - FEEDBACK_PATTERN_KEY2, /**< Feedback pattern when touch numeric 2 key */ - FEEDBACK_PATTERN_KEY3, /**< Feedback pattern when touch numeric 3 key */ - FEEDBACK_PATTERN_KEY4, /**< Feedback pattern when touch numeric 4 key */ - FEEDBACK_PATTERN_KEY5, /**< Feedback pattern when touch numeric 5 key */ - FEEDBACK_PATTERN_KEY6, /**< Feedback pattern when touch numeric 6 key */ - FEEDBACK_PATTERN_KEY7, /**< Feedback pattern when touch numeric 7 key */ - FEEDBACK_PATTERN_KEY8, /**< Feedback pattern when touch numeric 8 key */ - FEEDBACK_PATTERN_KEY9, /**< Feedback pattern when touch numeric 9 key */ - FEEDBACK_PATTERN_KEY_STAR, /**< Feedback pattern when touch star key */ - FEEDBACK_PATTERN_KEY_SHARP, /**< Feedback pattern when touch sharp key */ - FEEDBACK_PATTERN_KEY_BACK, /**< Feedback pattern when touch backspace key */ - FEEDBACK_PATTERN_HOLD, /**< Feedback pattern when touch hold */ - FEEDBACK_PATTERN_HW_TAP, /**< Feedback pattern when press hardware key */ - FEEDBACK_PATTERN_HW_HOLD, /**< Feedback pattern when holding press hardware key */ + FEEDBACK_PATTERN_TAP = 0, /**< Feedback pattern when general touch */ + FEEDBACK_PATTERN_SIP, /**< Feedback pattern when touch text key */ + FEEDBACK_PATTERN_KEY0 = 6, /**< Feedback pattern when touch numeric 0 key */ + FEEDBACK_PATTERN_KEY1, /**< Feedback pattern when touch numeric 1 key */ + FEEDBACK_PATTERN_KEY2, /**< Feedback pattern when touch numeric 2 key */ + FEEDBACK_PATTERN_KEY3, /**< Feedback pattern when touch numeric 3 key */ + FEEDBACK_PATTERN_KEY4, /**< Feedback pattern when touch numeric 4 key */ + FEEDBACK_PATTERN_KEY5, /**< Feedback pattern when touch numeric 5 key */ + FEEDBACK_PATTERN_KEY6, /**< Feedback pattern when touch numeric 6 key */ + FEEDBACK_PATTERN_KEY7, /**< Feedback pattern when touch numeric 7 key */ + FEEDBACK_PATTERN_KEY8, /**< Feedback pattern when touch numeric 8 key */ + FEEDBACK_PATTERN_KEY9, /**< Feedback pattern when touch numeric 9 key */ + FEEDBACK_PATTERN_KEY_STAR, /**< Feedback pattern when touch star key */ + FEEDBACK_PATTERN_KEY_SHARP, /**< Feedback pattern when touch sharp key */ + FEEDBACK_PATTERN_KEY_BACK, /**< Feedback pattern when touch backspace key */ + FEEDBACK_PATTERN_HOLD, /**< Feedback pattern when touch hold */ + FEEDBACK_PATTERN_HW_TAP = 21, /**< Feedback pattern when press hardware key */ + FEEDBACK_PATTERN_HW_HOLD, /**< Feedback pattern when holding press hardware key */ - FEEDBACK_PATTERN_MESSAGE, /**< Feedback pattern when incoming a message */ - FEEDBACK_PATTERN_EMAIL, /**< Feedback pattern when incoming an email */ - FEEDBACK_PATTERN_WAKEUP, /**< Feedback pattern when alert wake up call */ - FEEDBACK_PATTERN_SCHEDULE, /**< Feedback pattern when alert schedule alarm */ - FEEDBACK_PATTERN_TIMER, /**< Feedback pattern when alert timer */ - FEEDBACK_PATTERN_GENERAL, /**< Feedback pattern when alert general event */ + FEEDBACK_PATTERN_MESSAGE, /**< Feedback pattern when incoming a message */ + FEEDBACK_PATTERN_EMAIL = 25, /**< Feedback pattern when incoming an email */ + FEEDBACK_PATTERN_WAKEUP = 27, /**< Feedback pattern when alert wake up call */ + FEEDBACK_PATTERN_SCHEDULE = 29, /**< Feedback pattern when alert schedule alarm */ + FEEDBACK_PATTERN_TIMER = 31, /**< Feedback pattern when alert timer */ + FEEDBACK_PATTERN_GENERAL = 33, /**< Feedback pattern when alert general event */ - FEEDBACK_PATTERN_POWERON, /**< Feedback pattern when power on */ - FEEDBACK_PATTERN_POWEROFF, /**< Feedback pattern when power off */ - FEEDBACK_PATTERN_CHARGERCONN, /**< Feedback pattern when connecting charger */ - FEEDBACK_PATTERN_CHARGING_ERROR, /**< Feedback pattern when occuring charging error */ - FEEDBACK_PATTERN_FULLCHARGED, /**< Feedback pattern when full charged */ - FEEDBACK_PATTERN_LOWBATT, /**< Feedback pattern when low battery */ - FEEDBACK_PATTERN_LOCK, /**< Feedback pattern when lock */ - FEEDBACK_PATTERN_UNLOCK, /**< Feedback pattern when unlock */ - FEEDBACK_PATTERN_VIBRATION_ON, /**< Feedback pattern when turn on vibration mode */ - FEEDBACK_PATTERN_SILENT_OFF, /**< Feedback pattern when turn off silent mode */ - FEEDBACK_PATTERN_BT_CONNECTED, /**< Feedback pattern when connecting with bluetooth */ - FEEDBACK_PATTERN_BT_DISCONNECTED, /**< Feedback pattern when disconnecting with bluetooth */ - FEEDBACK_PATTERN_LIST_REORDER, /**< Feedback pattern when list reorder */ - FEEDBACK_PATTERN_LIST_SLIDER, /**< Feedback pattern when list slider sweep */ - FEEDBACK_PATTERN_VOLUME_KEY, /**< Feedback pattern when pressed volume key */ + FEEDBACK_PATTERN_POWERON = 36, /**< Feedback pattern when power on */ + FEEDBACK_PATTERN_POWEROFF, /**< Feedback pattern when power off */ + FEEDBACK_PATTERN_CHARGERCONN, /**< Feedback pattern when connecting charger */ + FEEDBACK_PATTERN_CHARGING_ERROR = 40, /**< Feedback pattern when occuring charging error */ + FEEDBACK_PATTERN_FULLCHARGED = 42, /**< Feedback pattern when full charged */ + FEEDBACK_PATTERN_LOWBATT = 44, /**< Feedback pattern when low battery */ + FEEDBACK_PATTERN_LOCK = 46, /**< Feedback pattern when lock */ + FEEDBACK_PATTERN_UNLOCK, /**< Feedback pattern when unlock */ + FEEDBACK_PATTERN_VIBRATION_ON = 55, /**< Feedback pattern when turn on vibration mode */ + FEEDBACK_PATTERN_SILENT_OFF, /**< Feedback pattern when turn off silent mode */ + FEEDBACK_PATTERN_BT_CONNECTED, /**< Feedback pattern when connecting with bluetooth */ + FEEDBACK_PATTERN_BT_DISCONNECTED, /**< Feedback pattern when disconnecting with bluetooth */ + FEEDBACK_PATTERN_LIST_REORDER = 62, /**< Feedback pattern when list reorder */ + FEEDBACK_PATTERN_LIST_SLIDER, /**< Feedback pattern when list slider sweep */ + FEEDBACK_PATTERN_VOLUME_KEY, /**< Feedback pattern when pressed volume key */ FEEDBACK_PATTERN_END, - /* TODO Will be removed */ - FEEDBACK_PATTERN_TOUCH_TAP = FEEDBACK_PATTERN_TAP, - FEEDBACK_PATTERN_TOUCH_MULTI_TAP = FEEDBACK_PATTERN_TAP, - FEEDBACK_PATTERN_TOUCH_KEY = FEEDBACK_PATTERN_KEY0, - FEEDBACK_PATTERN_TOUCH_HOLD = FEEDBACK_PATTERN_HOLD, - FEEDBACK_PATTERN_REACTIVE_ALERT = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_VIBRATION = FEEDBACK_PATTERN_VIBRATION_ON, - FEEDBACK_PATTERN_SOUND_ON = FEEDBACK_PATTERN_SILENT_OFF, - FEEDBACK_PATTERN_SHUTTER = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SLIDER_SWEEP = FEEDBACK_PATTERN_LIST_SLIDER, - FEEDBACK_PATTERN_SAFETY_ASSISTANCE = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_BT_PARING = FEEDBACK_PATTERN_BT_CONNECTED, - FEEDBACK_PATTERN_CONNECTED = FEEDBACK_PATTERN_BT_CONNECTED, - FEEDBACK_PATTERN_DISCONNECTED = FEEDBACK_PATTERN_BT_DISCONNECTED, - FEEDBACK_PATTERN_SUCCESS = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_FAILURE = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SIP_BACKSPACE = FEEDBACK_PATTERN_SIP, - FEEDBACK_PATTERN_SIP_FUNCTION = FEEDBACK_PATTERN_SIP, - FEEDBACK_PATTERN_SIP_FJKEY = FEEDBACK_PATTERN_SIP, - FEEDBACK_PATTERN_MAX_CHARACTER = FEEDBACK_PATTERN_SIP, - FEEDBACK_PATTERN_MULTI_TAP = FEEDBACK_PATTERN_TAP, - FEEDBACK_PATTERN_MESSAGE_ON_CALL = FEEDBACK_PATTERN_MESSAGE, - FEEDBACK_PATTERN_EMAIL_ON_CALL = FEEDBACK_PATTERN_EMAIL, - FEEDBACK_PATTERN_WAKEUP_ON_CALL = FEEDBACK_PATTERN_WAKEUP, - FEEDBACK_PATTERN_SCHEDULE_ON_CALL = FEEDBACK_PATTERN_SCHEDULE, - FEEDBACK_PATTERN_TIMER_ON_CALL = FEEDBACK_PATTERN_TIMER, - FEEDBACK_PATTERN_GENERAL_ON_CALL = FEEDBACK_PATTERN_GENERAL, - FEEDBACK_PATTERN_SMART_ALERT = FEEDBACK_PATTERN_GENERAL, - FEEDBACK_PATTERN_CHARGERCONN_ON_CALL = FEEDBACK_PATTERN_CHARGERCONN, - FEEDBACK_PATTERN_CHARGING_ERROR_ON_CALL = FEEDBACK_PATTERN_CHARGING_ERROR, - FEEDBACK_PATTERN_FULLCHARGED_ON_CALL = FEEDBACK_PATTERN_FULLCHARGED, - FEEDBACK_PATTERN_LOWBATT_ON_CALL = FEEDBACK_PATTERN_LOWBATT, - FEEDBACK_PATTERN_LOCK_SWIPE = FEEDBACK_PATTERN_LOCK, - FEEDBACK_PATTERN_UNLOCK_SWIPE = FEEDBACK_PATTERN_UNLOCK, - FEEDBACK_PATTERN_GEOMETRIC_LOCK = FEEDBACK_PATTERN_LOCK, - FEEDBACK_PATTERN_CALLCONNECT = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_DISCALLCONNECT = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_OUTGOING_CALL = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_MINUTEMINDER = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_BT_PAIRING = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_BT_WAITING = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SCREEN_CAPTURE = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_MMS = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_HOURLY_ALERT = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SAFETY_ALERT = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_ACCIDENT_DETECT = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SEND_SOS_MESSAGE = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_END_SOS_MESSAGE = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_EMERGENCY_BUZZER = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SAFETY_LOW_POWER = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_CMAS = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SPEED_UP = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SLOW_DOWN = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_KEEP_THIS_PACE = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_GOAL_ACHIEVED = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_EXERCISE_COUNT = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_START_CUE = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_HEALTH_PACE = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_INACTIVE_TIME = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_MEASURING_SUCCESS = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_MEASURING_FAILURE = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_UV_PROCESSING = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SHEALTH_START = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SHEALTH_PAUSE = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_SHEALTH_STOP = FEEDBACK_PATTERN_NONE, - FEEDBACK_PATTERN_3RD_APPLICATION = FEEDBACK_PATTERN_NONE, - /* END : Will be removed */ - } feedback_pattern_e; /** diff --git a/mobile/include/feedback-ids-mobile.h b/mobile/include/feedback-ids-mobile.h index c1932f0..10c001d 100644 --- a/mobile/include/feedback-ids-mobile.h +++ b/mobile/include/feedback-ids-mobile.h @@ -55,35 +55,36 @@ typedef enum { FEEDBACK_PATTERN_MOBILE_NONE = -1, - FEEDBACK_PATTERN_MOBILE_SIP_BACKSPACE = FEEDBACK_PATTERN_END, /**< feedback pattern when touch backspace key */ - FEEDBACK_PATTERN_MOBILE_SIP_FUNCTION, /**< feedback pattern when touch function key */ - FEEDBACK_PATTERN_MOBILE_SIP_FJKEY, /**< feedback pattern when touch F,J key */ - FEEDBACK_PATTERN_MOBILE_MAX_CHARACTER, /**< feedback pattern when max character */ - FEEDBACK_PATTERN_MOBILE_MULTI_TAP, /**< feedback pattern when multi touch */ - - FEEDBACK_PATTERN_MOBILE_MESSAGE_ON_CALL, /**< feedback pattern when incoming a message on call */ - FEEDBACK_PATTERN_MOBILE_EMAIL_ON_CALL, /**< feedback pattern when incoming an email on call */ - FEEDBACK_PATTERN_MOBILE_WAKEUP_ON_CALL, /**< feedback pattern when alert wake up call on call */ - FEEDBACK_PATTERN_MOBILE_SCHEDULE_ON_CALL, /**< feedback pattern when alert schedule alarm on call */ - FEEDBACK_PATTERN_MOBILE_TIMER_ON_CALL, /**< feedback pattern when alert timer on call */ - FEEDBACK_PATTERN_MOBILE_GENERAL_ON_CALL, /**< feedback pattern when alert general event on call */ - FEEDBACK_PATTERN_MOBILE_SMART_ALERT, /**< feedback pattern when alert noti on motion */ - - FEEDBACK_PATTERN_MOBILE_CHARGERCONN_ON_CALL, /**< feedback pattern when connecting charger on call */ - FEEDBACK_PATTERN_MOBILE_CHARGING_ERROR_ON_CALL,/**< feedback pattern when occuring charging error on call */ - FEEDBACK_PATTERN_MOBILE_FULLCHARGED_ON_CALL, /**< feedback pattern when full charged on call */ - FEEDBACK_PATTERN_MOBILE_LOWBATT_ON_CALL, /**< feedback pattern when low battery on call */ - FEEDBACK_PATTERN_MOBILE_LOCK_SWIPE, /**< feedback pattern when lock swipe */ - FEEDBACK_PATTERN_MOBILE_UNLOCK_SWIPE, /**< feedback pattern when unlock swipe*/ - FEEDBACK_PATTERN_MOBILE_GEOMETRIC_LOCK, /**< feedback pattern when lock by geometric effect */ - FEEDBACK_PATTERN_MOBILE_CALLCONNECT, /**< feedback pattern when connecting call */ - FEEDBACK_PATTERN_MOBILE_DISCALLCONNECT, /**< feedback pattern when disconnecting call */ - FEEDBACK_PATTERN_MOBILE_OUTGOING_CALL, /**< feedback pattern when connected outgoing call */ - FEEDBACK_PATTERN_MOBILE_MINUTEMINDER, /**< feedback pattern when minute minder */ - FEEDBACK_PATTERN_MOBILE_BT_PAIRING, /**< feedback pattern when starting pare with bluetooth */ - FEEDBACK_PATTERN_MOBILE_BT_WAITING, /**< feedback pattern when pairing bluetooth */ - FEEDBACK_PATTERN_MOBILE_SCREEN_CAPTURE, /**< feedback pattern when screen capture */ - FEEDBACK_PATTERN_MOBILE_MMS, /**< feedback pattern when message state changed to MMS */ + FEEDBACK_PATTERN_MOBILE_SIP_BACKSPACE = 2, /**< feedback pattern when touch backspace key */ + FEEDBACK_PATTERN_MOBILE_SIP_FUNCTION = 3, /**< feedback pattern when touch function key */ + FEEDBACK_PATTERN_MOBILE_SIP_FJKEY = 4, /**< feedback pattern when touch F,J key */ + FEEDBACK_PATTERN_MOBILE_MAX_CHARACTER = 5, /**< feedback pattern when max character */ + + FEEDBACK_PATTERN_MOBILE_MULTI_TAP = 20, /**< feedback pattern when multi touch */ + + FEEDBACK_PATTERN_MOBILE_MESSAGE_ON_CALL = 24, /**< feedback pattern when incoming a message on call */ + FEEDBACK_PATTERN_MOBILE_EMAIL_ON_CALL = 26, /**< feedback pattern when incoming an email on call */ + FEEDBACK_PATTERN_MOBILE_WAKEUP_ON_CALL = 28, /**< feedback pattern when alert wake up call on call */ + FEEDBACK_PATTERN_MOBILE_SCHEDULE_ON_CALL = 30, /**< feedback pattern when alert schedule alarm on call */ + FEEDBACK_PATTERN_MOBILE_TIMER_ON_CALL = 32, /**< feedback pattern when alert timer on call */ + FEEDBACK_PATTERN_MOBILE_GENERAL_ON_CALL = 34, /**< feedback pattern when alert general event on call */ + FEEDBACK_PATTERN_MOBILE_SMART_ALERT = 35, /**< feedback pattern when alert noti on motion */ + + FEEDBACK_PATTERN_MOBILE_CHARGERCONN_ON_CALL = 39, /**< feedback pattern when connecting charger on call */ + FEEDBACK_PATTERN_MOBILE_CHARGING_ERROR_ON_CALL = 41,/**< feedback pattern when occuring charging error on call */ + FEEDBACK_PATTERN_MOBILE_FULLCHARGED_ON_CALL = 43, /**< feedback pattern when full charged on call */ + FEEDBACK_PATTERN_MOBILE_LOWBATT_ON_CALL = 45, /**< feedback pattern when low battery on call */ + FEEDBACK_PATTERN_MOBILE_LOCK_SWIPE = 48, /**< feedback pattern when lock swipe */ + FEEDBACK_PATTERN_MOBILE_UNLOCK_SWIPE = 49, /**< feedback pattern when unlock swipe*/ + FEEDBACK_PATTERN_MOBILE_GEOMETRIC_LOCK = 50, /**< feedback pattern when lock by geometric effect */ + FEEDBACK_PATTERN_MOBILE_CALLCONNECT = 51, /**< feedback pattern when connecting call */ + FEEDBACK_PATTERN_MOBILE_DISCALLCONNECT = 52, /**< feedback pattern when disconnecting call */ + FEEDBACK_PATTERN_MOBILE_OUTGOING_CALL = 53, /**< feedback pattern when connected outgoing call */ + FEEDBACK_PATTERN_MOBILE_MINUTEMINDER = 54, /**< feedback pattern when minute minder */ + FEEDBACK_PATTERN_MOBILE_BT_PAIRING = 59, /**< feedback pattern when starting pare with bluetooth */ + FEEDBACK_PATTERN_MOBILE_BT_WAITING = 60, /**< feedback pattern when pairing bluetooth */ + FEEDBACK_PATTERN_MOBILE_SCREEN_CAPTURE = 61, /**< feedback pattern when screen capture */ + FEEDBACK_PATTERN_MOBILE_MMS = 65, /**< feedback pattern when message state changed to MMS */ FEEDBACK_PATTERN_MOBILE_HOURLY_ALERT, /**< feedback pattern when alert every hour on the hour */ FEEDBACK_PATTERN_MOBILE_SAFETY_ALERT, /**< feedback pattern when safety alert from phone */ diff --git a/mobile/src/check.c b/mobile/src/check.c index 9f3a4e1..6f06d44 100644 --- a/mobile/src/check.c +++ b/mobile/src/check.c @@ -43,6 +43,10 @@ static const char *mobile_str_type[] = { static const char *mobile_str_pattern[] = { "FEEDBACK_PATTERN_TAP", "FEEDBACK_PATTERN_SIP", + "FEEDBACK_PATTERN_MOBILE_SIP_BACKSPACE", + "FEEDBACK_PATTERN_MOBILE_SIP_FUNCTION", + "FEEDBACK_PATTERN_MOBILE_SIP_FJKEY", + "FEEDBACK_PATTERN_MOBILE_MAX_CHARACTER", "FEEDBACK_PATTERN_KEY0", "FEEDBACK_PATTERN_KEY1", "FEEDBACK_PATTERN_KEY2", @@ -57,50 +61,36 @@ static const char *mobile_str_pattern[] = { "FEEDBACK_PATTERN_KEY_SHARP", "FEEDBACK_PATTERN_KEY_BACK", "FEEDBACK_PATTERN_HOLD", + "FEEDBACK_PATTERN_MOBILE_MULTI_TAP", "FEEDBACK_PATTERN_HW_TAP", "FEEDBACK_PATTERN_HW_HOLD", "FEEDBACK_PATTERN_MESSAGE", + "FEEDBACK_PATTERN_MOBILE_MESSAGE_ON_CALL", "FEEDBACK_PATTERN_EMAIL", + "FEEDBACK_PATTERN_MOBILE_EMAIL_ON_CALL", "FEEDBACK_PATTERN_WAKEUP", + "FEEDBACK_PATTERN_MOBILE_WAKEUP_ON_CALL", "FEEDBACK_PATTERN_SCHEDULE", + "FEEDBACK_PATTERN_MOBILE_SCHEDULE_ON_CALL", "FEEDBACK_PATTERN_TIMER", + "FEEDBACK_PATTERN_MOBILE_TIMER_ON_CALL", "FEEDBACK_PATTERN_GENERAL", + "FEEDBACK_PATTERN_MOBILE_GENERAL_ON_CALL", + "FEEDBACK_PATTERN_MOBILE_SMART_ALERT", "FEEDBACK_PATTERN_POWERON", "FEEDBACK_PATTERN_POWEROFF", "FEEDBACK_PATTERN_CHARGERCONN", + "FEEDBACK_PATTERN_MOBILE_CHARGERCONN_ON_CALL", "FEEDBACK_PATTERN_CHARGING_ERROR", + "FEEDBACK_PATTERN_MOBILE_CHARGING_ERROR_ON_CALL", "FEEDBACK_PATTERN_FULLCHARGED", + "FEEDBACK_PATTERN_MOBILE_FULLCHARGED_ON_CALL", "FEEDBACK_PATTERN_LOWBATT", + "FEEDBACK_PATTERN_MOBILE_LOWBATT_ON_CALL", "FEEDBACK_PATTERN_LOCK", "FEEDBACK_PATTERN_UNLOCK", - "FEEDBACK_PATTERN_VIBRATION_ON", - "FEEDBACK_PATTERN_SILENT_OFF", - "FEEDBACK_PATTERN_BT_CONNECTED", - "FEEDBACK_PATTERN_BT_DISCONNECTED", - "FEEDBACK_PATTERN_LIST_REORDER", - "FEEDBACK_PATTERN_LIST_SLIDER", - "FEEDBACK_PATTERN_VOLUME_KEY", - - "FEEDBACK_PATTERN_MOBILE_SIP_BACKSPACE", - "FEEDBACK_PATTERN_MOBILE_SIP_FUNCTION", - "FEEDBACK_PATTERN_MOBILE_SIP_FJKEY", - "FEEDBACK_PATTERN_MOBILE_MAX_CHARACTER", - "FEEDBACK_PATTERN_MOBILE_MULTI_TAP", - - "FEEDBACK_PATTERN_MOBILE_MESSAGE_ON_CALL", - "FEEDBACK_PATTERN_MOBILE_EMAIL_ON_CALL", - "FEEDBACK_PATTERN_MOBILE_WAKEUP_ON_CALL", - "FEEDBACK_PATTERN_MOBILE_SCHEDULE_ON_CALL", - "FEEDBACK_PATTERN_MOBILE_TIMER_ON_CALL", - "FEEDBACK_PATTERN_MOBILE_GENERAL_ON_CALL", - "FEEDBACK_PATTERN_MOBILE_SMART_ALERT", - - "FEEDBACK_PATTERN_MOBILE_CHARGERCONN_ON_CALL", - "FEEDBACK_PATTERN_MOBILE_CHARGING_ERROR_ON_CALL", - "FEEDBACK_PATTERN_MOBILE_FULLCHARGED_ON_CALL", - "FEEDBACK_PATTERN_MOBILE_LOWBATT_ON_CALL", "FEEDBACK_PATTERN_MOBILE_LOCK_SWIPE", "FEEDBACK_PATTERN_MOBILE_UNLOCK_SWIPE", "FEEDBACK_PATTERN_MOBILE_GEOMETRIC_LOCK", @@ -108,9 +98,16 @@ static const char *mobile_str_pattern[] = { "FEEDBACK_PATTERN_MOBILE_DISCALLCONNECT", "FEEDBACK_PATTERN_MOBILE_OUTGOING_CALL", "FEEDBACK_PATTERN_MOBILE_MINUTEMINDER", + "FEEDBACK_PATTERN_VIBRATION_ON", + "FEEDBACK_PATTERN_SILENT_OFF", + "FEEDBACK_PATTERN_BT_CONNECTED", + "FEEDBACK_PATTERN_BT_DISCONNECTED", "FEEDBACK_PATTERN_MOBILE_BT_PAIRING", "FEEDBACK_PATTERN_MOBILE_BT_WAITING", "FEEDBACK_PATTERN_MOBILE_SCREEN_CAPTURE", + "FEEDBACK_PATTERN_LIST_REORDER", + "FEEDBACK_PATTERN_LIST_SLIDER", + "FEEDBACK_PATTERN_VOLUME_KEY", "FEEDBACK_PATTERN_MOBILE_MMS", "FEEDBACK_PATTERN_MOBILE_HOURLY_ALERT", diff --git a/src/vibrator.c b/src/vibrator.c index d267ff2..5632ad7 100644 --- a/src/vibrator.c +++ b/src/vibrator.c @@ -32,6 +32,12 @@ #include "devices.h" #include "log.h" #include "dbus.h" +#ifdef MOBILE +#include "feedback-ids-mobile.h" +#endif +#ifdef WEARABLE +#include "feedback-ids-wearable.h" +#endif #define HAPTIC_DEVICE 0 @@ -236,9 +242,16 @@ static int get_priority(feedback_pattern_e pattern) static int get_duration(feedback_pattern_e pattern) { - if (pattern == FEEDBACK_PATTERN_SIP || pattern == FEEDBACK_PATTERN_SIP_BACKSPACE) + if (pattern == FEEDBACK_PATTERN_SIP) return SIP_DURATION; - +#ifdef MOBILE + if (pattern == (feedback_pattern_e)FEEDBACK_PATTERN_MOBILE_SIP_BACKSPACE) + return SIP_DURATION; +#endif +#ifdef WEARABLE + if (pattern == (feedback_pattern_e)FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE) + return SIP_DURATION; +#endif return DEFAULT_DURATION; } diff --git a/wearable/include/feedback-ids-wearable.h b/wearable/include/feedback-ids-wearable.h index fb7188c..2b66be4 100644 --- a/wearable/include/feedback-ids-wearable.h +++ b/wearable/include/feedback-ids-wearable.h @@ -44,31 +44,31 @@ typedef enum { FEEDBACK_PATTERN_WEARABLE_NONE = -1, - FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE = FEEDBACK_PATTERN_END, /**< feedback pattern when touch backspace key */ - FEEDBACK_PATTERN_WEARABLE_SIP_FUNCTION, /**< feedback pattern when touch function key */ - FEEDBACK_PATTERN_WEARABLE_SIP_FJKEY, /**< feedback pattern when touch F,J key */ - FEEDBACK_PATTERN_WEARABLE_MAX_CHARACTER, /**< feedback pattern when max character */ + FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE = 2, /**< feedback pattern when touch backspace key */ + FEEDBACK_PATTERN_WEARABLE_SIP_FUNCTION = 3, /**< feedback pattern when touch function key */ + FEEDBACK_PATTERN_WEARABLE_SIP_FJKEY = 4, /**< feedback pattern when touch F,J key */ + FEEDBACK_PATTERN_WEARABLE_MAX_CHARACTER = 5, /**< feedback pattern when max character */ - FEEDBACK_PATTERN_WEARABLE_MESSAGE_ON_CALL, /**< feedback pattern when incoming a message on call */ - FEEDBACK_PATTERN_WEARABLE_EMAIL_ON_CALL, /**< feedback pattern when incoming an email on call */ - FEEDBACK_PATTERN_WEARABLE_WAKEUP_ON_CALL, /**< feedback pattern when alert wake up call on call */ - FEEDBACK_PATTERN_WEARABLE_SCHEDULE_ON_CALL, /**< feedback pattern when alert schedule alarm on call */ - FEEDBACK_PATTERN_WEARABLE_TIMER_ON_CALL, /**< feedback pattern when alert timer on call */ - FEEDBACK_PATTERN_WEARABLE_GENERAL_ON_CALL, /**< feedback pattern when alert general event on call */ - FEEDBACK_PATTERN_WEARABLE_SMART_ALERT, /**< feedback pattern when alert noti on motion */ + FEEDBACK_PATTERN_WEARABLE_MESSAGE_ON_CALL = 24, /**< feedback pattern when incoming a message on call */ + FEEDBACK_PATTERN_WEARABLE_EMAIL_ON_CALL = 26, /**< feedback pattern when incoming an email on call */ + FEEDBACK_PATTERN_WEARABLE_WAKEUP_ON_CALL = 28, /**< feedback pattern when alert wake up call on call */ + FEEDBACK_PATTERN_WEARABLE_SCHEDULE_ON_CALL = 30, /**< feedback pattern when alert schedule alarm on call */ + FEEDBACK_PATTERN_WEARABLE_TIMER_ON_CALL = 32, /**< feedback pattern when alert timer on call */ + FEEDBACK_PATTERN_WEARABLE_GENERAL_ON_CALL = 34, /**< feedback pattern when alert general event on call */ + FEEDBACK_PATTERN_WEARABLE_SMART_ALERT = 35, /**< feedback pattern when alert noti on motion */ - FEEDBACK_PATTERN_WEARABLE_CHARGERCONN_ON_CALL, /**< feedback pattern when connecting charger on call */ - FEEDBACK_PATTERN_WEARABLE_CHARGING_ERROR_ON_CALL,/**< feedback pattern when occuring charging error on call */ - FEEDBACK_PATTERN_WEARABLE_FULLCHARGED_ON_CALL, /**< feedback pattern when full charged on call */ - FEEDBACK_PATTERN_WEARABLE_LOWBATT_ON_CALL, /**< feedback pattern when low battery on call */ - FEEDBACK_PATTERN_WEARABLE_CALLCONNECT, /**< feedback pattern when connecting call */ - FEEDBACK_PATTERN_WEARABLE_DISCALLCONNECT, /**< feedback pattern when disconnecting call */ - FEEDBACK_PATTERN_WEARABLE_OUTGOING_CALL, /**< feedback pattern when connected outgoing call */ - FEEDBACK_PATTERN_WEARABLE_MINUTEMINDER, /**< feedback pattern when minute minder */ - FEEDBACK_PATTERN_WEARABLE_BT_PAIRING, /**< feedback pattern when starting pare with bluetooth */ - FEEDBACK_PATTERN_WEARABLE_BT_WAITING, /**< feedback pattern when pairing bluetooth */ - FEEDBACK_PATTERN_WEARABLE_SCREEN_CAPTURE, /**< feedback pattern when screen capture */ - FEEDBACK_PATTERN_WEARABLE_MMS, /**< feedback pattern when message state changed to MMS */ + FEEDBACK_PATTERN_WEARABLE_CHARGERCONN_ON_CALL = 39, /**< feedback pattern when connecting charger on call */ + FEEDBACK_PATTERN_WEARABLE_CHARGING_ERROR_ON_CALL = 41,/**< feedback pattern when occuring charging error on call */ + FEEDBACK_PATTERN_WEARABLE_FULLCHARGED_ON_CALL = 43, /**< feedback pattern when full charged on call */ + FEEDBACK_PATTERN_WEARABLE_LOWBATT_ON_CALL = 45, /**< feedback pattern when low battery on call */ + FEEDBACK_PATTERN_WEARABLE_CALLCONNECT = 51, /**< feedback pattern when connecting call */ + FEEDBACK_PATTERN_WEARABLE_DISCALLCONNECT = 52, /**< feedback pattern when disconnecting call */ + FEEDBACK_PATTERN_WEARABLE_OUTGOING_CALL = 53, /**< feedback pattern when connected outgoing call */ + FEEDBACK_PATTERN_WEARABLE_MINUTEMINDER = 54, /**< feedback pattern when minute minder */ + FEEDBACK_PATTERN_WEARABLE_BT_PAIRING = 59, /**< feedback pattern when starting pare with bluetooth */ + FEEDBACK_PATTERN_WEARABLE_BT_WAITING = 60, /**< feedback pattern when pairing bluetooth */ + FEEDBACK_PATTERN_WEARABLE_SCREEN_CAPTURE = 61, /**< feedback pattern when screen capture */ + FEEDBACK_PATTERN_WEARABLE_MMS = 65, /**< feedback pattern when message state changed to MMS */ FEEDBACK_PATTERN_WEARABLE_HOURLY_ALERT, /**< feedback pattern when alert every hour on the hour */ FEEDBACK_PATTERN_WEARABLE_SAFETY_ALERT, /**< feedback pattern when safety alert from phone */ diff --git a/wearable/src/check.c b/wearable/src/check.c index 79d008f..b0937e1 100644 --- a/wearable/src/check.c +++ b/wearable/src/check.c @@ -34,6 +34,10 @@ static const char *wearable_str_type[] = { static const char *wearable_str_pattern[] = { "FEEDBACK_PATTERN_TAP", "FEEDBACK_PATTERN_SIP", + "FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE", + "FEEDBACK_PATTERN_WEARABLE_SIP_FUNCTION", + "FEEDBACK_PATTERN_WEARABLE_SIP_FJKEY", + "FEEDBACK_PATTERN_WEARABLE_MAX_CHARACTER", "FEEDBACK_PATTERN_KEY0", "FEEDBACK_PATTERN_KEY1", "FEEDBACK_PATTERN_KEY2", @@ -48,56 +52,53 @@ static const char *wearable_str_pattern[] = { "FEEDBACK_PATTERN_KEY_SHARP", "FEEDBACK_PATTERN_KEY_BACK", "FEEDBACK_PATTERN_HOLD", + "", "FEEDBACK_PATTERN_HW_TAP", "FEEDBACK_PATTERN_HW_HOLD", "FEEDBACK_PATTERN_MESSAGE", + "FEEDBACK_PATTERN_WEARABLE_MESSAGE_ON_CALL", "FEEDBACK_PATTERN_EMAIL", + "FEEDBACK_PATTERN_WEARABLE_EMAIL_ON_CALL", "FEEDBACK_PATTERN_WAKEUP", + "FEEDBACK_PATTERN_WEARABLE_WAKEUP_ON_CALL", "FEEDBACK_PATTERN_SCHEDULE", + "FEEDBACK_PATTERN_WEARABLE_SCHEDULE_ON_CALL", "FEEDBACK_PATTERN_TIMER", + "FEEDBACK_PATTERN_WEARABLE_TIMER_ON_CALL", "FEEDBACK_PATTERN_GENERAL", + "FEEDBACK_PATTERN_WEARABLE_GENERAL_ON_CALL", + "FEEDBACK_PATTERN_WEARABLE_SMART_ALERT", "FEEDBACK_PATTERN_POWERON", "FEEDBACK_PATTERN_POWEROFF", "FEEDBACK_PATTERN_CHARGERCONN", + "FEEDBACK_PATTERN_WEARABLE_CHARGERCONN_ON_CALL", "FEEDBACK_PATTERN_CHARGING_ERROR", + "FEEDBACK_PATTERN_WEARABLE_CHARGING_ERROR_ON_CALL", "FEEDBACK_PATTERN_FULLCHARGED", + "FEEDBACK_PATTERN_WEARABLE_FULLCHARGED_ON_CALL", "FEEDBACK_PATTERN_LOWBATT", + "FEEDBACK_PATTERN_WEARABLE_LOWBATT_ON_CALL", "FEEDBACK_PATTERN_LOCK", "FEEDBACK_PATTERN_UNLOCK", - "FEEDBACK_PATTERN_VIBRATION_ON", - "FEEDBACK_PATTERN_SILENT_OFF", - "FEEDBACK_PATTERN_BT_CONNECTED", - "FEEDBACK_PATTERN_BT_DISCONNECTED", - "FEEDBACK_PATTERN_LIST_REORDER", - "FEEDBACK_PATTERN_LIST_SLIDER", - "FEEDBACK_PATTERN_VOLUME_KEY", - - "FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE", - "FEEDBACK_PATTERN_WEARABLE_SIP_FUNCTION", - "FEEDBACK_PATTERN_WEARABLE_SIP_FJKEY", - "FEEDBACK_PATTERN_WEARABLE_MAX_CHARACTER", - - "FEEDBACK_PATTERN_WEARABLE_MESSAGE_ON_CALL", - "FEEDBACK_PATTERN_WEARABLE_EMAIL_ON_CALL", - "FEEDBACK_PATTERN_WEARABLE_WAKEUP_ON_CALL", - "FEEDBACK_PATTERN_WEARABLE_SCHEDULE_ON_CALL", - "FEEDBACK_PATTERN_WEARABLE_TIMER_ON_CALL", - "FEEDBACK_PATTERN_WEARABLE_GENERAL_ON_CALL", - "FEEDBACK_PATTERN_WEARABLE_SMART_ALERT", - - "FEEDBACK_PATTERN_WEARABLE_CHARGERCONN_ON_CALL", - "FEEDBACK_PATTERN_WEARABLE_CHARGING_ERROR_ON_CALL", - "FEEDBACK_PATTERN_WEARABLE_FULLCHARGED_ON_CALL", - "FEEDBACK_PATTERN_WEARABLE_LOWBATT_ON_CALL", + "", + "", + "", "FEEDBACK_PATTERN_WEARABLE_CALLCONNECT", "FEEDBACK_PATTERN_WEARABLE_DISCALLCONNECT", "FEEDBACK_PATTERN_WEARABLE_OUTGOING_CALL", "FEEDBACK_PATTERN_WEARABLE_MINUTEMINDER", + "FEEDBACK_PATTERN_VIBRATION_ON", + "FEEDBACK_PATTERN_SILENT_OFF", + "FEEDBACK_PATTERN_BT_CONNECTED", + "FEEDBACK_PATTERN_BT_DISCONNECTED", "FEEDBACK_PATTERN_WEARABLE_BT_PAIRING", "FEEDBACK_PATTERN_WEARABLE_BT_WAITING", "FEEDBACK_PATTERN_WEARABLE_SCREEN_CAPTURE", + "FEEDBACK_PATTERN_LIST_REORDER", + "FEEDBACK_PATTERN_LIST_SLIDER", + "FEEDBACK_PATTERN_VOLUME_KEY", "FEEDBACK_PATTERN_WEARABLE_MMS", "FEEDBACK_PATTERN_WEARABLE_HOURLY_ALERT", -- 2.7.4