diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-09-28 13:41:21 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-09-28 13:41:21 +0400 |
| commit | 1cc5f3778dd6c18f3a14c64959d28f978b0305ef (patch) | |
| tree | f2b8138e6f85b5f760fa22bbe3aecbce61539277 /src/modules/navigator/navigator_main.cpp | |
| parent | cf4604f5c3614bc5cd1b82dfee693cbac36181ab (diff) | |
| parent | 8a18cfa3869555389e7e9ff8f104d83f9c54cb43 (diff) | |
| download | px4-firmware-1cc5f3778dd6c18f3a14c64959d28f978b0305ef.tar.gz px4-firmware-1cc5f3778dd6c18f3a14c64959d28f978b0305ef.tar.bz2 px4-firmware-1cc5f3778dd6c18f3a14c64959d28f978b0305ef.zip | |
Merge branch 'master' into takeoff_fix
Diffstat (limited to 'src/modules/navigator/navigator_main.cpp')
| -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; |