diff --git a/MDK-ARM/ELE_CHASSIS/AUTO_CHASSIS.axf b/MDK-ARM/ELE_CHASSIS/AUTO_CHASSIS.axf index 669a09d..1624ed6 100644 Binary files a/MDK-ARM/ELE_CHASSIS/AUTO_CHASSIS.axf and b/MDK-ARM/ELE_CHASSIS/AUTO_CHASSIS.axf differ diff --git a/User/Module/up.c b/User/Module/up.c index 9c35bbd..174531b 100644 --- a/User/Module/up.c +++ b/User/Module/up.c @@ -201,7 +201,7 @@ int8_t ALL_Motor_Control(UP_t *u,CAN_Output_t *out) - GO_SendData(u,0 ,u->motor_target .go_shoot ); + GO_SendData(u,0 ,u->motor_target .go_shoot ); GO_SendData(u,1 ,u->motor_target .go_spin); @@ -273,10 +273,10 @@ int8_t UP_control(UP_t *u,CAN_Output_t *out,CMD_t *c) if(u->state .last_state == Not_started_Pit) { - u->motor_target .go_shoot =-300; + u->motor_target .go_shoot =-2050; u->motor_target .M2006_angle =-140; - if(u->motorfeedback .GO_motor_info[0]->Pos < (-4.8)) //到达位置后再扣扳机 + if(u->motorfeedback .GO_motor_info[0]->Pos < (-35.20)) //到达位置后再扣扳机 { u->motor_target .M2006_angle =0; if(u->motorfeedback .M2006.total_angle>-5) diff --git a/User/task/up_task.c b/User/task/up_task.c index 1fe2e44..7064042 100644 --- a/User/task/up_task.c +++ b/User/task/up_task.c @@ -69,6 +69,8 @@ void Task_up(void *argument) // GO_SendData(&UP, 1,CCC); // GO_SendData(&UP, 0,aaa); UP_control(&UP,&UP_CAN_out,&up_cmd); +// UP.motor_target .go_shoot =aaa; +// UP.motor_target .M2006_angle =bbb ; ALL_Motor_Control(&UP,&UP_CAN_out); osDelay(1);