diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-02-01 11:25:29 +0100 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-02-01 11:25:29 +0100 |
| commit | 2923bdf39fd6e424523f0b6b47bef3cabcdc0645 (patch) | |
| tree | 84098e111618f1f10c3ab4ddae97623fd0a4e903 /src | |
| parent | 3651552b53caaa103703b3117ba1a496617b1300 (diff) | |
| download | px4-firmware-2923bdf39fd6e424523f0b6b47bef3cabcdc0645.tar.gz px4-firmware-2923bdf39fd6e424523f0b6b47bef3cabcdc0645.tar.bz2 px4-firmware-2923bdf39fd6e424523f0b6b47bef3cabcdc0645.zip | |
commander: allow disarming in ACRO without landing (as in MANUAL)
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 89294fc76..30f75b9fb 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1120,7 +1120,7 @@ int commander_thread_main(int argc, char *argv[]) * do it only for rotary wings */ if (status.is_rotary_wing && (status.arming_state == ARMING_STATE_ARMED || status.arming_state == ARMING_STATE_ARMED_ERROR) && - (status.main_state == MAIN_STATE_MANUAL || status.condition_landed) && + (status.main_state == MAIN_STATE_MANUAL || status.main_state == MAIN_STATE_ACRO || status.condition_landed) && sp_man.yaw < -STICK_ON_OFF_LIMIT && sp_man.throttle < STICK_THRUST_RANGE * 0.1f) { if (stick_off_counter > STICK_ON_OFF_COUNTER_LIMIT) { |