From ae9aba219e4d6d175361740e30351d6209c9856e Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Tue, 4 Dec 2018 19:06:00 +0900 Subject: change policy manager --- policy_manager/policy_manager.cpp | 105 +++++++++++++-------- policy_manager/policy_manager.hpp | 6 +- .../StateTransitionor/CarState/ZCAR_CarState.c | 51 ++-------- .../StateTransitionor/CarState/ZCAR_CarState.h | 6 +- .../NearHomeScreen/ZNHL_NearHomescreen.c | 6 +- .../RestrictionLayer/ZREL_RelMain.c | 30 +++--- .../master/layer/apps/Zmaster_apps_apps_main.c | 58 ++++++------ .../master/layer/apps/Zmaster_apps_apps_main.h | 2 +- .../layer/apps/Zmaster_apps_master_apps_def.h | 2 +- src/main.cpp | 5 +- 10 files changed, 133 insertions(+), 138 deletions(-) diff --git a/policy_manager/policy_manager.cpp b/policy_manager/policy_manager.cpp index 6a427a5..bf70614 100644 --- a/policy_manager/policy_manager.cpp +++ b/policy_manager/policy_manager.cpp @@ -407,7 +407,8 @@ void PolicyManager::updateLayer(int event_id) // If restriction mode is changed to mode2 on, // store current state for state of restriction mode off if (this->changedRestrictionModeTo2On() || - this->changedLightstatusBrakeOnToOff()) + this->changedAccelPedalOffToOn()) // Control by Accel + // this->changedLightstatusBrakeOnToOff()) // Control by Brake { HMI_DEBUG("Store current state for state of restriction mode off"); this->prv_layers_car_stop[layer_name] = this->crr_layers[layer_name]; @@ -486,7 +487,8 @@ int PolicyManager::updateLayout(int event_id, int layer_no, std::string prv_layout_name = prv_layout_state.name; if (this->changedRestrictionMode2OnToOther() || - this->changedLightstatusBrakeOffToOn()) + this->changedAccelPedalOnToOff()) // Control by Accel + // this->changedLightstatusBrakeOffToOn()) // Control by Brake { // If restriction mode is changed from mode2 -> mode1, // restore state of restriction mode off @@ -757,34 +759,35 @@ void PolicyManager::createOutputInformation(json_object **json_out) void PolicyManager::controlTimerEvent() { - if (this->p_crr_state->car_element[StmCarElementNoRunning].changed) - { - if (StmRunningNoRun == this->p_crr_state->car_element[StmCarElementNoRunning].state) - { - // Set delay event(restriction mode on) - this->setStateTransitionProcessToSystemd(StmEvtNoRestrictionModeOn, - 3000, ""); - } - else if (StmRunningNoStop == - this->p_crr_state->car_element[StmCarElementNoRunning].state) - { - // Stop timer for restriction on event - if (this->event_source_list.find(StmEvtNoRestrictionModeOn) != - this->event_source_list.end()) - { - HMI_DEBUG("Stop timer for restriction on"); - sd_event_source *event_source = this->event_source_list[StmEvtNoRestrictionModeOn]; - int ret = sd_event_source_set_enabled(event_source, SD_EVENT_OFF); - if (0 > ret) - { - HMI_ERROR("Failed to stop timer"); - } - } + // for ALS2018 (RestrictionMode = Running and after 3sec) + // if (this->p_crr_state->car_element[StmCarElementNoRunning].changed) + // { + // if (StmRunningNoRun == this->p_crr_state->car_element[StmCarElementNoRunning].state) + // { + // // Set delay event(restriction mode on) + // this->setStateTransitionProcessToSystemd(StmEvtNoRestrictionModeOn, + // 3000, ""); + // } + // else if (StmRunningNoStop == + // this->p_crr_state->car_element[StmCarElementNoRunning].state) + // { + // // Stop timer for restriction on event + // if (this->event_source_list.find(StmEvtNoRestrictionModeOn) != + // this->event_source_list.end()) + // { + // HMI_DEBUG("Stop timer for restriction on"); + // sd_event_source *event_source = this->event_source_list[StmEvtNoRestrictionModeOn]; + // int ret = sd_event_source_set_enabled(event_source, SD_EVENT_OFF); + // if (0 > ret) + // { + // HMI_ERROR("Failed to stop timer"); + // } + // } - // Set event(restriction mode off) - this->setStateTransitionProcessToSystemd(StmEvtNoRestrictionModeOff, 0, ""); - } - } + // // Set event(restriction mode off) + // this->setStateTransitionProcessToSystemd(StmEvtNoRestrictionModeOff, 0, ""); + // } + // } } int PolicyManager::transitionState(sd_event_source *source, void *data) @@ -935,28 +938,56 @@ bool PolicyManager::changedRestrictionMode2OnToOther() return false; } -bool PolicyManager::changedLightstatusBrakeOffToOn() +// bool PolicyManager::changedLightstatusBrakeOffToOn() +// { +// // TODO: For master +// // If possible thie process should be include in zipc stm in the future +// if (("master" == this->ecu_name) && +// this->p_crr_state->car_element[StmCarElementNoLightstatusBrake].changed && +// (StmLightstatusBrakeSttNoOff == this->p_prv_state->car_element[StmCarElementNoLightstatusBrake].state) && +// (StmLightstatusBrakeSttNoOn == this->p_crr_state->car_element[StmCarElementNoLightstatusBrake].state)) +// { +// return true; +// } +// return false; +// } + +// bool PolicyManager::changedLightstatusBrakeOnToOff() +// { +// // TODO: For master +// // If possible thie process should be include in zipc stm in the future +// if (("master" == this->ecu_name) && +// this->p_crr_state->car_element[StmCarElementNoLightstatusBrake].changed && +// (StmLightstatusBrakeSttNoOn == this->p_prv_state->car_element[StmCarElementNoLightstatusBrake].state) && +// (StmLightstatusBrakeSttNoOff == this->p_crr_state->car_element[StmCarElementNoLightstatusBrake].state)) +// { +// return true; +// } +// return false; +// } + +bool PolicyManager::changedAccelPedalOffToOn() { // TODO: For master // If possible thie process should be include in zipc stm in the future if (("master" == this->ecu_name) && - this->p_crr_state->car_element[StmCarElementNoLightstatusBrake].changed && - (StmLightstatusBrakeSttNoOff == this->p_prv_state->car_element[StmCarElementNoLightstatusBrake].state) && - (StmLightstatusBrakeSttNoOn == this->p_crr_state->car_element[StmCarElementNoLightstatusBrake].state)) + this->p_crr_state->car_element[StmCarElementNoAccelPedal].changed && + (StmAccelPedalSttNoOff == this->p_prv_state->car_element[StmCarElementNoAccelPedal].state) && + (StmAccelPedalSttNoOn == this->p_crr_state->car_element[StmCarElementNoAccelPedal].state)) { return true; } return false; } -bool PolicyManager::changedLightstatusBrakeOnToOff() +bool PolicyManager::changedAccelPedalOnToOff() { // TODO: For master // If possible thie process should be include in zipc stm in the future if (("master" == this->ecu_name) && - this->p_crr_state->car_element[StmCarElementNoLightstatusBrake].changed && - (StmLightstatusBrakeSttNoOn == this->p_prv_state->car_element[StmCarElementNoLightstatusBrake].state) && - (StmLightstatusBrakeSttNoOff == this->p_crr_state->car_element[StmCarElementNoLightstatusBrake].state)) + this->p_crr_state->car_element[StmCarElementNoAccelPedal].changed && + (StmAccelPedalSttNoOn == this->p_prv_state->car_element[StmCarElementNoAccelPedal].state) && + (StmAccelPedalSttNoOff == this->p_crr_state->car_element[StmCarElementNoAccelPedal].state)) { return true; } diff --git a/policy_manager/policy_manager.hpp b/policy_manager/policy_manager.hpp index 61fbf06..f3ec0f9 100644 --- a/policy_manager/policy_manager.hpp +++ b/policy_manager/policy_manager.hpp @@ -148,8 +148,10 @@ class PolicyManager bool changedRestrictionModeTo2On(); bool changedRestrictionMode2OnToOther(); - bool changedLightstatusBrakeOffToOn(); - bool changedLightstatusBrakeOnToOff(); + // bool changedLightstatusBrakeOffToOn(); + // bool changedLightstatusBrakeOnToOff(); + bool changedAccelPedalOffToOn(); + bool changedAccelPedalOnToOff(); int loadRolesConfigFile(); int loadLayoutsConfigFile(); diff --git a/policy_manager/stm/zipc/StateTransitionor/CarState/ZCAR_CarState.c b/policy_manager/stm/zipc/StateTransitionor/CarState/ZCAR_CarState.c index 8e20123..2134a99 100644 --- a/policy_manager/stm/zipc/StateTransitionor/CarState/ZCAR_CarState.c +++ b/policy_manager/stm/zipc/StateTransitionor/CarState/ZCAR_CarState.c @@ -1,7 +1,7 @@ /************************************************************/ /* ZCAR_CarState.c */ /* CarState State transition model source file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #include "../ZST_include.h" @@ -44,19 +44,10 @@ static void ZCAR_CarStates1e0( void ) /****************************************/ static void ZCAR_CarStates0Event( void ) { - /*stt_lightstatus_brake_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) + /*stt_accel_pedal_on*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) { - /*stt_accel_pedal_on*/ - if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) - { - ZCAR_CarStates0e1(); - } - else - { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ - } + ZCAR_CarStates0e1(); } else { @@ -72,38 +63,10 @@ static void ZCAR_CarStates0Event( void ) /****************************************/ static void ZCAR_CarStates1Event( void ) { - /*stt_lightstatus_brake_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) + /*stt_accel_pedal_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { - /*stt_accel_pedal_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) - { - ZCAR_CarStates1e0(); - } - else - { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ - } - } - /*stt_lightstatus_brake_on*/ - else if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) - { - /*stt_accel_pedal_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) - { - ZCAR_CarStates1e0(); - } - /*stt_accel_pedal_on*/ - else if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) - { - ZCAR_CarStates1e0(); - } - else - { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ - } + ZCAR_CarStates1e0(); } else { diff --git a/policy_manager/stm/zipc/StateTransitionor/CarState/ZCAR_CarState.h b/policy_manager/stm/zipc/StateTransitionor/CarState/ZCAR_CarState.h index 18003a7..5ad694e 100644 --- a/policy_manager/stm/zipc/StateTransitionor/CarState/ZCAR_CarState.h +++ b/policy_manager/stm/zipc/StateTransitionor/CarState/ZCAR_CarState.h @@ -1,7 +1,7 @@ /************************************************************/ /* ZCAR_CarState.h */ /* CarState State transition model header file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #ifndef ZHEADER_ZCAR_CARSTATE_H #define ZHEADER_ZCAR_CARSTATE_H @@ -28,14 +28,10 @@ /*Event no define*/ #define ZCAR_CARSTATEE0EVENTNO ( 0U ) #define ZCAR_CARSTATEE1EVENTNO ( 1U ) -#define ZCAR_CARSTATEE2EVENTNO ( 2U ) -#define ZCAR_CARSTATEE3EVENTNO ( 3U ) /*Event serial no define*/ #define ZCAR_CARSTATEE0EVENTSERIALNO ( 0U ) #define ZCAR_CARSTATEE1EVENTSERIALNO ( 1U ) -#define ZCAR_CARSTATEE2EVENTSERIALNO ( 2U ) -#define ZCAR_CARSTATEE3EVENTSERIALNO ( 3U ) /*Extern function*/ extern void stm_rns_event_call( void ); diff --git a/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.c b/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.c index 1c024b8..e4213cb 100644 --- a/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.c +++ b/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.c @@ -1,7 +1,7 @@ /************************************************************/ /* ZNHL_NearHomescreen.c */ /* NearHomescreen State transition model source file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #include "../ZST_include.h" @@ -156,8 +156,8 @@ static void ZNHL_NearHomescreens1Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*stt_lightstatus_brake_off*/ - else if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) + /*stt_accel_pedal_on*/ + else if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) { ZNHL_NearHomescreens1e2(); } diff --git a/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_RelMain.c b/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_RelMain.c index 4c390ff..821b2a4 100644 --- a/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_RelMain.c +++ b/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_RelMain.c @@ -1,7 +1,7 @@ /************************************************************/ /* ZREL_RelMain.c */ /* RelMain State transition model source file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #include "../ZST_include.h" @@ -220,8 +220,8 @@ static void ZREL_RelRestOffs0Event( void ) /*stt_restriction_mode_off*/ if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { - /*stt_lightstatus_brake_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) + /*stt_accel_pedal_on*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) { /*stt_crr_layer_apps_changed*/ if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) @@ -357,8 +357,8 @@ static void ZREL_RelRestOffs1Event( void ) /*stt_restriction_mode_off*/ if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { - /*stt_lightstatus_brake_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) + /*stt_accel_pedal_on*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) { /*stt_crr_layer_apps_changed*/ if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) @@ -478,8 +478,8 @@ static void ZREL_RelRestOffs1Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*stt_lightstatus_brake_on*/ - else if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) + /*stt_accel_pedal_off*/ + else if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { /*stt_prv_layer_rst_not_none*/ if( g_stm_prv_state.layer[StmLayerNoRestriction].state != StmLayoutNoNone ) @@ -544,8 +544,8 @@ static void ZREL_RelRestOffs2Event( void ) /*stt_restriction_mode_off*/ if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { - /*stt_lightstatus_brake_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) + /*stt_accel_pedal_on*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) { /*stt_crr_layer_apps_changed*/ if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) @@ -665,8 +665,8 @@ static void ZREL_RelRestOffs2Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*stt_lightstatus_brake_on*/ - else if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) + /*stt_accel_pedal_off*/ + else if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { /*stt_prv_layer_rst_not_none*/ if( g_stm_prv_state.layer[StmLayerNoRestriction].state != StmLayoutNoNone ) @@ -731,8 +731,8 @@ static void ZREL_RelRestOffs3Event( void ) /*stt_restriction_mode_off*/ if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { - /*stt_lightstatus_brake_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) + /*stt_accel_pedal_on*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) { /*stt_crr_layer_apps_changed*/ if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) @@ -847,8 +847,8 @@ static void ZREL_RelRestOffs3Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*stt_lightstatus_brake_on*/ - else if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) + /*stt_accel_pedal_off*/ + else if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { /*stt_prv_layer_rst_not_none*/ if( g_stm_prv_state.layer[StmLayerNoRestriction].state != StmLayoutNoNone ) diff --git a/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_apps_main.c b/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_apps_main.c index af46ea9..9ac17a2 100644 --- a/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_apps_main.c +++ b/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_apps_main.c @@ -1,7 +1,7 @@ /************************************************************/ /* Zmaster_apps_apps_main.c */ /* apps_main State transition model source file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #include "../../../ZST_include.h" @@ -34,7 +34,7 @@ static void Zmaster_apps_apps_car_runs1Event( void ); /****************************************/ /* State start activity function */ /* STM : apps_main */ -/* State : lightstatus_brake_on( No 0 ) */ +/* State : accel_pedal_off( No 0 ) */ /****************************************/ static void Zmaster_apps_apps_mains0StateEntry( void ) { @@ -67,7 +67,7 @@ static void Zmaster_apps_apps_mains0StateEntry( void ) /****************************************/ /* State start activity function */ /* STM : apps_main */ -/* State : lightstatus_brake_off( No 1 ) */ +/* State : accel_pedal_on( No 1 ) */ /****************************************/ static void Zmaster_apps_apps_mains1StateEntry( void ) { @@ -88,8 +88,8 @@ static void Zmaster_apps_apps_mains1StateEntry( void ) /****************************************/ /* Action function */ /* STM : apps_main */ -/* State : lightstatus_brake_on( No 0 ) */ -/* Event : stt_lightstatus_brake_off( No 1 ) */ +/* State : accel_pedal_off( No 0 ) */ +/* Event : stt_accel_pedal_on( No 1 ) */ /****************************************/ static void Zmaster_apps_apps_mains0e1( void ) { @@ -101,8 +101,8 @@ static void Zmaster_apps_apps_mains0e1( void ) /****************************************/ /* Action function */ /* STM : apps_main */ -/* State : lightstatus_brake_off( No 1 ) */ -/* Event : stt_lightstatus_brake_on( No 0 ) */ +/* State : accel_pedal_on( No 1 ) */ +/* Event : stt_accel_pedal_off( No 0 )*/ /****************************************/ static void Zmaster_apps_apps_mains1e0( void ) { @@ -209,12 +209,12 @@ static void Zmaster_apps_apps_car_runs0e3( void ) /****************************************/ /* Event appraisal function */ /* STM : apps_main */ -/* State : lightstatus_brake_on( No 0 ) */ +/* State : accel_pedal_off( No 0 ) */ /****************************************/ static void Zmaster_apps_apps_mains0Event( void ) { - /*stt_lightstatus_brake_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) + /*stt_accel_pedal_on*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) { stm_mst_apl_event_lightstatus_brake_off(); Zmaster_apps_apps_mains0e1(); @@ -233,8 +233,8 @@ static void Zmaster_apps_apps_mains0Event( void ) /****************************************/ static void Zmaster_apps_apps_car_stops0Event( void ) { - /*stt_lightstatus_brake_on*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) + /*stt_accel_pedal_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -374,8 +374,8 @@ static void Zmaster_apps_apps_car_stops0Event( void ) /****************************************/ static void Zmaster_apps_apps_car_stops1Event( void ) { - /*stt_lightstatus_brake_on*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) + /*stt_accel_pedal_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -520,8 +520,8 @@ static void Zmaster_apps_apps_car_stops1Event( void ) /****************************************/ static void Zmaster_apps_apps_car_stops2Event( void ) { - /*stt_lightstatus_brake_on*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) + /*stt_accel_pedal_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -689,8 +689,8 @@ static void Zmaster_apps_apps_car_stops2Event( void ) /****************************************/ static void Zmaster_apps_apps_car_stops3Event( void ) { - /*stt_lightstatus_brake_on*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) + /*stt_accel_pedal_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -858,8 +858,8 @@ static void Zmaster_apps_apps_car_stops3Event( void ) /****************************************/ static void Zmaster_apps_apps_car_stops4Event( void ) { - /*stt_lightstatus_brake_on*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) + /*stt_accel_pedal_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -1050,8 +1050,8 @@ static void Zmaster_apps_apps_car_stops4Event( void ) /****************************************/ static void Zmaster_apps_apps_car_stops5Event( void ) { - /*stt_lightstatus_brake_on*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) + /*stt_accel_pedal_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -1215,12 +1215,12 @@ static void Zmaster_apps_apps_car_stops5Event( void ) /****************************************/ /* Event appraisal function */ /* STM : apps_main */ -/* State : lightstatus_brake_off( No 1 ) */ +/* State : accel_pedal_on( No 1 ) */ /****************************************/ static void Zmaster_apps_apps_mains1Event( void ) { - /*stt_lightstatus_brake_on*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) + /*stt_accel_pedal_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOff ) { stm_mst_apl_event_lightstatus_brake_on(); Zmaster_apps_apps_mains1e0(); @@ -1239,8 +1239,8 @@ static void Zmaster_apps_apps_mains1Event( void ) /****************************************/ static void Zmaster_apps_apps_car_runs0Event( void ) { - /*stt_lightstatus_brake_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) + /*stt_accel_pedal_on*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -1304,8 +1304,8 @@ static void Zmaster_apps_apps_car_runs0Event( void ) /****************************************/ static void Zmaster_apps_apps_car_runs1Event( void ) { - /*stt_lightstatus_brake_off*/ - if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) + /*stt_accel_pedal_on*/ + if( g_stm_crr_state.car_element[StmCarElementNoAccelPedal].state == StmAccelPedalSttNoOn ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) diff --git a/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_apps_main.h b/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_apps_main.h index afa2e67..fba3224 100644 --- a/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_apps_main.h +++ b/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_apps_main.h @@ -1,7 +1,7 @@ /************************************************************/ /* Zmaster_apps_apps_main.h */ /* apps_main State transition model header file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #ifndef ZHEADER_ZMASTER_APPS_APPS_MAIN_H #define ZHEADER_ZMASTER_APPS_APPS_MAIN_H diff --git a/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_master_apps_def.h b/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_master_apps_def.h index 5c22ae6..f592c64 100644 --- a/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_master_apps_def.h +++ b/policy_manager/stm/zipc/StateTransitionor/master/layer/apps/Zmaster_apps_master_apps_def.h @@ -1,7 +1,7 @@ /************************************************************/ /* Zmaster_apps_master_apps_def.h */ /* Define header file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #ifndef ZHEADER_ZMASTER_APPS_MASTER_APPS_DEF_H #define ZHEADER_ZMASTER_APPS_MASTER_APPS_DEF_H diff --git a/src/main.cpp b/src/main.cpp index 89976ea..8e051c6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -672,7 +672,10 @@ void windowmanager_change_area_size(afb_req req) noexcept } change_req.area_req[name] = rect; } - g_afb_instance->wmgr.api_change_area_size(change_req); + if(change_req.area_req.size() != 0) + { + g_afb_instance->wmgr.api_change_area_size(change_req); + } afb_req_success(req, nullptr, nullptr); } free(appid); -- cgit 1.2.3-korg