zhunk 11 месяцев назад
Родитель
Сommit
59979f020c

BIN
Application_cbd_apm32f1/.settings/.rtmenus


+ 2 - 1
Application_cbd_apm32f1/applications/control.c

@@ -349,6 +349,7 @@ void WorkTask_XYV3(void)
                 }
             }
             if(device_status.temp_status==1 || device_status.bat_status==1 || device_status.work_status==0){
+                ctr_gaoya_12v(OFF);
                 device_status.photo_ws = 2;
                 break;
             }
@@ -356,7 +357,6 @@ void WorkTask_XYV3(void)
         }
         rt_thread_delay(10000);
     }
-    ctr_gaoya_12v(OFF);
 }
 
 /* 入口函数-工作状态检测 */
@@ -423,6 +423,7 @@ static void Check_gaoya_thread_entry(void *parameter)
         {
             gaoya_hand = TRUE;
             LOG_I("高压触发:[%d,%d]",gaoya_value1,gaoya_value2);
+            rt_thread_delay(1000);
             ctr_clear();
         }
     }

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -20,7 +20,7 @@
 
 ////////////////////////////////////////////////////////////////
 
-#define VERSION  "3.0.0"
+#define VERSION  "3.0.1"
 
 
 extern rt_event_t event_485_play;

+ 3 - 4
Application_cbd_apm32f1/applications/hmi.c

@@ -432,7 +432,7 @@ static void HMI_Decode(void)
         device_status.test_flag=1;
         rt_kprintf("Open Lamp!\n");
         //ctr_lamp(ON,1);
-
+        ctr_gaoya_12v(ON);
         DTU_Write("{\"cmd\":\"workstart\"}");
         USHORT dkdg[] = {0xb4f2,0xbfaa,0xb5c6,0xb9dc};
         _485_play(dkdg,4);
@@ -444,7 +444,7 @@ static void HMI_Decode(void)
         device_status.test_flag=0;
         rt_kprintf("Close Lamp1!\n");
         //ctr_lamp(OFF,1);
-
+        ctr_gaoya_12v(OFF);
         DTU_Write("{\"cmd\":\"workdone\"}");
         USHORT gbdg[] = {0xb9d8,0xb1d5,0xb5c6,0xb9dc};
         _485_play(gbdg,4);
@@ -1086,7 +1086,7 @@ void Check_ParamConfig(void)
         Check_Self();
         dtu_data_play();
         sht30_collect();
-
+        Check_gaoya();
 #if SENSOR_EN==1
         mb_master_samlpe();
 #endif
@@ -1129,7 +1129,6 @@ void Check_ParamConfig(void)
         dtu_send_data_start();
         Workstatus_check();
         Work_Loop_Task();
-        Check_gaoya();
     }
 }