修复V1.4bug
This commit is contained in:
1 parent
730c90d315
commit
3199bd2b4c
1 file changed
+8
-15
@@ -1295,18 +1295,10 @@ void processControllerData(const XboxControllerNotificationParser& remoteData) {
|
||||
last_btnB = remoteData.btnB;
|
||||
|
||||
// 向前跳跃(非踢球模式)
|
||||
if (remoteData.btnY && !last_btnY && robot_enabled && !trace_mode) {
|
||||
if (remoteData.btnY && !last_btnY && robot_enabled ) {
|
||||
wrobot.jump = 1;
|
||||
forward_jump_flag = 1;
|
||||
}
|
||||
// 追逐并转向踢会球模式 @@@@@@
|
||||
if (remoteData.btnY && !last_btnY && robot_enabled && trace_mode) {
|
||||
if(kick_mode != "kick_run_mode"){
|
||||
SetKickMode("kick_run_mode");
|
||||
}else if(kick_mode == "kick_run_mode"){
|
||||
SetKickMode("kick_place_mode");
|
||||
}
|
||||
}
|
||||
last_btnY = remoteData.btnY;
|
||||
|
||||
// 向后跳跃(非踢球模式)
|
||||
@@ -1347,11 +1339,12 @@ void processControllerData(const XboxControllerNotificationParser& remoteData) {
|
||||
|
||||
// 原地踢球模式
|
||||
if (remoteData.btnSelect && !last_btnSelect && !remoteData.btnShare) {
|
||||
trace_mode = !trace_mode;
|
||||
if(trace_mode){
|
||||
SetKickMode("kick_place_mode"); // 原地踢球模式
|
||||
if(!trace_mode){
|
||||
SetKickMode("kick_place_mode"); // 守门模式
|
||||
Serial.println("守门模式XBOX");
|
||||
}else {
|
||||
cancel_kick_mode();
|
||||
Serial.println("cancel_kick_mode");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1824,8 +1817,8 @@ void cancel_kick_mode(){
|
||||
trace_mode = false;
|
||||
trace_ob_flag = false;
|
||||
chased_flag = false;
|
||||
kick_mode = "";
|
||||
|
||||
SetKickMode("");
|
||||
dx_to_joyx = 9999;
|
||||
dy_to_joyy = 9999;
|
||||
yaw_to_joyx = 9999;
|
||||
@@ -1847,10 +1840,10 @@ void SetKickMode(String mode){
|
||||
yaw_to_joyx = 9999;
|
||||
|
||||
// 进入kick_run_mode时,记录当前偏航角作为基准0度
|
||||
if(mode == "kick_run_mode"){
|
||||
// if(mode == "kick_run_mode"){
|
||||
kick_yaw_zero = mpu6050.getAngleZ(); // 读取当前偏航角(Z轴角度)作为基准
|
||||
pid_yaw_align.error_prev = 0.0f; // 重置偏航对齐PID状态
|
||||
}
|
||||
// }
|
||||
}
|
||||
|
||||
void setRobotMode(int mode_id){
|
||||
|
||||
Reference in new issue
Block a user