|
@@ -322,7 +322,7 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
|
|
|
break;
|
|
break;
|
|
|
case Y_:
|
|
case Y_:
|
|
|
ctr_Collect_Fan(ON); //Y轴电源开关:开
|
|
ctr_Collect_Fan(ON); //Y轴电源开关:开
|
|
|
- rt_thread_delay(100);
|
|
|
|
|
|
|
+ //rt_thread_delay(100);
|
|
|
//判断限位
|
|
//判断限位
|
|
|
if(dir_== 0 && rt_pin_read(Limit_Motor_Y)==1){
|
|
if(dir_== 0 && rt_pin_read(Limit_Motor_Y)==1){
|
|
|
for(int z =0;z < 3; z++){
|
|
for(int z =0;z < 3; z++){
|
|
@@ -1135,7 +1135,12 @@ void slide_thread_entry(void *parameter)
|
|
|
rt_free(photo);
|
|
rt_free(photo);
|
|
|
}
|
|
}
|
|
|
#else
|
|
#else
|
|
|
- if(slide_para.xdis==55||slide_para.xdis==80){
|
|
|
|
|
|
|
+ if(slide_para.xdis==55||slide_para.xdis==80)
|
|
|
|
|
+ {
|
|
|
|
|
+ ctr_swz(OFF); //Z轴开关:关
|
|
|
|
|
+ ctr_lamp(OFF,1); //X轴开关:关
|
|
|
|
|
+ ctr_Collect_Fan(ON); //Y轴电源开关:开
|
|
|
|
|
+ rt_thread_delay(200);
|
|
|
char *photo = makeJson_Warn("mov_init_y","takephoto_done");
|
|
char *photo = makeJson_Warn("mov_init_y","takephoto_done");
|
|
|
DTU_Write("%s",photo);
|
|
DTU_Write("%s",photo);
|
|
|
rt_free(photo);
|
|
rt_free(photo);
|
|
@@ -1163,6 +1168,10 @@ void slide_thread_entry(void *parameter)
|
|
|
#else
|
|
#else
|
|
|
if(slide_para.zdis==55||slide_para.zdis==80)
|
|
if(slide_para.zdis==55||slide_para.zdis==80)
|
|
|
{
|
|
{
|
|
|
|
|
+ ctr_swz(OFF); //Z轴开关:关
|
|
|
|
|
+ ctr_lamp(OFF,1); //X轴开关:关
|
|
|
|
|
+ ctr_Collect_Fan(ON); //Y轴电源开关:开
|
|
|
|
|
+ rt_thread_delay(200);
|
|
|
char *photo = makeJson_Warn("mov_init_y","takephoto_done");
|
|
char *photo = makeJson_Warn("mov_init_y","takephoto_done");
|
|
|
DTU_Write("%s",photo);
|
|
DTU_Write("%s",photo);
|
|
|
rt_free(photo);
|
|
rt_free(photo);
|
|
@@ -1195,7 +1204,6 @@ void slide_thread_entry(void *parameter)
|
|
|
slide_para.zdis = 5000;
|
|
slide_para.zdis = 5000;
|
|
|
ctr_move(Z_,slide_para.zdir,slide_para.zdis,slide_para.pulse_period);
|
|
ctr_move(Z_,slide_para.zdir,slide_para.zdis,slide_para.pulse_period);
|
|
|
LOG_I("The slide's Z movement was done ok");
|
|
LOG_I("The slide's Z movement was done ok");
|
|
|
-
|
|
|
|
|
slide_para.zdis = 0;
|
|
slide_para.zdis = 0;
|
|
|
slide_para.stop_flag = 0;
|
|
slide_para.stop_flag = 0;
|
|
|
slide_para.en_slide = OFF;
|
|
slide_para.en_slide = OFF;
|
|
@@ -1265,7 +1273,7 @@ void slide_thread_entry(void *parameter)
|
|
|
case 8:{ //录制:Y轴缓慢向下移动3S,完成后发送record_stop,再返回出发位置
|
|
case 8:{ //录制:Y轴缓慢向下移动3S,完成后发送record_stop,再返回出发位置
|
|
|
LOG_W("录制:Y轴缓慢向下移动3S!");
|
|
LOG_W("录制:Y轴缓慢向下移动3S!");
|
|
|
uint32_t record_pulse = 5000000UL; /* 缓慢:低速PWM */
|
|
uint32_t record_pulse = 5000000UL; /* 缓慢:低速PWM */
|
|
|
- uint32_t record_dis = 5000; /* 行程约3秒 */
|
|
|
|
|
|
|
+ uint32_t record_dis = 8000; /* 行程约8秒 */
|
|
|
ctr_move(Y_, 1, record_dis, record_pulse); /* 缓慢向下移动 */
|
|
ctr_move(Y_, 1, record_dis, record_pulse); /* 缓慢向下移动 */
|
|
|
/* 执行完成, 通知远端停止录制 */
|
|
/* 执行完成, 通知远端停止录制 */
|
|
|
char *c0 = makeJsonRpc2_0("record_stop", NULL, 0);
|
|
char *c0 = makeJsonRpc2_0("record_stop", NULL, 0);
|
|
@@ -1274,7 +1282,7 @@ void slide_thread_entry(void *parameter)
|
|
|
DTU_Write("%s", c0);
|
|
DTU_Write("%s", c0);
|
|
|
rt_free(c0);
|
|
rt_free(c0);
|
|
|
}
|
|
}
|
|
|
- rt_thread_delay(200);
|
|
|
|
|
|
|
+ rt_thread_delay(1000);
|
|
|
/* Y轴返回出发位置(方向0为初始/限位方向) */
|
|
/* Y轴返回出发位置(方向0为初始/限位方向) */
|
|
|
ctr_move(Y_, 0, record_dis, record_pulse);
|
|
ctr_move(Y_, 0, record_dis, record_pulse);
|
|
|
slide_para.stop_flag = 0;
|
|
slide_para.stop_flag = 0;
|