zhunk 1 rok pred
rodič
commit
263164d57b

+ 2 - 3
Application_cbd_apm32f1/applications/control.c

@@ -1385,7 +1385,7 @@ void ResetInit(void)
                return;
                return;
            }
            }
 
 
-           if(device_status.version_type==4||device_status.version_type==41)
+           if(device_status.version_type==4||device_status.version_type==41||device_status.version_type==42||device_status.version_type==43)
            {
            {
                if(device_status.photo_ws==0)    device_status.clear_status=1;
                if(device_status.photo_ws==0)    device_status.clear_status=1;
                while(device_status.clear_status==1){
                while(device_status.clear_status==1){
@@ -1960,7 +1960,7 @@ void WorkTask(void)
              rt_thread_delay(1000);
              rt_thread_delay(1000);
             #endif
             #endif
 
 
-            if(device_status.version_type==4||device_status.version_type==41)
+            if(device_status.version_type==4||device_status.version_type==41||device_status.version_type==42||device_status.version_type==43)
             {
             {
                 //震动
                 //震动
                 ctr_shake(ON, device_status.shake_sec);
                 ctr_shake(ON, device_status.shake_sec);
@@ -2102,7 +2102,6 @@ static void Control_Clear_thread_entry(void *parameter)
             }else {
             }else {
                 ctr_TG_Clear(350);
                 ctr_TG_Clear(350);
             }
             }
-
         }
         }
         if(device_status.clear_status==2)
         if(device_status.clear_status==2)
         {
         {

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -17,7 +17,7 @@
 
 
 
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
-#define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
+#define PCB_V1           1             //1-旧PCB,0-新PCB(模块化)
 #define MATCH_DEVICE     0             //比赛设备
 #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-启用

+ 1 - 1
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -968,7 +968,7 @@ char * makeJson()
     {
     {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_ZP,device_status.driver_4g);
         rt_sprintf(device_status.driver,"%s-%s",VERSION_ZP,device_status.driver_4g);
     }
     }
-    else if (device_status.version_type==4) {
+    else if (device_status.version_type==4||device_status.version_type==43||device_status.version_type==42) {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_HK_2000W,device_status.driver_4g);
         rt_sprintf(device_status.driver,"%s-%s",VERSION_HK_2000W,device_status.driver_4g);
     }
     }
     else if (device_status.version_type==41) {
     else if (device_status.version_type==41) {

+ 8 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -1126,6 +1126,7 @@ static void HMI_Decode(void)
         else {
         else {
 
 
         }
         }
+        return;
     }
     }
     //1.0
     //1.0
     else if (strstr(rx_buffer,"SwversionV1")!=NULL)
     else if (strstr(rx_buffer,"SwversionV1")!=NULL)
@@ -1142,6 +1143,7 @@ static void HMI_Decode(void)
         else {
         else {
 
 
         }
         }
+        return;
     }
     }
     //中端款
     //中端款
     else if (strstr(rx_buffer,"SwversionV43")!=NULL) {
     else if (strstr(rx_buffer,"SwversionV43")!=NULL) {
@@ -1158,6 +1160,7 @@ static void HMI_Decode(void)
         else {
         else {
 
 
         }
         }
+        return;
     }
     }
     //低端款
     //低端款
     else if (strstr(rx_buffer,"SwversionV42")!=NULL) {
     else if (strstr(rx_buffer,"SwversionV42")!=NULL) {
@@ -1174,6 +1177,7 @@ static void HMI_Decode(void)
         else {
         else {
 
 
         }
         }
+        return;
     }
     }
     //4.0
     //4.0
     else if (strstr(rx_buffer,"SwversionV41")!=NULL) {
     else if (strstr(rx_buffer,"SwversionV41")!=NULL) {
@@ -1190,6 +1194,7 @@ static void HMI_Decode(void)
         else {
         else {
 
 
         }
         }
+        return;
     }
     }
     //水稻
     //水稻
     else if (strstr(rx_buffer,"SwversionV4")!=NULL) {
     else if (strstr(rx_buffer,"SwversionV4")!=NULL) {
@@ -1205,6 +1210,7 @@ static void HMI_Decode(void)
         else {
         else {
 
 
         }
         }
+        return;
     }
     }
 
 
     else if (strstr(rx_buffer,"putTest.switchFAN_PU=1")!=NULL) {
     else if (strstr(rx_buffer,"putTest.switchFAN_PU=1")!=NULL) {
@@ -1804,13 +1810,14 @@ void Check_ParamConfig(void)
         {
         {
             rt_sprintf(device_status.driver, "%s",VERSION_GK);
             rt_sprintf(device_status.driver, "%s",VERSION_GK);
         }
         }
-        else if (device_status.version_type==4)
+        else if (device_status.version_type==4||device_status.version_type==42||device_status.version_type==43)
         {
         {
             rt_sprintf(device_status.driver, "%s",VERSION_HK_2000W);
             rt_sprintf(device_status.driver, "%s",VERSION_HK_2000W);
         }
         }
         else if (device_status.version_type==41) {
         else if (device_status.version_type==41) {
             rt_sprintf(device_status.driver, "%s",VERSION_HK);
             rt_sprintf(device_status.driver, "%s",VERSION_HK);
         }
         }
+
         /*定制三色光源*/
         /*定制三色光源*/
         #if LAMP_EN == 1
         #if LAMP_EN == 1
             if(device_status.sunBar%3!=0)
             if(device_status.sunBar%3!=0)