diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-23 21:50:16 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-23 21:50:16 +0100 |
| commit | d8eefa30538331fde7e5ce79fef4e04dc62664bc (patch) | |
| tree | 77ce8c41b6819a3a8513732c0ea3f6749f3ebb1a /src | |
| parent | 46dd95ab349987fcb6f788e88d61dce56c17e21f (diff) | |
| download | px4-firmware-d8eefa30538331fde7e5ce79fef4e04dc62664bc.tar.gz px4-firmware-d8eefa30538331fde7e5ce79fef4e04dc62664bc.tar.bz2 px4-firmware-d8eefa30538331fde7e5ce79fef4e04dc62664bc.zip | |
VTOL: Do not allow manual override
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/commander/commander.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 5779183ab..de3e69373 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -2225,7 +2225,7 @@ set_control_mode() { /* set vehicle_control_mode according to set_navigation_state */ control_mode.flag_armed = armed.armed; - control_mode.flag_external_manual_override_ok = !status.is_rotary_wing; + control_mode.flag_external_manual_override_ok = (!status.is_rotary_wing && !status.is_vtol); control_mode.flag_system_hil_enabled = status.hil_state == HIL_STATE_ON; control_mode.flag_control_offboard_enabled = false; |