|
|
@@ -1123,6 +1123,7 @@ void slide_thread_entry(void *parameter)
|
|
|
case 1:{
|
|
|
ctr_move(X_,slide_para.xdir,slide_para.xdis,slide_para.pulse_period);
|
|
|
LOG_I("The slide's x movement was done ok");
|
|
|
+#if FOCUS_STEP_EN == 1
|
|
|
if(slide_para.xdis==55||slide_para.xdis==80)
|
|
|
{
|
|
|
DTU_Write("{\"cmd\": \"takephoto\" }");
|
|
|
@@ -1133,6 +1134,13 @@ void slide_thread_entry(void *parameter)
|
|
|
DTU_Write("%s",photo);
|
|
|
rt_free(photo);
|
|
|
}
|
|
|
+#else
|
|
|
+ if(slide_para.xdis==55||slide_para.xdis==80){
|
|
|
+ char *photo = makeJson_Warn("mov_init_y","takephoto_done");
|
|
|
+ DTU_Write("%s",photo);
|
|
|
+ rt_free(photo);
|
|
|
+ }
|
|
|
+#endif
|
|
|
slide_para.stop_flag = 0;
|
|
|
slide_para.en_slide = OFF;
|
|
|
break;
|
|
|
@@ -1140,7 +1148,8 @@ void slide_thread_entry(void *parameter)
|
|
|
|
|
|
case 2:{
|
|
|
ctr_move(Z_,slide_para.zdir,slide_para.zdis,slide_para.pulse_period);
|
|
|
- rt_kprintf("The slide's z movement was done ok\n");
|
|
|
+ LOG_I("The slide's z movement was done ok\n");
|
|
|
+#if FOCUS_STEP_EN == 1
|
|
|
if(slide_para.zdis==55||slide_para.zdis==80)
|
|
|
{
|
|
|
DTU_Write("{\"cmd\": \"takephoto\" }");
|
|
|
@@ -1151,6 +1160,14 @@ void slide_thread_entry(void *parameter)
|
|
|
DTU_Write("%s",photo);
|
|
|
rt_free(photo);
|
|
|
}
|
|
|
+#else
|
|
|
+ if(slide_para.zdis==55||slide_para.zdis==80)
|
|
|
+ {
|
|
|
+ char *photo = makeJson_Warn("mov_init_y","takephoto_done");
|
|
|
+ DTU_Write("%s",photo);
|
|
|
+ rt_free(photo);
|
|
|
+ }
|
|
|
+#endif
|
|
|
slide_para.zdir = 1;
|
|
|
slide_para.zdis = 0;
|
|
|
slide_para.stop_flag = 0;
|
|
|
@@ -1194,6 +1211,7 @@ void slide_thread_entry(void *parameter)
|
|
|
slide_para.ydis);
|
|
|
rt_thread_delay(rt_tick_from_millisecond(settle));
|
|
|
}
|
|
|
+#if FOCUS_STEP_EN == 1
|
|
|
if(1){
|
|
|
/* 发送movy后等待相机回传focus, 5S超时未收到则重发, 最多重传3次, 避免对焦卡死 */
|
|
|
int focus_ok = 0;
|
|
|
@@ -1226,6 +1244,7 @@ void slide_thread_entry(void *parameter)
|
|
|
LOG_W("movy 连续4次未收到focus回传, 放弃重传");
|
|
|
}
|
|
|
}
|
|
|
+#endif
|
|
|
slide_para.ydis = 0;
|
|
|
slide_para.stop_flag = 0;
|
|
|
slide_para.en_slide = OFF;
|
|
|
@@ -1243,6 +1262,25 @@ void slide_thread_entry(void *parameter)
|
|
|
slide_para.en_slide = OFF;
|
|
|
break;
|
|
|
}
|
|
|
+ case 8:{ //录制:Y轴缓慢向下移动3S,完成后发送record_stop,再返回出发位置
|
|
|
+ LOG_W("录制:Y轴缓慢向下移动3S!");
|
|
|
+ uint32_t record_pulse = 5000000UL; /* 缓慢:低速PWM */
|
|
|
+ uint32_t record_dis = 5000; /* 行程约3秒 */
|
|
|
+ ctr_move(Y_, 1, record_dis, record_pulse); /* 缓慢向下移动 */
|
|
|
+ /* 执行完成, 通知远端停止录制 */
|
|
|
+ char *c0 = makeJsonRpc2_0("record_stop", NULL, 0);
|
|
|
+ if(c0 != NULL)
|
|
|
+ {
|
|
|
+ DTU_Write("%s", c0);
|
|
|
+ rt_free(c0);
|
|
|
+ }
|
|
|
+ rt_thread_delay(200);
|
|
|
+ /* Y轴返回出发位置(方向0为初始/限位方向) */
|
|
|
+ ctr_move(Y_, 0, record_dis, record_pulse);
|
|
|
+ slide_para.stop_flag = 0;
|
|
|
+ slide_para.en_slide = OFF;
|
|
|
+ break;
|
|
|
+ }
|
|
|
default:
|
|
|
{
|
|
|
slide_para.en_slide = OFF;
|