zhunk 1 год назад
Родитель
Сommit
4686c41a4a

+ 3 - 0
Application_cbd_apm32f1/applications/control.c

@@ -2157,6 +2157,7 @@ static void Control_Clear_thread_entry(void *parameter)
 {
     while(1)
     {
+        if(device_status.update_flag==1) break;
         if(device_status.clear_status==1)
         {
             if(device_status.version_type==41){
@@ -2177,6 +2178,7 @@ static void Control_Heat_thread_entry(void *parameter)
     static int process = 0;
     while(1)
     {
+        if(device_status.update_flag==1) break;
         if(device_status.work_status==1&&device_status.heat_sw==1)
         {
             ctr_lamp(ON, 1);
@@ -2226,6 +2228,7 @@ static void thread_485_play_entry(void *param)
     }
     while(1)
     {
+        if(device_status.update_flag==1) break;
         //等待事件
         if(rt_event_recv(event_485_play, 0x01, RT_EVENT_FLAG_OR|RT_EVENT_FLAG_CLEAR, RT_WAITING_FOREVER, &e)==RT_EOK)
         {

+ 2 - 2
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -289,7 +289,7 @@ static void dtu_thread_entry_recv(void *parameter)
                     ctr_RTU_DTU(OFF);
                 }
             }
-            if (rx_err==54100&&device_status.bat_status==0)
+            if (rx_err>54100&&device_status.bat_status==0)
             {
                 LOG_W("通信中断,RTU重新上电");
                 rx_err = 0;
@@ -512,7 +512,7 @@ static void dtu_thread_entry_send(void *parameter)
             wait_i ++;
             LOG_I("wait connect internet......%d",wait_i);
             //检测到电源掉电
-            if(atoi(device_status.voltage)<5&&device_status.power_status==1&&wait_i>200)
+            if(Read_Real_Voltage()/100<5&&device_status.power_status==1&&wait_i>200)
             {
                 check_i++;
                 LOG_W("断网状态下检测到设备断电!%d",atoi(device_status.voltage));

+ 2 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,5 @@
+# 2025-05-16 更新说明
+1. 修复欠压状态并且RTU程序未运行时 会关断RTU电源问题
 
 # 2025-04-30 更新说明
 #define VERSION_HK          "2.4.41(HK)"            //4.0海康-1200W