Browse Source

MC: Only use auto yaw limits if manual control is off

sbg
Lorenz Meier 9 years ago
parent
commit
c78fd7014d
  1. 2
      src/modules/mc_att_control/mc_att_control_main.cpp

2
src/modules/mc_att_control/mc_att_control_main.cpp

@ -717,7 +717,7 @@ MulticopterAttitudeControl::control_attitude(float dt) @@ -717,7 +717,7 @@ MulticopterAttitudeControl::control_attitude(float dt)
/* limit rates */
for (int i = 0; i < 3; i++) {
if (_v_control_mode.flag_control_velocity_enabled) {
if (_v_control_mode.flag_control_velocity_enabled && !_v_control_mode.flag_control_manual_enabled) {
_rates_sp(i) = math::constrain(_rates_sp(i), -_params.auto_rate_max(i), _params.auto_rate_max(i));
} else {
_rates_sp(i) = math::constrain(_rates_sp(i), -_params.mc_rate_max(i), _params.mc_rate_max(i));

Loading…
Cancel
Save