zhunk 8 месяцев назад
Родитель
Сommit
36a7218c83

+ 40 - 28
Application_CBD/applications/sht30_collect.c

@@ -130,28 +130,63 @@ static void sht30_collect_thread_entry(void *parameter)
 {
 {
     static int checklightnum = 0;
     static int checklightnum = 0;
     static int checknightnum = 0;
     static int checknightnum = 0;
+    static int rain_on_num = 0;
+    static int rain_off_num = 0;
     while (1)
     while (1)
     {
     {
         if(Read_Light_Voltage()>500)
         if(Read_Light_Voltage()>500)
         {
         {
             checklightnum++;
             checklightnum++;
-            if(checklightnum==20)
+            if(checklightnum==1000)
             {
             {
                 device_status.sun_status = 1;
                 device_status.sun_status = 1;
                 device_status.C01 |= (1<<6);
                 device_status.C01 |= (1<<6);
-                checklightnum =0;
+                checklightnum = 0;
+                checknightnum = 0;
             }
             }
 
 
         }
         }
         else {
         else {
             checknightnum ++;
             checknightnum ++;
-            if(checknightnum==20)
+            if(checknightnum==1000)
             {
             {
                 device_status.C01 &= ~(1<<6);
                 device_status.C01 &= ~(1<<6);
                 device_status.sun_status = 0;
                 device_status.sun_status = 0;
                 checknightnum = 0;
                 checknightnum = 0;
+                checklightnum = 0;
+            }
+        }
+
+        //雨控
+        if(Read_Rain_Voltage()>250&&device_status.selfcheck_ws==0)
+        {
+            rain_on_num ++;
+            if(rain_on_num==1)
+            {
+                LOG_W("雨控触发值:%d",Read_Rain_Voltage());
+                device_status.C01 |= (1<<5);
+                device_status.rain_status = 1;
+                device_status.ctr_up_motor = 2; //关闭上仓门
+                ctr_lamp(OFF,1);
+                ctr_lamp(OFF,2);
+                ctr_lamp(OFF,3);
+                rain_on_num = 0;
+                rain_off_num = 0;
+            }
+        }
+        else {
+            rain_off_num ++;
+            if(rain_off_num==10*60*60){  //1个小时后解除雨控
+                device_status.rain_status = 0;
+                device_status.C01 &= ~(1<<5);
+                rain_on_num = 0;
+                rain_off_num = 0;
+            }
+            if(rain_off_num%100==0){
+                LOG_I("雨控解除计数:3600-%d",rain_off_num);
             }
             }
         }
         }
+
         //温控
         //温控
         if(atoi(device_status.tempture)>=device_status.tph||atoi(device_status.tempture)<=device_status.tpl)
         if(atoi(device_status.tempture)>=device_status.tph||atoi(device_status.tempture)<=device_status.tpl)
         {
         {
@@ -163,13 +198,12 @@ static void sht30_collect_thread_entry(void *parameter)
             device_status.C01 &= ~(1<<7);
             device_status.C01 &= ~(1<<7);
             device_status.temp_status = 0;
             device_status.temp_status = 0;
         }
         }
-        LOG_I("光控计数:%d-%d",checklightnum,checknightnum);
-        rt_thread_mdelay(5000);
+
+        rt_thread_mdelay(100);
     }
     }
 }
 }
 static void Power_ReadCheck(void *parameter)
 static void Power_ReadCheck(void *parameter)
 {
 {
-    int rain_cnt = 0;
     int bat_cnt = 0;
     int bat_cnt = 0;
     int RV;
     int RV;
     MovingAverageFilter* filter = moving_average_filter_init(10);
     MovingAverageFilter* filter = moving_average_filter_init(10);
@@ -271,28 +305,6 @@ static void Power_ReadCheck(void *parameter)
                     device_status.heattem = 25;
                     device_status.heattem = 25;
                 }
                 }
             }
             }
-            //雨控
-            if(Read_Rain_Voltage()>250&&device_status.selfcheck_ws==0)
-            {
-                device_status.C01 |= (1<<5);
-                device_status.rain_status = 1;
-                device_status.ctr_up_motor = 2; //关闭上仓门
-                ctr_lamp(OFF,1);
-                ctr_lamp(OFF,2);
-                ctr_lamp(OFF,3);
-                rain_cnt = 0;
-            }
-            else {
-                rain_cnt++;
-                //雨控消抖,1分钟
-                if(rain_cnt==3000&&Read_Rain_Voltage()<250)
-                {
-                    LOG_W("雨控触发值:%d",Read_Rain_Voltage());
-                    rain_cnt = 0;
-                    device_status.rain_status = 2;
-                    device_status.C01 &= ~(1<<5);
-                }
-            }
         }
         }
         if(bat_cnt>=15){  //持续10s
         if(bat_cnt>=15){  //持续10s
             bat_cnt = 0;
             bat_cnt = 0;

+ 1 - 0
Application_cbd_apm32f1/applications/hmi.c

@@ -658,6 +658,7 @@ static void HMI_Decode(void)
         ctr_lamp(ON,2);
         ctr_lamp(ON,2);
         ctr_lamp(ON,3);
         ctr_lamp(ON,3);
         #endif
         #endif
+        device_status.rain_status = 0;
     }
     }
 
 
     //关闭灯管
     //关闭灯管

+ 5 - 0
Application_cbd_apm32f1/readme.md

@@ -1,5 +1,10 @@
 # 2026-03-13 更新说明
 # 2026-03-13 更新说明
 	"2.35.4(2000W)"
 	"2.35.4(2000W)"
+	1. 修复测试加热开关,状态界面不更新
+	2. 修复未雨控时计数结束后标志位错误导致误触发;
+	3. 
+# 2026-03-13 更新说明
+	"2.35.4(2000W)"
 	1. 增加系统状态监测
 	1. 增加系统状态监测
 	2. 增加imei和iccid同步的代码健壮性
 	2. 增加imei和iccid同步的代码健壮性
 	3. 修复参数丢失thsp为0导致屏幕无法常亮
 	3. 修复参数丢失thsp为0导致屏幕无法常亮