zhunk пре 5 месеци
родитељ
комит
837a665dc9

+ 3 - 0
Application_cbd_apm32f1/applications/control.c

@@ -924,6 +924,9 @@ void WorkTask_BZYV2(void)
             rt_thread_delay(10000);
         }
         ctr_router(OFF);
+        if(device_status.temp_status==1){   //20260604,解决触发温控导致立即拍照
+           device_status.work_done = 0;
+        }
         if(device_status.work_done==1){
             turnlimit();                           //卷带电机转一圈
             rt_thread_delay(1000);

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -17,7 +17,7 @@
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
 #define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
 ////////////////////////////////////////////////////////////////
-#define VERSION_BZY         "3.6.4"                   //孢子仪
+#define VERSION_BZY         "3.7.4"                   //孢子仪
 
 /*********************************************************************/
 typedef struct  _packed

+ 1 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -811,6 +811,7 @@ int parseDtu(char *json_string)
                   {
                       ctr_led(OFF);
                       stop_move();
+                      device_status.autotakepic = 0;
                   }
                   else if(strstr(type->valuestring,"selfcheck")!=RT_NULL)
                   {

+ 3 - 0
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -121,6 +121,9 @@ static void sht30_collect_thread_entry(void *parameter)
              }else{
                  RV = 10000 * (4096 - ntc_adc_read) / ntc_adc_read;
                  device_status.heattem = TempCalculate(RV, 3950, 10000);
+                 if(device_status.heattem<=-40){
+                     device_status.heattem = atoi(device_status.tempture);
+                 }
              }
          }
 

+ 3 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,6 @@
+# 2026-06-04 更新说明
+	#define VERSION_BZY         "3.7.4"                //孢子仪V1.3
+	1、温度探头故障的异常处理,触发温控后继续拍照取消;
 # 2026-06-03 更新说明
 	#define VERSION_BZY         "3.6.4"                //孢子仪V1.3
 	1、解决工作时对焦拍照风机会启动的问题;