|
|
@@ -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)
|
|
|
{
|