diff options
Diffstat (limited to 'src/policy_manager/policy_manager.cpp')
| -rw-r--r-- | src/policy_manager/policy_manager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/policy_manager/policy_manager.cpp b/src/policy_manager/policy_manager.cpp index e7ef9de..9b8670c 100644 --- a/src/policy_manager/policy_manager.cpp +++ b/src/policy_manager/policy_manager.cpp @@ -242,7 +242,7 @@ static void updateLocalCarElementState(stm::stm_state_t crr_state) { car_state_no = crr_state.car_element[car_ele_no].state; car_state = stm::gStmCarStateNameList[car_ele_no][car_state_no]; - changed = crr_state.car_element[car_ele_no].is_changed; + changed = crr_state.car_element[car_ele_no].changed; pm::g_crr_car_elements[car_ele_name].state = car_state; pm::g_crr_car_elements[car_ele_name].changed = changed; @@ -279,7 +279,7 @@ static void updateLocalLayerState(int event_data, stm::stm_state_t crr_state) { #if 1 // If restriction mode is changed off -> on, // store current state for state of restriction mode off - if ((crr_state.car_element[stm::gStmCarElementNoRestrictionMode].is_changed) + if ((crr_state.car_element[stm::gStmCarElementNoRestrictionMode].changed) && (stm::gStmRestrictionModeStateNoOn == crr_state.car_element[stm::gStmCarElementNoRestrictionMode].state)) { HMI_DEBUG("wm:lm", "Store current state for state of restriction mode off"); pm::g_prv_layers_car_stop[layer_name] = pm::g_crr_layers[layer_name]; @@ -287,7 +287,7 @@ static void updateLocalLayerState(int event_data, stm::stm_state_t crr_state) { #else // If car state is changed car_stop -> car_run, // store current state for state of car stop - if ((crr_state.car.is_changed) + if ((crr_state.car.changed) && (stm::gStmRunningNoRun == crr_state.car.state)) { HMI_DEBUG("wm:lm", "Store current state for state of car stop"); pm::g_prv_layers_car_stop[layer_name] = pm::g_crr_layers[layer_name]; @@ -296,7 +296,7 @@ static void updateLocalLayerState(int event_data, stm::stm_state_t crr_state) { // This layer is changed? - if (crr_state.layer[layer_no].is_changed) { + if (crr_state.layer[layer_no].changed) { // Get previous layout name of this layer pm::LayoutState prv_layout_state = pm::g_prv_layers[layer_name].layout_state; std::string prv_layout_name = prv_layout_state.name; @@ -307,14 +307,14 @@ static void updateLocalLayerState(int event_data, stm::stm_state_t crr_state) { pm::LayoutState crr_layout_state; #if 1 - if ((crr_state.car_element[stm::gStmCarElementNoRestrictionMode].is_changed) + if ((crr_state.car_element[stm::gStmCarElementNoRestrictionMode].changed) && (stm::gStmRestrictionModeStateNoOff == crr_state.car_element[stm::gStmCarElementNoRestrictionMode].state)) { // If restriction mode is changed on -> off, // restore state of restriction mode off HMI_DEBUG("wm:lm", "Restriction mode is changed on -> off, so restore state of restriction mode off"); crr_layout_state = pm::g_prv_layers_car_stop[layer_name].layout_state; #else - if ((crr_state.car_element[gStmCarElementNoRunning].is_changed) + if ((crr_state.car_element[gStmCarElementNoRunning].changed) && (stm::gStmCarElementNoStop == crr_state.car_element[gStmCarElementNoRunning].state)) { // If car state is changed car_run -> car_stop, // restore state of car stop @@ -454,7 +454,7 @@ static void updateLocalLayerState(int event_data, stm::stm_state_t crr_state) { } // Update current layout of this layer pm::g_crr_layers[layer_name].layout_state = crr_layout_state; - pm::g_crr_layers[layer_name].changed = crr_state.layer[layer_no].is_changed; + pm::g_crr_layers[layer_name].changed = crr_state.layer[layer_no].changed; } } @@ -489,7 +489,7 @@ static void createOutputInformation(stm::stm_state_t crr_state, json_object **js // "car_elements": [ // { // "parking_brake": { - // "is_changed": <bool>, + // "changed": <bool>, // "state": <const char*> // }, // ... @@ -541,7 +541,7 @@ static void createOutputInformation(stm::stm_state_t crr_state, json_object **js static int checkPolicyEntry(int event, uint64_t delay_ms, std::string role); static void controlTimerEvent(stm::stm_state_t crr_state) { - if (crr_state.car_element[stm::gStmCarElementNoRunning].is_changed) { + if (crr_state.car_element[stm::gStmCarElementNoRunning].changed) { if (stm::gStmRunningNoRun == crr_state.car_element[stm::gStmCarElementNoRunning].state) { // Set delay event(restriction mode on) checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_ON, 3000, ""); |