use control flag to decide if we enable wv or not

This commit is contained in:
Andreas Antener
2016-02-14 15:36:37 +01:00
committed by Roman
parent 8c2eec6161
commit 7db35337da
@@ -1264,7 +1264,7 @@ MulticopterPositionControl::task_main()
}
/* weather-vane mode for vtol: disable yaw control */
if(_mode_auto && _pos_sp_triplet.current.disable_mc_yaw_control == true) {
if(!_control_mode.flag_control_manual_enabled && _pos_sp_triplet.current.disable_mc_yaw_control == true) {
_att_sp.disable_mc_yaw_control = true;
} else {
/* reset in case of setpoint updates */