zhunk 11 ماه پیش
والد
کامیت
4a18da766b

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

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

+ 7 - 1
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -672,7 +672,12 @@ char * makeJson()
         cJSON *coll_min = cJSON_CreateStringArray(device_status.coll_time,3);
         //工作状态
         rt_sprintf(utos, "%d",device_status.work_status);
-        cJSON_AddStringToObject(pSubJson,"work_sta",utos);
+        if(device_status.autotakepic==2){
+            cJSON_AddStringToObject(pSubJson,"work_sta","2");        //拍照
+        }else{
+            cJSON_AddStringToObject(pSubJson,"work_sta",utos);
+        }
+
 
         //电压状态-batStatus
         rt_sprintf(utos, "%d",device_status.bat_status);
@@ -1285,6 +1290,7 @@ int parseDtu(char *json_string)
                   if( device_status.num_updata==0)
                   {
                       Beep_Tip(100);
+                      UpLoad_Data();
                   }
                   else if(device_status.num_updata!=0&&device_status.hmi_fresh==2)
                   {

+ 1 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -1755,7 +1755,7 @@ void Check_ParamConfig(void)
         dtu_data_play();
         sht30_collect();
         slide_Fresh();
-
+        ctr_photo(ON);
 #if SENSOR_EN==1
         mb_master_samlpe();
 #endif

+ 10 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,13 @@
+# 2025-12-1 更新说明
+	#define VERSION_BZY         "2.5.10"                   //孢子仪
+	工作状态增加拍照
+# 2025-11-28 更新说明
+	#define VERSION_BZY         "2.5.9"                   //孢子仪
+	修复开机未联网状态下持续不更新主板数据
+
+# 2025-11-26 更新说明
+	#define VERSION_BZY         "2.5.8"                   //孢子仪
+	修复未联网状态下持续不更新主板数据
 
 # 2025-10-31 更新说明
 	#define VERSION_BZY         "2.5.7"                   //孢子仪