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

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -44,7 +44,7 @@
 #if JINGJIKUAN == 0
     #define VERSION_HK_2000W    "2.41.4(2000W)"         //4.0水稻
 #else
-    #define VERSION_HK_2000W    "2.43.4(jjk)"           //经济款
+    #define VERSION_HK_2000W    "2.44.4(jjk)"           //经济款
 #endif
     #else
     #if MATCH_DEVICE == 1

+ 4 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -1639,10 +1639,13 @@ static void Ctr_Mortor_entry(void* parameter)
                 route_off_t = 0;
             }
         }
+#if JINGJIKUAN == 1
         if(device_status.rain_status==1){
             isnot_rain = 0;
             if(is_rain==0){
                 ctr_rain_motor(CLOSE);
+                rt_thread_delay(100);
+                device_status.ctr_up_motor = 2; //关闭上仓门
                 is_rain = 1;
             }
         }else{
@@ -1652,7 +1655,7 @@ static void Ctr_Mortor_entry(void* parameter)
                 isnot_rain = 1;
             }
         }
-
+#endif
         rt_thread_delay(100);
     }
 }

+ 3 - 1
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -198,9 +198,11 @@ static void adc_collect_thread_entry(void *parameter)
                 system_status.rain_control_triggers +=1;
                 device_status.rain_status = 1;
                 ctr_lamp(OFF,1);
-                device_status.ctr_up_motor = 2; //关闭上仓门
                 checkrain_num = 0;
                 checkrain_unlock = 0;
+#if JINGJIKUAN == 0
+                device_status.ctr_up_motor = 2;
+#endif
             }
         }
         else {