1 files changed, 20 insertions, 23 deletions

diff --git a/src/policy_manager/zipc/dummy_stm.h b/src/policy_manager/zipc/dummy_stm.h
index 73feed9..3748ecd 100644
--- a/src/policy_manager/zipc/dummy_stm.h
+++ b/src/policy_manager/zipc/dummy_stm.h
@@ -85,8 +85,8 @@ enum stm_accel_pedal_state_ {
 };
 
 enum stm_car_state_ {
-    gStmCarStateNoStop = 0,
-    gStmCarStateNoRun
+    gStmRunningNoStop = 0,
+    gStmRunningNoRun
 };
 
 enum stm_lamp_state_ {
@@ -191,6 +191,21 @@ enum stm_layer_ {
     gStmLayerNoMax = gStmLayerNoNum - 1,
 };
 
+enum stm_car_element_ {
+    gStmCarElementNoTransGear = 0,
+    gStmCarElementNoParkingBrake,
+    gStmCarElementNoAccelPedal,
+    gStmCarElementNoRunning,
+    gStmCarElementNoLamp,
+    gStmCarElementNoLightstatusBrake,
+    gStmCarElementNoRestrictionMode,
+
+    gStmCarElementNoNum,
+
+    gStmCarElementNoMin = gStmCarElementNoTransGear,
+    gStmCarElementNoMax = gStmCarElementNoNum - 1,
+};
+
 extern const char* gStmEventName[];
 extern const int gStmEventNo[];
 extern const char* gStmCategoryName[];
@@ -198,15 +213,11 @@ extern const int gStmCategoryNo[];
 extern const char* gStmAreaName[];
 extern const int gStmAreaNo[];
 extern const char* gStmLayerName[];
+extern const char* gStmCarElementName[];
 
 // String for state
-extern const char* gStmParkingBrakeStateNo2Name[];
-extern const char* gStmAccelPedalStateNo2Name[];
-extern const char* gStmCarStateNo2Name[];
-extern const char* gStmLampStateNo2Name[];
 extern const char* gStmLayoutNo2Name[];
-extern const char* gStmLightstatusBrakeStateNo2Name[];
-extern const char* gStmRestrictionModeStateNo2Name[];
+extern const char** gStmCarStateNameList[];
 
 // Struct for state
 typedef struct stm_base_state_ {
@@ -214,23 +225,9 @@ typedef struct stm_base_state_ {
     int state;
 } stm_base_state;
 
-typedef struct stm_layer_state_ {
-    stm_base_state on_screen;
-    stm_base_state restriction;
-    stm_base_state apps;
-    stm_base_state homescreen;
-} stm_layer_state;
-
 typedef struct {
-    stm_base_state trans_gear;
-    stm_base_state parking_brake;
-    stm_base_state accel_pedal;
-    stm_base_state car;
-    stm_base_state lamp;
-    stm_base_state lightstatus_brake;
-    stm_base_state restriction_mode;
+    stm_base_state car_element[gStmCarElementNoNum];
     stm_base_state layer[gStmLayerNoNum];
-//    stm_layer_state layer;
 } stm_state_t;