diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-16 17:34:21 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-16 17:34:21 +0200 |
| commit | e0ed0625f81841194b4bd9b26c7e047a1f68a1fc (patch) | |
| tree | 3c67d0fb275441ba3f8856f81e4803664b2cbac3 /src/modules/navigator | |
| parent | 91f0b9eee41a8446c0a5ec455fbe3853c5c3eee3 (diff) | |
| download | px4-firmware-e0ed0625f81841194b4bd9b26c7e047a1f68a1fc.tar.gz px4-firmware-e0ed0625f81841194b4bd9b26c7e047a1f68a1fc.tar.bz2 px4-firmware-e0ed0625f81841194b4bd9b26c7e047a1f68a1fc.zip | |
commander: failsafe_state removed, replaced with bool failsafe, navigation state and failsafe determined directly from main state and conditions
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index a3c190c7f..70da5393f 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -336,7 +336,7 @@ Navigator::task_main() } /* Do stuff according to navigation state set by commander */ - switch (_vstatus.set_nav_state) { + switch (_vstatus.nav_state) { case NAVIGATION_STATE_MANUAL: case NAVIGATION_STATE_ACRO: case NAVIGATION_STATE_ALTCTL: @@ -351,8 +351,6 @@ Navigator::task_main() _navigation_mode = &_loiter; break; case NAVIGATION_STATE_AUTO_RTL: - case NAVIGATION_STATE_AUTO_FAILSAFE_RC_LOSS: - case NAVIGATION_STATE_AUTO_FAILSAFE_DL_LOSS: _navigation_mode = &_rtl; break; case NAVIGATION_STATE_LAND: |