|
|
@@ -236,6 +236,7 @@ typedef struct {
|
|
|
bool initial_move; /* 初始方向判断标志 */
|
|
|
volatile bool sharpness_updated; /* 信号处理程序置位: 有新清晰度值 */
|
|
|
float new_sharpness; /* 信号处理程序写入的新清晰度值 */
|
|
|
+ volatile bool fusion_active; /* 景深融合正在进行标志 */
|
|
|
} auto_focus_t;
|
|
|
|
|
|
static auto_focus_t g_af;
|
|
|
@@ -245,6 +246,7 @@ static auto_focus_t g_af;
|
|
|
void thread1_signal_handler(int sig)
|
|
|
{
|
|
|
rt_timer_stop(timer_takephoto);
|
|
|
+ /* 景深融合期间仍然记录清晰度,但 auto_focus_process 会忽略处理 */
|
|
|
g_af.sharpness_updated = true;
|
|
|
g_af.new_sharpness = device_status.focus_value;
|
|
|
}
|
|
|
@@ -283,36 +285,55 @@ static void auto_focus_move(void)
|
|
|
}
|
|
|
|
|
|
|
|
|
-/* 景深融合:步进10次后再回到最清晰位置 */
|
|
|
+/* 景深融合:步进20次后再回到最清晰位置
|
|
|
+ * 流程:dir=1步进10次 -> 回到最佳位置 -> dir=0步进10次 -> 回到最佳位置
|
|
|
+ * 每次步进后等待清晰度更新再继续
|
|
|
+ */
|
|
|
static void depth_of_field_fusion(void)
|
|
|
{
|
|
|
int i;
|
|
|
int best_pos = g_af.best_pos;
|
|
|
int step_size = g_af.step_size;
|
|
|
-
|
|
|
+ int wait_count;
|
|
|
+
|
|
|
LOG_I("[景深融合] 开始: 最佳位置=%d", best_pos);
|
|
|
-
|
|
|
- /* 往 dir=1 方向步进 10 次 */
|
|
|
+
|
|
|
+ /* ========== 第一阶段:往 dir=1 方向步进 10 次 ========== */
|
|
|
g_af.dir = 1;
|
|
|
for (i = 0; i < 10; i++) {
|
|
|
g_af.current_pos += step_size;
|
|
|
LOG_I("[景深融合] 正向步进[%d/10]: 位置=%d", i + 1, g_af.current_pos);
|
|
|
-
|
|
|
+
|
|
|
slide_para.pulse_period = mapSpeed(1);
|
|
|
slide_para.ystep = step_size;
|
|
|
slide_para.ydir = g_af.dir;
|
|
|
slide_para.ydis = step_size;
|
|
|
slide_para.en_slide = 6;
|
|
|
-
|
|
|
+
|
|
|
+ /* 等待电机到位 */
|
|
|
while (slide_para.en_slide != 0) {
|
|
|
rt_thread_delay(100);
|
|
|
}
|
|
|
- rt_thread_delay(50); // 短暂延迟确保稳定
|
|
|
+
|
|
|
+ /* 等待清晰度更新 */
|
|
|
+ g_af.sharpness_updated = false;
|
|
|
+ rt_timer_start(timer_takephoto);
|
|
|
+ wait_count = 0;
|
|
|
+ while (!g_af.sharpness_updated && wait_count < 200) {
|
|
|
+ rt_thread_delay(50);
|
|
|
+ wait_count++;
|
|
|
+ }
|
|
|
+ if (g_af.sharpness_updated) {
|
|
|
+ LOG_I("[景深融合] 收到清晰度:%.2f", g_af.new_sharpness);
|
|
|
+ g_af.sharpness_updated = false;
|
|
|
+ } else {
|
|
|
+ LOG_W("[景深融合] 等待清晰度超时,继续执行");
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
LOG_I("[景深融合] 正向步进完成: 位置=%d", g_af.current_pos);
|
|
|
-
|
|
|
- /* 回到最清晰位置 */
|
|
|
+
|
|
|
+ /* ========== 第一阶段:回到最清晰位置 ========== */
|
|
|
if (g_af.current_pos > best_pos) {
|
|
|
g_af.dir = 0; // 反向移动
|
|
|
int steps_back = (g_af.current_pos - best_pos) / step_size;
|
|
|
@@ -322,27 +343,115 @@ static void depth_of_field_fusion(void)
|
|
|
for (i = 0; i < steps_back && g_af.current_pos > best_pos; i++) {
|
|
|
g_af.current_pos -= step_size;
|
|
|
LOG_I("[景深融合] 返回最佳位置[%d/%d]: 位置=%d", i + 1, steps_back, g_af.current_pos);
|
|
|
-
|
|
|
+
|
|
|
slide_para.pulse_period = mapSpeed(1);
|
|
|
slide_para.ystep = step_size;
|
|
|
slide_para.ydir = g_af.dir;
|
|
|
slide_para.ydis = step_size;
|
|
|
slide_para.en_slide = 6;
|
|
|
-
|
|
|
+
|
|
|
+ /* 等待电机到位 */
|
|
|
while (slide_para.en_slide != 0) {
|
|
|
rt_thread_delay(100);
|
|
|
}
|
|
|
+
|
|
|
+ /* 等待清晰度更新 */
|
|
|
+ g_af.sharpness_updated = false;
|
|
|
+ rt_timer_start(timer_takephoto);
|
|
|
+ wait_count = 0;
|
|
|
+ while (!g_af.sharpness_updated && wait_count < 200) {
|
|
|
+ rt_thread_delay(50);
|
|
|
+ wait_count++;
|
|
|
+ }
|
|
|
+ if (g_af.sharpness_updated) {
|
|
|
+ LOG_I("[景深融合] 收到清晰度:%.2f", g_af.new_sharpness);
|
|
|
+ g_af.sharpness_updated = false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ g_af.current_pos = best_pos;
|
|
|
+ LOG_I("[景深融合] 回到正向起点: 位置=%d", g_af.current_pos);
|
|
|
+
|
|
|
+ /* ========== 第二阶段:往 dir=0 方向步进 10 次 ========== */
|
|
|
+ g_af.dir = 0;
|
|
|
+ for (i = 0; i < 10; i++) {
|
|
|
+ g_af.current_pos -= step_size;
|
|
|
+ LOG_I("[景深融合] 反向步进[%d/10]: 位置=%d", i + 1, g_af.current_pos);
|
|
|
+
|
|
|
+ slide_para.pulse_period = mapSpeed(1);
|
|
|
+ slide_para.ystep = step_size;
|
|
|
+ slide_para.ydir = g_af.dir;
|
|
|
+ slide_para.ydis = step_size;
|
|
|
+ slide_para.en_slide = 6;
|
|
|
+
|
|
|
+ /* 等待电机到位 */
|
|
|
+ while (slide_para.en_slide != 0) {
|
|
|
+ rt_thread_delay(100);
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 等待清晰度更新 */
|
|
|
+ g_af.sharpness_updated = false;
|
|
|
+ rt_timer_start(timer_takephoto);
|
|
|
+ wait_count = 0;
|
|
|
+ while (!g_af.sharpness_updated && wait_count < 200) {
|
|
|
rt_thread_delay(50);
|
|
|
+ wait_count++;
|
|
|
+ }
|
|
|
+ if (g_af.sharpness_updated) {
|
|
|
+ LOG_I("[景深融合] 收到清晰度:%.2f", g_af.new_sharpness);
|
|
|
+ g_af.sharpness_updated = false;
|
|
|
+ } else {
|
|
|
+ LOG_W("[景深融合] 等待清晰度超时,继续执行");
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ LOG_I("[景深融合] 反向步进完成: 位置=%d", g_af.current_pos);
|
|
|
+
|
|
|
+ /* ========== 第二阶段:回到最清晰位置 ========== */
|
|
|
+ if (g_af.current_pos < best_pos) {
|
|
|
+ g_af.dir = 1; // 正向移动
|
|
|
+ int steps_forward = (best_pos - g_af.current_pos) / step_size;
|
|
|
+ if ((best_pos - g_af.current_pos) % step_size != 0) {
|
|
|
+ steps_forward++; // 向上取整
|
|
|
+ }
|
|
|
+ for (i = 0; i < steps_forward && g_af.current_pos < best_pos; i++) {
|
|
|
+ g_af.current_pos += step_size;
|
|
|
+ LOG_I("[景深融合] 返回最佳位置[%d/%d]: 位置=%d", i + 1, steps_forward, g_af.current_pos);
|
|
|
+
|
|
|
+ slide_para.pulse_period = mapSpeed(1);
|
|
|
+ slide_para.ystep = step_size;
|
|
|
+ slide_para.ydir = g_af.dir;
|
|
|
+ slide_para.ydis = step_size;
|
|
|
+ slide_para.en_slide = 6;
|
|
|
+
|
|
|
+ /* 等待电机到位 */
|
|
|
+ while (slide_para.en_slide != 0) {
|
|
|
+ rt_thread_delay(100);
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 等待清晰度更新 */
|
|
|
+ g_af.sharpness_updated = false;
|
|
|
+ rt_timer_start(timer_takephoto);
|
|
|
+ wait_count = 0;
|
|
|
+ while (!g_af.sharpness_updated && wait_count < 200) {
|
|
|
+ rt_thread_delay(50);
|
|
|
+ wait_count++;
|
|
|
+ }
|
|
|
+ if (g_af.sharpness_updated) {
|
|
|
+ LOG_I("[景深融合] 收到清晰度:%.2f", g_af.new_sharpness);
|
|
|
+ g_af.sharpness_updated = false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
g_af.current_pos = best_pos;
|
|
|
LOG_I("[景深融合] 完成: 已回到最佳位置=%d", g_af.current_pos);
|
|
|
-
|
|
|
- /* 发送景深融合完成消息 */
|
|
|
- char *c0 = makeJson_Warn("auto_focus","auto_focus");
|
|
|
- DTU_Write("%s",c0);
|
|
|
- rt_free(c0);
|
|
|
+
|
|
|
+ /* ========== 发送景深融合完成消息 ========== */
|
|
|
+ char *focus_done_msg = makeJson_Warn("focus_done","focus_done");
|
|
|
+ DTU_Write("%s", focus_done_msg);
|
|
|
+ rt_free(focus_done_msg);
|
|
|
device_status.autotakepic = 0;
|
|
|
}
|
|
|
|
|
|
@@ -350,14 +459,24 @@ static void depth_of_field_fusion(void)
|
|
|
static void auto_focus_done(void)
|
|
|
{
|
|
|
LOG_I("[对焦] 完成! 最佳位置:%d 清晰度:%.2f", g_af.best_pos, g_af.best_sharpness);
|
|
|
-
|
|
|
+ /* 停止 timer_takephoto,避免景深融合期间产生新的清晰度更新 */
|
|
|
+ rt_timer_stop(timer_takephoto);
|
|
|
+ /* 标记景深融合开始,auto_focus_process 会忽略清晰度处理 */
|
|
|
+ g_af.fusion_active = true;
|
|
|
+ g_af.sharpness_updated = false;
|
|
|
/* 执行景深融合 */
|
|
|
depth_of_field_fusion();
|
|
|
+ g_af.fusion_active = false;
|
|
|
}
|
|
|
|
|
|
/* 处理一次清晰度值,执行对焦算法 */
|
|
|
static void auto_focus_process(void)
|
|
|
{
|
|
|
+ /* 景深融合期间不处理对焦 */
|
|
|
+ if (g_af.fusion_active) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
float current_sharpness = g_af.new_sharpness;
|
|
|
g_af.sharpness_updated = false;
|
|
|
g_af.max_iterations--;
|