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

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -17,7 +17,7 @@
 #define SENSOR_EN        1              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 
-#define VERSION_BZY         "2.6.14"                   //孢子仪
+#define VERSION_BZY         "2.6.15"                   //孢子仪
 
 
 /*********************************************************************/

+ 1 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -887,6 +887,7 @@ int parseDtu(char *json_string)
                   rt_thread_delay(5000);
                   thread_delete_workloop();
                   thread_delete_adc();
+                  delete_mb_master_samlpe();
                   device_status.update_flag = 1;
                   ymodem_ota(1,0);
               }

+ 13 - 3
Application_cbd_apm32f1/applications/sample_mb_master.c

@@ -44,7 +44,7 @@ Device_Status_typedef device_status;
 
 extern USHORT   usMRegInBuf[MB_MASTER_TOTAL_SLAVE_NUM][M_REG_INPUT_NREGS];
 extern SHORT usMRegHoldBuf[MB_MASTER_TOTAL_SLAVE_NUM][M_REG_HOLDING_NREGS];
-
+rt_thread_t tid1 = RT_NULL, tid2 = RT_NULL;
 
 static void send_thread_entry(void *parameter)
 {
@@ -134,12 +134,22 @@ static void mb_master_poll(void *parameter)
         rt_thread_mdelay(MB_POLL_CYCLE_MS);
     }
 }
+int delete_mb_master_samlpe(void)
+{
+    if(tid1!=RT_NULL)
+    {
+        rt_thread_delete(tid1);
+    }
+    if(tid2!=RT_NULL)
+    {
+        rt_thread_delete(tid2);
+    }
+    return 0;
+}
 
 int mb_master_samlpe(void)
 {
     static rt_uint8_t is_init = 0;
-    rt_thread_t tid1 = RT_NULL, tid2 = RT_NULL;
-
     if (is_init > 0)
     {
         rt_kprintf("sample is running\n");

+ 1 - 1
Application_cbd_apm32f1/packages/ota_downloader-v1.0.0/tools/ota_packager/rt_ota_packaging_tool.exe.config

@@ -6,5 +6,5 @@
   <runtime>
     <enforceFIPSPolicy enabled="false" />
   </runtime>
-  <configs SELEFILE="" SAVEFILE="" COMPRESS="0" CRYPT="0" KEY="" IV="" NAME="" VERSION="" />
+  <configs SELEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\rtthread.bin" SAVEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\Application_BZYV2.rbl" COMPRESS="0" CRYPT="0" KEY="" IV="" NAME="app" VERSION="2.6.15" />
 </configuration>

+ 3 - 0
Application_cbd_apm32f1/readme.md

@@ -1,4 +1,7 @@
 # 2026-01-19 更新说明
+	#define VERSION_BZY         "2.6.15"                   //孢子仪
+	修复ymodem升级标志位错误,升级时关闭modbus采集线程
+# 2026-01-19 更新说明
 	#define VERSION_BZY         "2.6.14"                   //孢子仪
 	增大Powe_ch线程栈空间为2048,md_m_pol为1024
 # 2025-12-26 更新说明