zhunk 2 ay önce
ebeveyn
işleme
9f8f656f5b

+ 1 - 1
Application_cbd_apm32f1/applications/control.c

@@ -1109,7 +1109,7 @@ void slide_thread_entry(void *parameter)
     case 6:{    //Y轴
                 ctr_move(Y_,slide_para.ydir,slide_para.ydis,slide_para.pulse_period);
                 rt_kprintf("The slide's y movement was done ok\n");
-                rt_thread_delay(2000);  //20260905 -- 1000>2000   消抖
+                rt_thread_delay(1000);  //
                 if(1){
                     /* 发送movy后等待相机回传focus, 5S超时未收到则重发, 最多重传3次, 避免对焦卡死 */
                     int focus_ok = 0;

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -16,7 +16,7 @@
 //定制相关//////////////////////////////////////////////////////
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
-#define VERSION_BZY         "2.9.32"                   //孢子仪
+#define VERSION_BZY         "2.9.33"                   //孢子仪
 
 /* 对焦串口通信异常标志: 串口收到合法 JSON 且含 "focus" 字段时置1(定义于dtu_uart2.c) */
 extern volatile uint8_t focus_valid_flag;

+ 1 - 11
Application_cbd_apm32f1/applications/hmi.c

@@ -533,7 +533,6 @@ static void Ctr_Mortor_entry(void* parameter)
    rt_signal_install(SIGUSR2, thread2_signal_handler);  //坐标校准信号
    rt_signal_unmask(SIGUSR1);
    rt_signal_unmask(SIGUSR2);
-   static uint32_t t_takephoto = 0;
     while(1)
     {
         /* ========== 对焦拍照持续时间计时 ==========
@@ -550,14 +549,6 @@ static void Ctr_Mortor_entry(void* parameter)
         }
         if(device_status.autotakepic==2)
         {
-            t_takephoto++;
-            if(t_takephoto==360000)
-            {
-                ctr_led(OFF);
-                t_takephoto = 0;
-                device_status.autotakepic = 0;
-                report_takephoto_duration();   /* 拍照超时, 上报对焦拍照持续时间 */
-            }
             /* 自动对焦:等待 focus 回复超时则补发指令(最多重试3次),
              * 防止串口乱码导致 focus 帧丢失而对焦中断 */
             if (g_af.active &&
@@ -590,9 +581,8 @@ static void Ctr_Mortor_entry(void* parameter)
            if (g_cal.sharpness_updated) {
                calibrate_process();
            }
-        }else {
-            t_takephoto = 0;
         }
+
         /*对焦拍照,滑台初始化*/
         if(device_status.autotakepic==1)
         {