|
|
@@ -285,58 +285,29 @@ static void auto_focus_move(void)
|
|
|
}
|
|
|
|
|
|
|
|
|
-/* 景深融合:步进20次后再回到最清晰位置
|
|
|
- * 流程:dir=1步进10次 -> 回到最佳位置 -> dir=0步进10次 -> 回到最佳位置
|
|
|
- * 每次步进后等待清晰度更新再继续
|
|
|
+/* 景深融合:往 dir=1 方向 3 个位置,往 dir=0 方向 6 个位置,共 9 个位置
|
|
|
+ * 中心位置在 auto_focus 时已保存,无需重复
|
|
|
+ * 序列:current-6 -> current-5 -> ... -> current-1 -> current+1 -> current+2 -> current+3
|
|
|
+ * 注意:dir=1 为正向(位置增加),dir=0 为反向(位置减少)
|
|
|
*/
|
|
|
static void depth_of_field_fusion(void)
|
|
|
{
|
|
|
int i;
|
|
|
- int best_pos = g_af.best_pos;
|
|
|
- int step_size = g_af.step_size;
|
|
|
+ int center_pos = g_af.current_pos;
|
|
|
+ int step_size = 10;
|
|
|
int wait_count;
|
|
|
+ int target_pos;
|
|
|
+ int move_dist;
|
|
|
+ int positions[9] = {-6, -5, -4, -3, -2, -1, 1, 2, 3};
|
|
|
|
|
|
- LOG_I("[景深融合] 开始: 最佳位置=%d", best_pos);
|
|
|
+ LOG_I("[景深融合] 开始: 当前位置=%d 步长=%d", center_pos, step_size);
|
|
|
|
|
|
- /* ========== 第一阶段:往 dir=1 方向步进 3 次 ========== */
|
|
|
- g_af.dir = 1;
|
|
|
- for (i = 0; i < 3; i++) {
|
|
|
- g_af.current_pos += step_size;
|
|
|
- LOG_I("[景深融合] 正向步进[%d/3]: 位置=%d", i + 1, g_af.current_pos);
|
|
|
+ for (i = 0; i < 9; i++) {
|
|
|
+ target_pos = center_pos + positions[i] * step_size;
|
|
|
+ move_dist = target_pos - 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) {
|
|
|
- int move_dist = best_pos - g_af.current_pos;
|
|
|
- LOG_I("[景深融合] 直接回到最佳位置: 移动距离=%d", move_dist);
|
|
|
+ LOG_I("[景深融合] 位置[%d/9]: %d (移动距离=%d)",
|
|
|
+ i + 1, target_pos, move_dist);
|
|
|
|
|
|
slide_para.pulse_period = mapSpeed(1);
|
|
|
slide_para.ystep = abs(move_dist);
|
|
|
@@ -346,44 +317,11 @@ static void depth_of_field_fusion(void)
|
|
|
|
|
|
/* 等待电机到位 */
|
|
|
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 方向步进 3 次 ========== */
|
|
|
- g_af.dir = 0;
|
|
|
- for (i = 0; i < 3; i++) {
|
|
|
- g_af.current_pos -= step_size;
|
|
|
- LOG_I("[景深融合] 反向步进[%d/3]: 位置=%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(10);
|
|
|
}
|
|
|
+ g_af.current_pos = target_pos;
|
|
|
|
|
|
- /* 等待清晰度更新 */
|
|
|
+ /* 等待清晰度更新(通知 android 端保存画面) */
|
|
|
g_af.sharpness_updated = false;
|
|
|
rt_timer_start(timer_takephoto);
|
|
|
wait_count = 0;
|
|
|
@@ -392,49 +330,16 @@ static void depth_of_field_fusion(void)
|
|
|
wait_count++;
|
|
|
}
|
|
|
if (g_af.sharpness_updated) {
|
|
|
- LOG_I("[景深融合] 收到清晰度:%.2f", g_af.new_sharpness);
|
|
|
+ LOG_I("[景深融合] 收到清晰度:%.2f 位置=%d", g_af.new_sharpness, target_pos);
|
|
|
g_af.sharpness_updated = false;
|
|
|
} else {
|
|
|
- LOG_W("[景深融合] 等待清晰度超时,继续执行");
|
|
|
+ LOG_W("[景深融合] 等待清晰度超时 位置=%d", target_pos);
|
|
|
}
|
|
|
+ rt_thread_delay(1000);
|
|
|
}
|
|
|
|
|
|
- LOG_I("[景深融合] 反向步进完成: 位置=%d", g_af.current_pos);
|
|
|
-
|
|
|
- /* ========== 第二阶段:直接回到最清晰位置 ========== */
|
|
|
- if (g_af.current_pos != best_pos) {
|
|
|
- int move_dist = best_pos - g_af.current_pos;
|
|
|
- LOG_I("[景深融合] 直接回到最佳位置: 移动距离=%d", move_dist);
|
|
|
-
|
|
|
- slide_para.pulse_period = mapSpeed(1);
|
|
|
- slide_para.ystep = abs(move_dist);
|
|
|
- slide_para.ydir = (move_dist > 0) ? 1 : 0;
|
|
|
- slide_para.ydis = abs(move_dist);
|
|
|
- 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;
|
|
|
- }
|
|
|
-
|
|
|
- g_af.current_pos = best_pos;
|
|
|
- LOG_I("[景深融合] 完成: 已回到最佳位置=%d", g_af.current_pos);
|
|
|
-
|
|
|
+ LOG_I("[景深融合] 完成: 已扫描 9 个位置,最终位置=%d", g_af.current_pos);
|
|
|
+ rt_thread_delay(1000);
|
|
|
/* ========== 发送景深融合完成消息 ========== */
|
|
|
char *focus_done_msg = makeJson_Warn("focus_done","focus_done");
|
|
|
DTU_Write("%s", focus_done_msg);
|
|
|
@@ -723,6 +628,7 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
/*对焦拍照,滑台初始化*/
|
|
|
if(device_status.autotakepic==1)
|
|
|
{
|
|
|
+ ctr_led(ON); //冗余
|
|
|
device_status.step_focus = 1;
|
|
|
slide_para.en_slide = 7; //Y轴复位
|
|
|
slide_para.pulse_period = mapSpeed(50);
|
|
|
@@ -1054,10 +960,8 @@ void Check_ParamConfig(void)
|
|
|
break;
|
|
|
}
|
|
|
rt_thread_delay(2000);
|
|
|
- Beep_Tip(100);
|
|
|
}
|
|
|
connect_num = 0;
|
|
|
- rt_thread_delay(2000);
|
|
|
DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
|
|
|
rt_thread_delay(1000);
|
|
|
UpLoad_Data();
|