|
|
@@ -912,7 +912,6 @@ void SunTest(void)
|
|
|
/*上电初始化*/
|
|
|
void ResetInit(void)
|
|
|
{
|
|
|
- ctr_Motor_Driver(0, 0, 0, 0);
|
|
|
//关闭电磁阀
|
|
|
ctr_shake(OFF, 0);
|
|
|
//关闭加热
|
|
|
@@ -1147,37 +1146,47 @@ 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(slide_para.xdis==55)
|
|
|
+ {
|
|
|
+ rt_thread_delay(1000);
|
|
|
+ DTU_Write("{\"cmd\": \"takephoto\" }");
|
|
|
+ }else {
|
|
|
+ rt_thread_delay(1000);
|
|
|
+ char *photo = makeJson_Warn("movx","done");
|
|
|
+ LOG_I("%s",photo);
|
|
|
+ DTU_Write("%s",photo);
|
|
|
+ rt_free(photo);
|
|
|
+ }
|
|
|
slide_para.stop_flag = 0;
|
|
|
slide_para.en_slide = OFF;
|
|
|
- rt_thread_delay(2000);
|
|
|
- char *photo = makeJson_Warn("movx","done");
|
|
|
- LOG_I("%s",photo);
|
|
|
- DTU_Write("%s",photo);
|
|
|
- rt_free(photo);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
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");
|
|
|
-
|
|
|
+ if(slide_para.zdis==55)
|
|
|
+ {
|
|
|
+ rt_thread_delay(1000);
|
|
|
+ DTU_Write("{\"cmd\": \"takephoto\" }");
|
|
|
+ }else {
|
|
|
+ rt_thread_delay(1000);
|
|
|
+ char *photo = makeJson_Warn("movz","done");
|
|
|
+ LOG_I("%s",photo);
|
|
|
+ DTU_Write("%s",photo);
|
|
|
+ rt_free(photo);
|
|
|
+ }
|
|
|
slide_para.zdir = 1;
|
|
|
slide_para.zdis = 0;
|
|
|
slide_para.stop_flag = 0;
|
|
|
slide_para.en_slide = OFF;
|
|
|
- rt_thread_delay(2000);
|
|
|
- char *photo = makeJson_Warn("movz","done");
|
|
|
- LOG_I("%s",photo);
|
|
|
- DTU_Write("%s",photo);
|
|
|
- rt_free(photo);
|
|
|
-
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
case 3:{ //复位X
|
|
|
LOG_W("X轴复位!");
|
|
|
slide_para.xdir = 0;
|
|
|
- slide_para.xdis = 100000;
|
|
|
+ slide_para.xdis = 8000;
|
|
|
ctr_move(X_,slide_para.xdir,slide_para.xdis,slide_para.pulse_period);
|
|
|
LOG_I("The slide's X movement was done ok");
|
|
|
|
|
|
@@ -1191,7 +1200,7 @@ void slide_thread_entry(void *parameter)
|
|
|
//复位Z
|
|
|
LOG_W("Z轴复位!");
|
|
|
slide_para.zdir = 0;
|
|
|
- slide_para.zdis = 100000;
|
|
|
+ slide_para.zdis = 5000;
|
|
|
ctr_move(Z_,slide_para.zdir,slide_para.zdis,slide_para.pulse_period);
|
|
|
LOG_I("The slide's Z movement was done ok");
|
|
|
|
|
|
@@ -1219,7 +1228,7 @@ void slide_thread_entry(void *parameter)
|
|
|
case 7:{ //Y轴复位
|
|
|
LOG_W("Y轴复位!");
|
|
|
slide_para.ydir = 0;
|
|
|
- slide_para.ydis = 100000;
|
|
|
+ slide_para.ydis = 8000;
|
|
|
ctr_move(Y_,slide_para.ydir,slide_para.ydis,slide_para.pulse_period);
|
|
|
LOG_I("The slide's Y movement was done ok");
|
|
|
|