aboutsummaryrefslogtreecommitdiffstats
path: root/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen
diff options
context:
space:
mode:
Diffstat (limited to 'policy_manager/stm/zipc/StateTransitionor/NearHomeScreen')
-rwxr-xr-x[-rw-r--r--]policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomeScreen_func.c8
-rwxr-xr-x[-rw-r--r--]policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomeScreen_func.h2
-rwxr-xr-x[-rw-r--r--]policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.c48
-rwxr-xr-x[-rw-r--r--]policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.h2
4 files changed, 19 insertions, 41 deletions
diff --git a/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomeScreen_func.c b/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomeScreen_func.c
index c8ba22f..e523349 100644..100755
--- a/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomeScreen_func.c
+++ b/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomeScreen_func.c
@@ -1,7 +1,7 @@
/************************************************************/
/* ZNHL_NearHomeScreen_func.c */
/* Function and variable source file */
-/* ZIPC Designer Version 1.2.0 */
+/* ZIPC Designer Version 1.2.1 */
/************************************************************/
#include "../ZST_include.h"
@@ -29,15 +29,15 @@ void stm_nhl_start_activity_software_keyboard() {
* @name stm_nhl_event_restriction_mode_off
*/
void stm_nhl_event_restriction_mode_off() {
- g_stm_crr_state.layer[StmLayerNoNearHomescreen].state = g_prv_near_homescreen_state_rest_mode_1;
+ g_stm_crr_state.layer[StmLayerNoNearHomescreen].state = g_prv_near_homescreen_state_car_stop;
g_stm_crr_state.layer[StmLayerNoNearHomescreen].changed = STM_TRUE;
}
/*
- * @name stm_nhl_event_restriction_mode_2_on
+ * @name stm_nhl_event_restriction_mode_on
*/
void stm_nhl_event_restriction_mode_on() {
- g_prv_near_homescreen_state_rest_mode_1 = g_stm_prv_state.layer[StmLayerNoNearHomescreen].state;
+ g_prv_near_homescreen_state_car_stop = g_stm_prv_state.layer[StmLayerNoNearHomescreen].state;
}
/*
diff --git a/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomeScreen_func.h b/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomeScreen_func.h
index d2b13f7..a1b70ee 100644..100755
--- a/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomeScreen_func.h
+++ b/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomeScreen_func.h
@@ -1,7 +1,7 @@
/************************************************************/
/* ZNHL_NearHomeScreen_func.h */
/* Function and variable header file */
-/* ZIPC Designer Version 1.2.0 */
+/* ZIPC Designer Version 1.2.1 */
/************************************************************/
#ifndef ZHEADER_ZNHL_NEARHOMESCREEN_FUNC_H
#define ZHEADER_ZNHL_NEARHOMESCREEN_FUNC_H
diff --git a/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.c b/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.c
index cc3bbc7..e4213cb 100644..100755
--- 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"
@@ -10,8 +10,8 @@ static uint8_t ZNHL_NearHomescreenState[ZNHL_NEARHOMESCREENSTATENOMAX];
static void ZNHL_NearHomescreens0e0( void );
static void ZNHL_NearHomescreens0e3( void );
-static void ZNHL_NearHomescreens1e0( void );
static void ZNHL_NearHomescreens1e2( void );
+static void ZNHL_NearHomescreens1e4( void );
static void ZNHL_NearHomescreens0Event( void );
static void ZNHL_NearHomescreens1Event( void );
@@ -42,23 +42,23 @@ static void ZNHL_NearHomescreens0e3( void )
/* Action function */
/* STM : NearHomescreen */
/* State : software_keyboard( No 1 ) */
-/* Event : ara_software_keyboard( No 0 ) */
+/* Event : ctg_software_keyboard( No 2 ) */
/****************************************/
-static void ZNHL_NearHomescreens1e0( void )
+static void ZNHL_NearHomescreens1e2( void )
{
- stm_nhl_start_activity_software_keyboard();
+ ZNHL_NearHomescreenState[ZNHL_NEARHOMESCREEN] = ( uint8_t )ZNHL_NEARHOMESCREENS0;
+ stm_nhl_start_activity_none();
}
/****************************************/
/* Action function */
/* STM : NearHomescreen */
/* State : software_keyboard( No 1 ) */
-/* Event : ctg_software_keyboard( No 2 ) */
+/* Event : stt_prv_layer_near_homescreen_sft_kbd( No 4 ) */
/****************************************/
-static void ZNHL_NearHomescreens1e2( void )
+static void ZNHL_NearHomescreens1e4( void )
{
- ZNHL_NearHomescreenState[ZNHL_NEARHOMESCREEN] = ( uint8_t )ZNHL_NEARHOMESCREENS0;
- stm_nhl_start_activity_none();
+ stm_nhl_start_activity_software_keyboard();
}
/****************************************/
@@ -123,30 +123,8 @@ static void ZNHL_NearHomescreens0Event( void )
/****************************************/
static void ZNHL_NearHomescreens1Event( void )
{
- /*evt_activate*/
- if( g_stm_event == StmEvtNoActivate )
- {
- /*ctg_software_keyboard*/
- if( g_stm_category == StmCtgNoSoftwareKeyboard )
- {
- /*ara_software_keyboard*/
- if( g_stm_area == StmAreaNoSoftwareKyeboard )
- {
- ZNHL_NearHomescreens1e0();
- }
- else
- {
- ZNHL_NearHomescreens1e0();
- }
- }
- else
- {
- /*Else and default design have not done.*/
- /*Please confirm the STM and design else and default.*/
- }
- }
/*evt_deactivate*/
- else if( g_stm_event == StmEvtNoDeactivate )
+ if( g_stm_event == StmEvtNoDeactivate )
{
/*ctg_software_keyboard*/
if( g_stm_category == StmCtgNoSoftwareKeyboard )
@@ -170,7 +148,7 @@ static void ZNHL_NearHomescreens1Event( void )
/*stt_prv_layer_near_homescreen_sft_kbd*/
else if( g_stm_prv_state.layer[StmLayerNoNearHomescreen].state == StmLayoutNoSftKbd )
{
- ZNHL_NearHomescreens1e0();
+ ZNHL_NearHomescreens1e4();
}
else
{
@@ -178,8 +156,8 @@ static void ZNHL_NearHomescreens1Event( void )
/*Please confirm the STM and design else and default.*/
}
}
- /*stt_restriction_mode_1_on*/
- else if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNo1On )
+ /*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/NearHomeScreen/ZNHL_NearHomescreen.h b/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.h
index f23775e..5ad45c9 100644..100755
--- a/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.h
+++ b/policy_manager/stm/zipc/StateTransitionor/NearHomeScreen/ZNHL_NearHomescreen.h
@@ -1,7 +1,7 @@
/************************************************************/
/* ZNHL_NearHomescreen.h */
/* NearHomescreen State transition model header file */
-/* ZIPC Designer Version 1.2.0 */
+/* ZIPC Designer Version 1.2.1 */
/************************************************************/
#ifndef ZHEADER_ZNHL_NEARHOMESCREEN_H
#define ZHEADER_ZNHL_NEARHOMESCREEN_H