zhunk пре 8 месеци
родитељ
комит
f9086a071c

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -20,7 +20,7 @@
 
 ////////////////////////////////////////////////////////////////
 
-#define VERSION  "3.4.3"
+#define VERSION  "3.5.3"
 
 extern rt_event_t event_485_play;
 

+ 2 - 1
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -293,7 +293,8 @@ static void dtu_thread_entry_send(void *parameter)
                 DTU_Write("%s",readinfo);
                 rt_free(readinfo);
                 rt_thread_delay(1000);
-                UpLoad_Data();
+                if(device_status.sleep_mode!=1)
+                    UpLoad_Data();
                 device_status.num_updata = device_status.dattim * 60;
                 if(device_status.dattim==0) device_status.dattim=30;   //数据上传时间间隔设置为0?
             }

+ 5 - 6
Application_cbd_apm32f1/applications/hmi.c

@@ -1211,13 +1211,12 @@ void ResetParamDefault(void)
     device_status.ds = 1;           //设备状态开机
     device_status.thsp = 300;
     device_status.passWord = 8888;
-    device_status.dattim = 30;
     device_status.Power_Type = 0;
     ef_set_env_blob("Power_Type", &device_status.Power_Type, sizeof(device_status.Power_Type));
 
     device_status.cul_time = 60;    //收集时间
     ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time));
-    device_status.dattim = 30;      //数据上传间隔
+    device_status.dattim = 60;      //数据上传间隔
     ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim)); //数据上传间隔
 
     device_status.startBar = 9;    //定时开始时间
@@ -1264,17 +1263,17 @@ void ResetParamDefault_DC(void)
     rt_sprintf(device_status.tempture,"%d",-15);
     device_status.cul_time = 60;    //收集时间
     ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time));
-    device_status.dattim = 30;      //数据上传间隔
+    device_status.dattim = 60;      //数据上传间隔
     ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim)); //数据上传间隔
-    device_status.startBar = 9;    //定时开始时间
-    device_status.stopBar = 18;      //定时结束时间
+    device_status.startBar = 10;    //定时开始时间
+    device_status.stopBar = 22;      //定时结束时间
     device_status.heattime = 10;    //加热时间
     device_status.shake_ws = 1;     //针对开关
     device_status.shake_sec = 1;    //震动时间1-100ms
     device_status.sunBar = 4;
     device_status.Power_Type = 1;
     device_status.tph = 70;         //高温保护阈值
-    device_status.tpl = -5;          //低温保护阈值
+    device_status.tpl = 5;          //低温保护阈值
     device_status.timeSwitch = 1;   //定时模式
     device_status.heatvalue=100;
     device_status.ds = 1;           //设备状态开机

+ 3 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,6 @@
+# 2026-03-14 更新说明
+	版本:3.5.3
+	1. 修复常休眠模式,唤醒后上报两条数据的问题;
 # 2026-03-12 更新说明
 	版本:3.4.3
 	1. 屏幕串口驱动使用信号量接收数据,取消使用消息队列