1 files changed, 50 insertions, 22 deletions

diff --git a/policy_manager/stm/zipc/StateTransitionor/ZST_StateTransitionor_func.c b/policy_manager/stm/zipc/StateTransitionor/ZST_StateTransitionor_func.c
index 2779653..09d75ac 100755
--- a/policy_manager/stm/zipc/StateTransitionor/ZST_StateTransitionor_func.c
+++ b/policy_manager/stm/zipc/StateTransitionor/ZST_StateTransitionor_func.c
@@ -27,23 +27,23 @@ void stmInitializeInner(const char *ecu_name) {
 
     if (0 == strcmp("slave", ecu_name))
     {
-    	stm_ecu_type = StmEcuTypeIVI;
+        stm_ecu_type = StmEcuTypeIVI;
     }
     else if (0 == strcmp("master", ecu_name))
     {
-    	stm_ecu_type = StmEcuTypeMeter;
+        stm_ecu_type = StmEcuTypeMeter;
     }
     else if (0 == strcmp("hud", ecu_name))
     {
-    	stm_ecu_type = StmEcuTypeHUD;
+        stm_ecu_type = StmEcuTypeHUD;
     }
     else if (0 == strcmp("rse1", ecu_name))
     {
-    	stm_ecu_type = StmEcuTypeRSE1;
+        stm_ecu_type = StmEcuTypeRSE1;
     }
     else if (0 == strcmp("rse2", ecu_name))
     {
-    	stm_ecu_type = StmEcuTypeRSE2;
+        stm_ecu_type = StmEcuTypeRSE2;
     }
 
     // Initialize previous state
@@ -53,7 +53,7 @@ void stmInitializeInner(const char *ecu_name) {
     g_stm_crr_state = g_stm_prv_state;
 
     // Initialize map activate state
-	g_stm_map_is_activated = STM_FALSE;
+    g_stm_map_is_activated = STM_FALSE;
 
     switch ( stm_ecu_type )
     {
@@ -95,24 +95,40 @@ void stmInitializeInner(const char *ecu_name) {
         stm_mst_rmt_initialize_valiable();
         break;
     case StmEcuTypeHUD:
+        // Initialize hud apps layer
+        stm_hud_apps_initialize();
+        stm_hud_apps_initialize_variable();
+
+        // Initialize hud near_apps layer
+        stm_hud_near_apps_initialize();
+        stm_hud_near_apps_initialize_variable();
+
         // Initialize remote_hud layer on HUD ecu
         stm_rmt_hud_initialize();
         stm_rmt_hud_initialize_variable();
 
-    	// Initialize remote_hud_up_left layer on HUD ecu
-    	stm_rmt_hud_up_left_initialize();
-    	stm_rmt_hud_up_left_initialize_variable();
-    	break;
+        // Initialize remote_hud_up_left layer on HUD ecu
+        stm_rmt_hud_up_left_initialize();
+        stm_rmt_hud_up_left_initialize_variable();
+        break;
     case StmEcuTypeRSE1:
+        // Initialize rse1 apps layer
+        stm_rse1_apps_initialize();
+        stm_rse1_apps_initialize_variable();
+
         // Initialize remote_rse1 layer on RSE1 ecu
-     	stm_rmt_rse1_initialize();
-    	stm_rmt_rse1_initialize_variable();
-    	break;
+        stm_rmt_rse1_initialize();
+        stm_rmt_rse1_initialize_variable();
+        break;
     case StmEcuTypeRSE2:
+        // Initialize rse2 apps  layer
+        stm_rse2_apps_initialize();
+        stm_rse2_apps_initialize_variable();
+
         // Initialize remote_rse2 layer on RSE2 ecu
         stm_rmt_rse2_initialize();
         stm_rmt_rse2_initialize_variable();
-    	break;
+        break;
     case StmEcuTypeIVI:
     default:
         // Initialize LightstatusBrake state
@@ -192,20 +208,32 @@ int stmTransitionStateInner(int event_id, StmState* state) {
         stm_mst_rmt_event_call();
         break;
     case StmEcuTypeHUD:
+        // hud apps layer
+        stm_hud_apps_event_call();
+
+        // hud near_apps layer on HUD ecu
+        stm_hud_near_apps_event_call();
+
         // remote_hud layer on HUD ecu
-    	stm_rmt_hud_event_call();
+        stm_rmt_hud_event_call();
 
         // remote_hud_up_left layer on HUD ecu
-    	stm_rmt_hud_up_left_event_call();
-    	break;
+        stm_rmt_hud_up_left_event_call();
+        break;
     case StmEcuTypeRSE1:
+        // rse1 apps layer
+        stm_rse1_apps_event_call();
+
         // remote_rse1 layer on RSE1 ecu
-    	stm_rmt_rse1_event_call();
-    	break;
+        stm_rmt_rse1_event_call();
+        break;
     case StmEcuTypeRSE2:
+        // rse2 apps layer
+        stm_rse2_apps_event_call();
+
         // remote_rse2 layer on RSE2 ecu
-    	stm_rmt_rse1_event_call();
-    	break;
+        stm_rmt_rse2_event_call();
+        break;
     case StmEcuTypeIVI:
     default:
         // LightstatusBrake state
@@ -275,5 +303,5 @@ void stmUndoStateInner() {
         stm_mst_rmt_event_call();
     }
 
-	g_stm_crr_state = g_stm_prv_state;
+    g_stm_crr_state = g_stm_prv_state;
 }