diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 14:59:52 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 15:05:33 +0100 |
| commit | 32675ff1c150529bbb662fde87c0940ee90acd6e (patch) | |
| tree | 1d5773dfc50a885b5f05a3a73499b3f45f47db92 /src/modules/commander | |
| parent | e18065081af0dbbbf50aaba30cc0b14621c7b29b (diff) | |
| download | px4-firmware-32675ff1c150529bbb662fde87c0940ee90acd6e.tar.gz px4-firmware-32675ff1c150529bbb662fde87c0940ee90acd6e.tar.bz2 px4-firmware-32675ff1c150529bbb662fde87c0940ee90acd6e.zip | |
fix flag_external_manual_override_ok
The flag should not depend on the vtol state anymore. The intended
functionality of this is by now handled via the is_rotary_wing flag
Diffstat (limited to 'src/modules/commander')
| -rw-r--r-- | src/modules/commander/commander.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 8d2e62e32..5779183ab 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1096,7 +1096,6 @@ int commander_thread_main(int argc, char *argv[]) status.is_vtol = (status.system_type == VEHICLE_TYPE_VTOL_DUOROTOR) || (status.system_type == VEHICLE_TYPE_VTOL_QUADROTOR); - /* check and update system / component ID */ param_get(_param_system_id, &(status.system_id)); param_get(_param_component_id, &(status.component_id)); @@ -2226,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 && !status.is_vtol; + control_mode.flag_external_manual_override_ok = !status.is_rotary_wing; control_mode.flag_system_hil_enabled = status.hil_state == HIL_STATE_ON; control_mode.flag_control_offboard_enabled = false; |