3.30更改的暂存区丢失,这个修改了部分,处于可用状态,但不完善
This commit is contained in:
parent
5de502c448
commit
1488098d60
Binary file not shown.
@ -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)
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user