zhunk пре 1 година
родитељ
комит
da06c144eb

+ 1 - 1
Application_CBD/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1335513985103623877" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1293618710119634749" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 11 - 3
Application_cbd_apm32f1/applications/control.c

@@ -36,8 +36,6 @@ Device_slide_typedef slide_para;
 
 static rt_thread_t tid_workloop = RT_NULL;
 static rt_thread_t tid_wkstc = RT_NULL;
-static rt_thread_t tid_ctr = RT_NULL;
-static rt_thread_t tid_heat = RT_NULL;
 static rt_thread_t rt_slide = RT_NULL;
 /***************************************************************************/
 
@@ -45,14 +43,24 @@ static rt_thread_t rt_slide = RT_NULL;
 
 int thread_delete_workloop(void)
 {
+    LOG_W("thread_delete_workloop.");
     rt_err_t result;
     if(tid_workloop!=RT_NULL)
     {
         result = rt_thread_delete(tid_workloop);
     }
-    return result;
+    if(tid_wkstc!=RT_NULL)
+    {
+        result = rt_thread_delete(tid_wkstc);
+    }
+    if(rt_slide!=RT_NULL)
+    {
+        result = rt_thread_delete(rt_slide);
+    }
+    return 0;
 }
 
+
 int thread_restart_workloop(void)
 {
     rt_err_t result;

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

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

+ 17 - 8
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -240,6 +240,16 @@ static void dtu_thread_entry_recv(void *parameter)
         #endif
 }
 #endif
+int delete_thrad_dtu_recv_data(void)
+{
+    LOG_W("delete_thrad_dtu_recv_data.");
+    rt_mq_delete(&rx_mq_dtu);
+//    if(dtu_recv_data!=RT_NULL)
+//    {
+//        rt_thread_delete(dtu_recv_data);
+//    }
+    return 0;
+}
 /* 创建线程 */
 int dtu_data_play(void)
 {
@@ -266,7 +276,7 @@ int dtu_data_play(void)
             );
     #endif
     /* 创建线程-指令接收解析*/
-    dtu_recv_data = rt_thread_create("thread_uart2",
+    dtu_recv_data = rt_thread_create("t_uart2",
             dtu_thread_entry_recv, RT_NULL,
             DTU_THREAD_STACK_SIZE,
             DTU_THREAD_PRIORITY,
@@ -1022,14 +1032,13 @@ int parseDtu(char *json_string)
             }
               else if (strstr(item_cmd->valuestring,"update")!=RT_NULL)
               {
-                  rt_kprintf("准备升级!!!");
-                  device_status.update_flag = 1;
-                  ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
-                  rt_kprintf("%s\n",makeJson_Warn("system will update","control"));
-                  rt_thread_delay(2000);
+                  LOG_W("准备升级!!!");
                   DTU_Write("%s",makeJson_Warn("system will update","control"));
-                  rt_thread_delay(20);
-                  rt_hw_cpu_reset();
+                  rt_thread_delay(5000);
+                  thread_delete_workloop();
+                  thread_delete_adc();
+                  device_status.update_flag = 1;
+                  ymodem_ota(1,0);
               }
               else if (strstr(item_cmd->valuestring,"read")!=RT_NULL)
               {

+ 7 - 6
Application_cbd_apm32f1/applications/hmi.c

@@ -1743,14 +1743,8 @@ void Check_ParamConfig(void)
         LOG_I("y_init_dis:%d",device_status.y_init_dis);
     }
     //RTC时间判断,如果当前年份小于2020,提示需要设置时间,切换为光控
-    if(device_status.update_flag==1)
     {
         device_status.update_flag = 0;
-        ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
-        ymodem_ota(1,0);
-    }
-    else {
-        device_status.update_flag = 0;
         //初始化联网状态
         rt_sprintf(device_status.net,"1");
         rt_sprintf(device_status.csq,"0");
@@ -1981,6 +1975,13 @@ void Debug_log_OFF(void)
     }
 
 }
+ int delete_thread_ctr_motor()
+ {
+     if(ctr_motor!=RT_NULL)
+     {
+         rt_thread_delete(ctr_motor);
+     }
+ }
 MSH_CMD_EXPORT(Debug_log_ON,Debug_log_ON);
 MSH_CMD_EXPORT(Debug_log_OFF,Debug_log_OFF);
 //

+ 6 - 1
Application_cbd_apm32f1/applications/main.c

@@ -38,7 +38,12 @@ int main(void)
     memtrace(0, NULL);
     while(1)
     {
-        rt_thread_mdelay(1000);
+        if(device_status.update_flag == 1)
+        {
+            rt_thread_mdelay(100);
+        }else{
+            rt_thread_mdelay(1000);
+        }
         led_tog(1);
     }
 

+ 14 - 0
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -491,6 +491,20 @@ int sht30_collect(void)
         rt_thread_startup(tid2);
     return 0;
 }
+
+int thread_delete_adc(void)
+{
+    LOG_W("thread_delete_adc.");
+    if(tid1!=RT_NULL)
+    {
+        rt_thread_delete(tid1);
+    }
+    if(tid2!=RT_NULL)
+    {
+        rt_thread_delete(tid2);
+    }
+}
+
 //控制台打印传感器信息
 void Msh_DisplaySensor(void)
 {

+ 3 - 0
Application_cbd_apm32f1/applications/sht30_collect.h

@@ -29,6 +29,9 @@ int TempCalculate(float Rv,int B,int BasicRx);
 short Get_Temprate(void);
 unsigned int filter_Mid(int adc_return);
 unsigned int filter_voltage(void);
+
+
+int thread_delete_adc(void);
 #endif /* APPLICATIONS_INC_SHT30_COLLECT_H_ */
 
 //STM32之ADC(内部基准电压,参考电压)

+ 5 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,8 @@
+
+# 2025-10-31 更新说明
+	#define VERSION_BZY         "2.5.6"                   //孢子仪
+	Ymodem升级不再重启MCU;
+	升级过程指示灯快闪,由1000ms变更为100ms;
 # 2025-10-31 更新说明
 	#define VERSION_BZY         "2.5.5"                   //孢子仪
 	工控机供电修改为加热接口