diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-24 22:40:46 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-24 22:40:46 +0200 |
| commit | 22aaae197b443cc7248588ebdf6aeffe078e0a43 (patch) | |
| tree | ec03313971cc2a646819bc00e0fd63a38b797e2e /src/modules/commander | |
| parent | db474072a7ada907d62ac994d961ac10d90d92a6 (diff) | |
| parent | 63c50676f9757f18dfca9ec3735ce59a045cea33 (diff) | |
| download | px4-firmware-22aaae197b443cc7248588ebdf6aeffe078e0a43.tar.gz px4-firmware-22aaae197b443cc7248588ebdf6aeffe078e0a43.tar.bz2 px4-firmware-22aaae197b443cc7248588ebdf6aeffe078e0a43.zip | |
Merge branch 'rc_timeout' into mpc_rc
Diffstat (limited to 'src/modules/commander')
| -rw-r--r-- | src/modules/commander/commander.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 47756dae0..1827f252c 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1277,12 +1277,12 @@ int commander_thread_main(int argc, char *argv[]) } else { /* MISSION switch */ - if (sp_man.mission_switch == SWITCH_POS_ON) { + if (sp_man.loiter_switch == SWITCH_POS_ON) { /* stick is in LOITER position */ status.set_nav_state = NAV_STATE_LOITER; status.set_nav_state_timestamp = hrt_absolute_time(); - } else if (sp_man.mission_switch != SWITCH_POS_NONE) { + } else if (sp_man.loiter_switch != SWITCH_POS_NONE) { /* stick is in MISSION position */ status.set_nav_state = NAV_STATE_MISSION; status.set_nav_state_timestamp = hrt_absolute_time(); |