diff options
author | 2018-05-14 17:22:57 +0900 | |
---|---|---|
committer | 2018-05-14 17:24:48 +0900 | |
commit | bfadb522b21256fde7283746b90116c237e57a5b (patch) | |
tree | 099baa7b078029a19430372bace46dee64958be6 /src/policy_manager | |
parent | 701f1ff00b3b6cf5f5a50b4cf3f65e176cb26460 (diff) |
PolicyManager can judge the current car state
and remove judgement process of it from LowCanClient
because it should be judged by PolicyManager
Change-Id: I94467332665e34b751604cafe5d43f3abd4d7cfd
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
Diffstat (limited to 'src/policy_manager')
-rw-r--r-- | src/policy_manager/zipc/dummy_stm.c | 23 | ||||
-rw-r--r-- | src/policy_manager/zipc/dummy_stm.h | 10 |
2 files changed, 4 insertions, 29 deletions
diff --git a/src/policy_manager/zipc/dummy_stm.c b/src/policy_manager/zipc/dummy_stm.c index d695486..968b086 100644 --- a/src/policy_manager/zipc/dummy_stm.c +++ b/src/policy_manager/zipc/dummy_stm.c @@ -8,8 +8,6 @@ const char* gStmEventName[] = { "parking_brake_on", "accel_pedal_off", "accel_pedal_on", - "car_stop", - "car_run", "timer_expired", "lamp_off", "lamp_on" @@ -22,8 +20,6 @@ const int gStmEventNo[] = { STM_EVT_NO_PARKING_BRAKE_ON, STM_EVT_NO_ACCEL_PEDAL_OFF, STM_EVT_NO_ACCEL_PEDAL_ON, - STM_EVT_NO_CAR_STOP, - STM_EVT_NO_CAR_RUN, STM_EVT_NO_TIMER_EXPIRED, STM_EVT_NO_LAMP_OFF, STM_EVT_NO_LAMP_ON @@ -390,25 +386,6 @@ int stmTransitionState(int event, stm_state_t* state) { g_crr_state.accel_pedal.is_changed = STM_TRUE; } break; - case STM_EVT_NO_CAR_STOP: - if (gStmCarStateNoStop != car_state) { - g_crr_state.layer.apps.state = g_prv_apps_state_car_stop; - g_crr_state.layer.apps.is_changed = STM_TRUE; - - g_crr_state.car.state = gStmCarStateNoStop; - g_crr_state.car.is_changed = STM_TRUE; - } - break; - case STM_EVT_NO_CAR_RUN: - if (gStmCarStateNoRun != car_state) { - g_prv_apps_state_car_stop = apps_state; - g_crr_state.layer.apps.state = gStmLayoutNoM1; - g_crr_state.layer.apps.is_changed = STM_TRUE; - - g_crr_state.car.state = gStmCarStateNoRun; - g_crr_state.car.is_changed = STM_TRUE; - } - break; case STM_EVT_NO_LAMP_OFF: if (gStmLampStateNoOff != lamp_state) { g_crr_state.lamp.state = gStmLampStateNoOff; diff --git a/src/policy_manager/zipc/dummy_stm.h b/src/policy_manager/zipc/dummy_stm.h index 4c71ac7..42c5148 100644 --- a/src/policy_manager/zipc/dummy_stm.h +++ b/src/policy_manager/zipc/dummy_stm.h @@ -30,11 +30,9 @@ #define STM_EVT_NO_PARKING_BRAKE_ON 0x04 #define STM_EVT_NO_ACCEL_PEDAL_OFF 0x05 #define STM_EVT_NO_ACCEL_PEDAL_ON 0x06 -#define STM_EVT_NO_CAR_STOP 0x07 -#define STM_EVT_NO_CAR_RUN 0x08 -#define STM_EVT_NO_TIMER_EXPIRED 0x09 -#define STM_EVT_NO_LAMP_OFF 0x0A -#define STM_EVT_NO_LAMP_ON 0x0B +#define STM_EVT_NO_TIMER_EXPIRED 0x07 +#define STM_EVT_NO_LAMP_OFF 0x08 +#define STM_EVT_NO_LAMP_ON 0x09 // Category number #define STM_CTG_NO_HOMESCREEN 0x0100 @@ -61,7 +59,7 @@ #define STM_MSK_ARA_NO 0xFF0000 // Number of events, categories and areas -#define STM_NUM_EVT 11 +#define STM_NUM_EVT 9 #define STM_NUM_CTG 7 #define STM_NUM_ARA 8 |