diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-21 09:46:14 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-21 09:46:14 +0200 |
| commit | 8f65d52acad104629285d10428c3d52f468dacb5 (patch) | |
| tree | 7e3464536cc2ee9c75d3c8348548acd26fef7aae /src | |
| parent | 4dcdaa7234e2c69c6bdb268c035f1b6ccd9a5dd8 (diff) | |
| parent | 3e1de713af500bfa97e5e27f588d76b2ddaafc01 (diff) | |
| download | px4-firmware-8f65d52acad104629285d10428c3d52f468dacb5.tar.gz px4-firmware-8f65d52acad104629285d10428c3d52f468dacb5.tar.bz2 px4-firmware-8f65d52acad104629285d10428c3d52f468dacb5.zip | |
Merge pull request #1299 from PX4/navigatorstatefix
navigator: correct mode for land and termination
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 331a9a728..042c46afd 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -353,6 +353,8 @@ Navigator::task_main() case NAVIGATION_STATE_ACRO: case NAVIGATION_STATE_ALTCTL: case NAVIGATION_STATE_POSCTL: + case NAVIGATION_STATE_LAND: + case NAVIGATION_STATE_TERMINATION: _navigation_mode = nullptr; _can_loiter_at_sp = false; break; @@ -368,8 +370,6 @@ Navigator::task_main() case NAVIGATION_STATE_AUTO_RTGS: _navigation_mode = &_rtl; /* TODO: change this to something else */ break; - case NAVIGATION_STATE_LAND: - case NAVIGATION_STATE_TERMINATION: case NAVIGATION_STATE_OFFBOARD: _navigation_mode = &_offboard; break; |