diff --git a/MDK-ARM/AUTO_CHASSIS.uvoptx b/MDK-ARM/AUTO_CHASSIS.uvoptx index 7f33d80..969da2f 100644 --- a/MDK-ARM/AUTO_CHASSIS.uvoptx +++ b/MDK-ARM/AUTO_CHASSIS.uvoptx @@ -103,7 +103,7 @@ 1 0 0 - 3 + 6 @@ -114,7 +114,7 @@ - BIN\CMSIS_AGDI.dll + STLink\ST-LINKIII-KEIL_SWO.dll @@ -145,7 +145,7 @@ 0 DLGUARM - + (105=-1,-1,-1,-1,0) 0 diff --git a/MDK-ARM/ELE_CHASSIS/AUTO_CHASSIS.axf b/MDK-ARM/ELE_CHASSIS/AUTO_CHASSIS.axf index dd93e1a..dc51a86 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/config.c b/User/Module/config.c index 32fc173..e68cdfe 100644 --- a/User/Module/config.c +++ b/User/Module/config.c @@ -94,7 +94,7 @@ static const ConfigParam_t param_chassis ={ .PitchConfig_Config = { .m2006_init_angle =-150, .m2006_trigger_angle =0, - .go1_init_position = -300, + .go1_init_position = -500, .go1_release_threshold =-1900, }, diff --git a/User/device/cmd.c b/User/device/cmd.c index 961968d..d74300e 100644 --- a/User/device/cmd.c +++ b/User/device/cmd.c @@ -78,8 +78,8 @@ int8_t CMD_ParseRC(CMD_t *cmd,const CMD_RC_t *rc) { else if(rc->sw_l==CMD_SW_DOWN) { cmd ->CMD_CtrlType =UP_RCcontrol; - if(rc->sw_r ==CMD_SW_UP) cmd ->CMD_UP_mode =Dribbl_transfer; //左下,右上,投篮 - if(rc->sw_r ==CMD_SW_MID) cmd ->CMD_UP_mode =Dribble; //左下,右中,无模式 + if(rc->sw_r ==CMD_SW_UP) cmd ->CMD_UP_mode =Normal; //左下,右上,投篮 + if(rc->sw_r ==CMD_SW_MID) cmd ->CMD_UP_mode =Normal; //左下,右中,无模式 if(rc->sw_r ==CMD_SW_DOWN) cmd ->CMD_UP_mode =Normal; //左下,右上,无模式 }