zhunk 1 year ago
parent
commit
a045668b0f

+ 2 - 3
Application_cbd_apm32f1/applications/control.h

@@ -17,12 +17,11 @@
 
 
 
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
-#define PCB_V1           1             //1-旧PCB,0-新PCB(模块化)
-#define MATCH_DEVICE     1             //比赛设备
+#define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
+#define MATCH_DEVICE     0             //比赛设备
 #define SENSOR_EN        1             //温湿度:0关闭,1打开
 #define SENSOR_EN        1             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
 
 
-
 #if MATCH_DEVICE == 1
 #if MATCH_DEVICE == 1
 #define LAMP_CURRENT    600
 #define LAMP_CURRENT    600
 #else
 #else

+ 5 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -517,6 +517,9 @@ static void HMI_Decode(void)
         else if (device_status.version_type==6) {
         else if (device_status.version_type==6) {
             ctr_JD_Clear(ON);
             ctr_JD_Clear(ON);
         }
         }
+        else if (device_status.version_type==5) {
+
+        }
     }
     }
     //震动
     //震动
     else if (strstr(rx_buffer,"putTest.switchShake=1")!=NULL) {
     else if (strstr(rx_buffer,"putTest.switchShake=1")!=NULL) {
@@ -2137,9 +2140,10 @@ void Check_ParamConfig(void)
         {
         {
             Work_Loop_Task();
             Work_Loop_Task();
         }
         }
-
+#if MATCH_DEVICE == 1
         device_status.selfcheck_ws = 3;
         device_status.selfcheck_ws = 3;
 #endif
 #endif
+#endif
     }
     }
 }
 }
 void ResetParamDefault(void)
 void ResetParamDefault(void)