diff --git a/ECU_APP/user/PINdef.h b/ECU_APP/user/PINdef.h
index 5b3179e..4d77bc2 100644
--- a/ECU_APP/user/PINdef.h
+++ b/ECU_APP/user/PINdef.h
@@ -4,48 +4,30 @@
 #include "iodefine.h"
 
 #define CAN_STB			P1_bit.no2   //    
-#define KEY_LB          P12_bit.no0  //喇叭开关 
-#define KEY_ZZ          P4_bit.no1   //左转向开关
-#define KEY_YZ          P6_bit.no0   //右转向开关
-#define KEY_ZXFW        P6_bit.no1   //转向复位开关
-#define KEY_JS          P6_bit.no2   //警示开关
-#define KEY_YJ          P6_bit.no3   //远近光开关
-#define KEY_CC          P3_bit.no0   //超车开关
-#define KEY_DD          P1_bit.no7   //大灯开关
-#define KEY_DFS         P12_bit.no5  //挡风玻璃调节开关（升）
-#define KEY_DFJ         P8_bit.no5   //挡风玻璃调节开关（降）
-#define KEY_MS          P8_bit.no4   //仪表确认开关（模式选择）
-#define KEY_YBFH        P8_bit.no3   //仪表返回开关
-#define KEY_YBS         P8_bit.no2   //仪表调节开关（上）
-#define KEY_YBX         P8_bit.no1   //仪表调节开关（下）
-#define KEY_QD          P8_bit.no0   //启动开关
-#define KEY_XH          P3_bit.no4   //熄火开关
-#define KEY_WBJR        P1_bit.no3   //握把加热开关
-#define KEY_ZYJR        P1_bit.no4   //座椅加热开关
-#define KEY_YD          P1_bit.no5   //夜灯开关
-#define KEY_TCS         P1_bit.no6   //TCS
+#define KEY_1           P12_bit.no5  //左手把-雾灯开关；右手把-后桥差速锁开关
+#define KEY_2           P3_bit.no4   //左手把-座椅加热；右手把-右转向
+#define KEY_3           P8_bit.no1
+#define KEY_4           P8_bit.no2
+#define KEY_5           P8_bit.no3
+#define KEY_6           P8_bit.no0
+#define KEY_7           P6_bit.no3
+#define KEY_8           P1_bit.no7
+#define KEY_9           P3_bit.no0
 
-#define KEYID_LB       1
-#define KEYID_ZZ       2
-#define KEYID_YZ       3
-#define KEYID_ZXFW     4
-#define KEYID_JS       5
-#define KEYID_YJ       6
-#define KEYID_CC       7
-#define KEYID_DD       8
-#define KEYID_DFS      9
-#define KEYID_DFJ      10
-#define KEYID_MS       11
-#define KEYID_YBFH     12
-#define KEYID_YBS      13
-#define KEYID_YBX      14
-#define KEYID_QD       15
-#define KEYID_XH       16
-#define KEYID_WBJR     17
-#define KEYID_ZYJR     18
-#define KEYID_YD       19
-#define KEYID_TCS      20
-#define KEY_NUM        20
+typedef enum
+{
+    KEYID_1,
+    KEYID_2,
+    KEYID_3,
+        
+    KEYID_4,
+    KEYID_5,
+    KEYID_6,
+    KEYID_7,
+    KEYID_8,
+    KEYID_9,
+    KEY_NUM,
+}KEYID_Type
 
 
 
diff --git a/ECU_APP/user/hwCtrl.c b/ECU_APP/user/hwCtrl.c
index a01f4b2..834f33d 100644
--- a/ECU_APP/user/hwCtrl.c
+++ b/ECU_APP/user/hwCtrl.c
@@ -98,46 +98,32 @@ uint8_t GetIOState(uint8_t keyno)
     switch (keyno)
     {
     //KEY
-    case KEYID_LB  :
-        return KEY_LB==0?1:0;
-    case KEYID_ZZ  :
-        return KEY_ZZ==0?1:0;
-    case KEYID_YZ  :
-        return KEY_YZ==0?1:0;
-    case KEYID_ZXFW:
-        return KEY_ZXFW==0?1:0;
-    case KEYID_JS  :
-        return KEY_JS==0?1:0;
-    case KEYID_YJ  :
-        return KEY_YJ==0?1:0;
-    case KEYID_CC  :
-        return KEY_CC==0?1:0;
-    case KEYID_DD  :
-        return KEY_DD==0?1:0;
-    case KEYID_DFS :
-        return KEY_DFS==0?1:0;
-    case KEYID_DFJ :
-        return KEY_DFJ==0?1:0;
-    case KEYID_MS  :
-        return KEY_MS==0?1:0;
-    case KEYID_YBFH:
-        return KEY_YBFH==0?1:0;
-    case KEYID_YBS :
-        return KEY_YBS==0?1:0;
-    case KEYID_YBX :
-        return KEY_YBX==0?1:0;
-    case KEYID_QD  :
-        return KEY_QD==0?1:0;
-    case KEYID_XH  :
-        return KEY_XH==0?1:0;
-    case KEYID_WBJR:
-        return KEY_WBJR==0?1:0;
-    case KEYID_ZYJR:
-        return KEY_ZYJR==0?1:0;
-    case KEYID_YD  :
-        return KEY_YD==0?1:0;
-    case KEYID_TCS :
-        return KEY_TCS==0?1:0;   
+    case KEYID_1  :
+        return KEY_1==0?1:0;
+        
+    case KEYID_2  :
+        return KEY_2==0?1:0;
+        
+    case KEYID_3  :
+        return KEY_3==0?1:0;
+        
+    case KEYID_4  :
+        return KEY_4==0?1:0;
+        
+    case KEYID_5  :
+        return KEY_5==0?1:0;
+        
+    case KEYID_6  : 
+        return KEY_6==0?1:0;
+        
+    case KEYID_7  :
+        return KEY_7==0?1:0;
+        
+    case KEYID_8  :
+        return KEY_8==0?1:0;
+        
+    case KEYID_9  :
+        return KEY_9==0?1:0;
 
     default:
         return 0;