diff --git a/gear_sonic_deploy/src/g1/g1_deploy_onnx_ref/include/input_interface/gamepad_manager.hpp b/gear_sonic_deploy/src/g1/g1_deploy_onnx_ref/include/input_interface/gamepad_manager.hpp index 0cdd965..0d60dd8 100644 --- a/gear_sonic_deploy/src/g1/g1_deploy_onnx_ref/include/input_interface/gamepad_manager.hpp +++ b/gear_sonic_deploy/src/g1/g1_deploy_onnx_ref/include/input_interface/gamepad_manager.hpp @@ -40,11 +40,15 @@ #include #include +#include #include "input_interface.hpp" #include "zmq_endpoint_interface.hpp" #include "gamepad.hpp" #include "../localmotion_kplanner.hpp" // For LocomotionMode enum +/// Runtime-adjustable IMU pitch offset (degrees). Keys 9/0 to adjust via tmux. +inline std::atomic g_imu_pitch_offset_deg{-6.0}; + #if HAS_ROS2 #include "ros2_input_handler.hpp" #endif @@ -120,6 +124,20 @@ class GamepadManager : public InputInterface { is_manager_key = true; std::cout << "[GamepadManager] EMERGENCY STOP triggered (O/o key pressed)" << std::endl; break; + case '9': { + double val = g_imu_pitch_offset_deg.load() - 1.0; + g_imu_pitch_offset_deg.store(val); + std::cout << "[IMU] Pitch offset: " << val << " deg" << std::endl; + is_manager_key = true; + break; + } + case '0': { + double val = g_imu_pitch_offset_deg.load() + 1.0; + g_imu_pitch_offset_deg.store(val); + std::cout << "[IMU] Pitch offset: " << val << " deg" << std::endl; + is_manager_key = true; + break; + } } if (!is_manager_key && current_) { diff --git a/gear_sonic_deploy/src/g1/g1_deploy_onnx_ref/src/g1_deploy_onnx_ref.cpp b/gear_sonic_deploy/src/g1/g1_deploy_onnx_ref/src/g1_deploy_onnx_ref.cpp index ecd2eef..8808748 100644 --- a/gear_sonic_deploy/src/g1/g1_deploy_onnx_ref/src/g1_deploy_onnx_ref.cpp +++ b/gear_sonic_deploy/src/g1/g1_deploy_onnx_ref/src/g1_deploy_onnx_ref.cpp @@ -2653,7 +2653,13 @@ class G1Deploy { } } - std::array base_quat = float_to_double<4>(ls->imu_state().quaternion()); // qw, qx, qy, qz + std::array base_quat_raw = float_to_double<4>(ls->imu_state().quaternion()); // qw, qx, qy, qz + // IMU pitch correction: Y-axis rotation, left-multiply. Default -6°. + // Adjustable at runtime via keys 9/0 in tmux. + double pitch_rad = g_imu_pitch_offset_deg.load() * M_PI / 180.0; + double half = pitch_rad / 2.0; + std::array pitch_quat = {std::cos(half), 0.0, std::sin(half), 0.0}; + std::array base_quat = quat_mul_d(pitch_quat, base_quat_raw); std::array base_ang_vel = float_to_double<3>(ls->imu_state().gyroscope()); std::array base_accel = float_to_double<3>(ls->imu_state().accelerometer());