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

+ 8 - 2
Application_cbd_apm32f1/applications/control.c

@@ -1736,12 +1736,18 @@ void WorkTask(void)
                 rt_thread_delay(1000);
                 LOG_I("等待清扫完成...");
             }
-            device_status.ctr_down_motor =1;
+            ctr_cangmen_down(OPEN);
             //待下仓门完全打开
-            while(device_status.ctr_down_motor!=0)
+            uint8_t i = 0;
+            while(1)
             {
+                i++;
                 rt_thread_delay(100);
                 rt_kprintf("等待下仓门打开!!!\n");
+                if(i>10) {
+                    ctr_cangmen_down(OFF);
+                    break;
+                }
             }
             rt_thread_delay(2000);
             ctr_shake(ON, device_status.shake_sec);

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -40,7 +40,7 @@
     #if TG_MODULE == 0
     #define VERSION_HK_2000W    "2.32.4(2000W)"         //4.0水稻
     #else
-    #define VERSION_HK_2000W    "2.3.4(TG)"             //推杆结构
+    #define VERSION_HK_2000W    "2.5.4(TG)"             //推杆结构
     #endif
 #endif
 

+ 8 - 2
Application_cbd_apm32f1/applications/hmi.c

@@ -1366,8 +1366,12 @@ static void Ctr_Mortor_entry(void* parameter)
             #if TG_MODULE ==1
             if(rt_pin_read(CTR_UPC_LIMIT)==0){
                 ctr_cangmen_down(OFF);
+                Beep_Tip(2000);
+                while(rt_pin_read(CTR_UPC_LIMIT)==0){
+                    ctr_cangmen_down(OPEN);
+                    rt_thread_delay(1000);
+                }
                 num_down_open = 200;
-                Beep_Tip(1000);
                 device_status.ctr_down_motor = 1;
             }
             #endif
@@ -1671,7 +1675,9 @@ void Check_ParamConfig(void)
 
         if(device_status.clt_time==0) device_status.clt_time = 10;
         if(device_status.heattime==0) device_status.heattime = 10;
-        if(device_status.tph==0) device_status.tph = 70;
+        if(device_status.tph==0&&device_status.tpl==0){ //参数丢失
+             ResetParamDefault_DC();
+        }
         if(device_status.heatvalue==0) device_status.heatvalue = 100;
 
         /*设备类型,7孢子仪,3测报灯,默认设置测报灯*/