zhunk 8 tháng trước cách đây
mục cha
commit
ecb0cc3b73

+ 1 - 3
Application_cbd_apm32f1/applications/control.h

@@ -16,9 +16,7 @@
 //定制相关//////////////////////////////////////////////////////
 //定制相关//////////////////////////////////////////////////////
 #define SENSOR_EN        1              //温湿度:0关闭,1打开
 #define SENSOR_EN        1              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////
-
-#define VERSION_BZY         "2.6.15"                   //孢子仪
-
+#define VERSION_BZY         "2.6.16"                   //孢子仪
 
 
 /*********************************************************************/
 /*********************************************************************/
 typedef struct  _packed
 typedef struct  _packed

+ 13 - 2
Application_cbd_apm32f1/applications/hmi.c

@@ -1422,6 +1422,7 @@ static void Ctr_Mortor_entry(void* parameter)
    rt_signal_install(SIGUSR2, thread2_signal_handler);  //坐标校准信号
    rt_signal_install(SIGUSR2, thread2_signal_handler);  //坐标校准信号
    rt_signal_unmask(SIGUSR1);
    rt_signal_unmask(SIGUSR1);
    rt_signal_unmask(SIGUSR2);
    rt_signal_unmask(SIGUSR2);
+   static uint32_t t_takephoto = 0;
     while(1)
     while(1)
     {
     {
         if(device_status.calibrate_slide==2)
         if(device_status.calibrate_slide==2)
@@ -1429,7 +1430,17 @@ static void Ctr_Mortor_entry(void* parameter)
             device_status.autotakepic=1;
             device_status.autotakepic=1;
             device_status.calibrate_slide = 20;
             device_status.calibrate_slide = 20;
         }
         }
-
+        if(device_status.autotakepic==2)
+        {
+            t_takephoto++;
+            if(t_takephoto==36000)
+            {
+                t_takephoto = 0;
+                device_status.autotakepic = 0;
+            }
+        }else {
+            t_takephoto = 0;
+        }
         /*对焦拍照,滑台初始化*/
         /*对焦拍照,滑台初始化*/
         if(device_status.autotakepic==1)
         if(device_status.autotakepic==1)
         {
         {
@@ -1552,7 +1563,7 @@ static void Ctr_Mortor_entry(void* parameter)
             DTU_Write(take_start);
             DTU_Write(take_start);
             rt_free(take_start);
             rt_free(take_start);
         }
         }
-        rt_thread_delay(10);
+        rt_thread_delay(100);
     }
     }
 }
 }
 /*屏幕写数据*/
 /*屏幕写数据*/

+ 1 - 0
Application_cbd_apm32f1/applications/selfcheck.c

@@ -38,6 +38,7 @@ static int calculate_average(int arr[], int n) {
 
 
 static void t_takephoto_callback(void *parameter)
 static void t_takephoto_callback(void *parameter)
 {
 {
+    device_status.autotakepic = 0;
     LOG_E("t_takephoto_callback");
     LOG_E("t_takephoto_callback");
     //关闭补光灯
     //关闭补光灯
     ctr_led(OFF);
     ctr_led(OFF);

+ 4 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,7 @@
+# 2026-03-25 更新说明
+	#define VERSION_BZY         "2.6.16"                   //孢子仪
+	修复拍照未正常结束平台持续显示拍照状态的问题;
+
 # 2026-01-19 更新说明
 # 2026-01-19 更新说明
 	#define VERSION_BZY         "2.6.15"                   //孢子仪
 	#define VERSION_BZY         "2.6.15"                   //孢子仪
 	修复ymodem升级标志位错误,升级时关闭modbus采集线程
 	修复ymodem升级标志位错误,升级时关闭modbus采集线程