zhunk 1 年間 前
親
コミット
1c0b744cb0

+ 2 - 2
Application_cbd_apm32f1/applications/control.c

@@ -1316,8 +1316,6 @@ void WorkTask_XYV3(void)
             device_status.ds==1&&
             device_status.temp_status==0)
     {
-        ctr_router(ON);
-        ctr_RTU_DTU(ON);
         //高压板通电
         ctr_lamp(ON, 1);     //清扫-DC12v电机正反转
         rt_thread_delay(10000);
@@ -1326,6 +1324,8 @@ void WorkTask_XYV3(void)
         ctr_photo(ON);
         //拍照(?触发条件)计数?没有虫呢?定时
         while(1){
+            ctr_router(ON);
+            ctr_RTU_DTU(ON);
             cal_n--;
             LOG_I("诱虫检测计数剩余时间:%d S",cal_n);
             if(cal_n==0){

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -25,7 +25,7 @@
 
 ////////////////////////////////////////////////////////////////
 
-#define VERSION  "2.3.5"
+#define VERSION  "2.4.5"
 
 
 extern rt_event_t event_485_play;

+ 0 - 6
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -1355,7 +1355,6 @@ int parseDtu(char *json_string)
                                   setSystemTime(tm_time);
                               }
                           }
-
                       }
                       free(tm_time); // Free the allocated memory
                   }
@@ -2032,11 +2031,6 @@ void UpLoad_Data(void)
     char *updata = makeJson();
     DTU_Write("%s",updata);
     rt_free(updata);
-    if(device_status.sleep_mode == 1&&device_status.work_status==0&&atoi(device_status.net)==0) {
-        //60S后关闭RTU、路由器电源
-        device_status.C01 = 10;
-        LOG_W("60S后关闭RTU、路由器电源");
-    }
     //list_mem();
     //播放数据上传中语音
 }

+ 0 - 11
Application_cbd_apm32f1/applications/hmi.c

@@ -930,17 +930,6 @@ static void Ctr_Mortor_entry(void* parameter)
                 device_status.clear_status = 10;    //翻板
             }
         }
-        if(device_status.C01==10)
-        {
-            off_router_sec--;
-            if(off_router_sec==0)
-            {
-                off_router_sec = 600;
-                device_status.C01=0;
-                ctr_router(OFF);
-                ctr_RTU_DTU(OFF);
-            }
-        }
         rt_thread_delay(100);
     }
 }

+ 7 - 5
Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c

@@ -402,17 +402,19 @@ static void syswatch_thread_entry(void *parameter)
         }
 
 
-        if((alarm_new.tm_hour==00) ||
-                (alarm_new.tm_hour==01) ||
+        if((alarm_new.tm_hour==01) ||
                 (alarm_new.tm_hour==02) ||
                 (alarm_new.tm_hour==03) ||
                 (alarm_new.tm_hour==04) ||
                 (alarm_new.tm_hour==23))
         {
-            if((alarm_new.tm_min==01)&&(alarm_new.tm_sec==0))
+            if((alarm_new.tm_min==05)&&(alarm_new.tm_sec==0))
             {
-                ctr_router(OFF);
-                ctr_RTU_DTU(OFF);
+                if(alarm_new.tm_year>=2025)
+                {
+                    ctr_router(OFF);
+                    ctr_RTU_DTU(OFF);
+                }
             }
 
         }

+ 3 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,6 @@
+# 2025-08-14 更新说明
+	版本:2.4.5
+	1. 修复重启时间未同步就断电的问题
 # 2025-08-08 更新说明
 	版本:2.3.5
 	1. 拍照过程关闭高压;