Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 19:07:45 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fw-att: fix wheel controller

Browse Source
This commit is contained in:
bresch
2025-01-03 12:26:39 +01:00
committed by Mathieu Bresciani
parent 326d486397
commit 9bf5257e0e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/fw_att_control/FixedwingAttitudeControl.cpp
+4 -4
View File
@@ -214,9 +214,6 @@ void FixedwingAttitudeControl::Run()
_last_run = time_now_us; _last_run = time_now_us;
} }
vehicle_angular_velocity_s angular_velocity{};
_vehicle_rates_sub.copy(&angular_velocity);
if (_vehicle_status.is_vtol_tailsitter) { if (_vehicle_status.is_vtol_tailsitter) {
/* vehicle is a tailsitter, we need to modify the estimated attitude for fw mode /* vehicle is a tailsitter, we need to modify the estimated attitude for fw mode
* *
@@ -394,10 +391,13 @@ void FixedwingAttitudeControl::Run()
wheel_u = _manual_control_setpoint.yaw; wheel_u = _manual_control_setpoint.yaw;
} else { } else {
vehicle_angular_velocity_s angular_velocity{};
_vehicle_rates_sub.copy(&angular_velocity);
// XXX: yaw_sp_move_rate here is an abuse -- used to ferry manual yaw inputs from // XXX: yaw_sp_move_rate here is an abuse -- used to ferry manual yaw inputs from
// position controller during auto modes _manual_control_setpoint.r gets passed // position controller during auto modes _manual_control_setpoint.r gets passed
// whenever nudging is enabled, otherwise zero // whenever nudging is enabled, otherwise zero
const float wheel_controller_output = _wheel_ctrl.control_bodyrate(dt, euler_angles.psi(), _groundspeed, const float wheel_controller_output = _wheel_ctrl.control_bodyrate(dt, angular_velocity.xyz[2], _groundspeed,
groundspeed_scale); groundspeed_scale);
wheel_u = wheel_control ? wheel_controller_output + _att_sp.yaw_sp_move_rate : 0.f; wheel_u = wheel_control ? wheel_controller_output + _att_sp.yaw_sp_move_rate : 0.f;
} }