diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-21 20:04:21 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-21 20:04:21 +0200 |
| commit | c402ac28ecb1d59e1511ee90804a96ac47d7793e (patch) | |
| tree | a0264190f1416d9dde39027cf0b64b828f904cf7 /src/modules/navigator/navigator_main.cpp | |
| parent | 0f01905f9a6bb30ff51da365ff5e05aa70a9c937 (diff) | |
| parent | aa8fcceea219c83d40354f2eeec84f738108bc0f (diff) | |
| download | px4-firmware-c402ac28ecb1d59e1511ee90804a96ac47d7793e.tar.gz px4-firmware-c402ac28ecb1d59e1511ee90804a96ac47d7793e.tar.bz2 px4-firmware-c402ac28ecb1d59e1511ee90804a96ac47d7793e.zip | |
Merge remote-tracking branch 'upstream/master' into obcfailsafe
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 d77825715..bc9951bf2 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -396,6 +396,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; @@ -426,8 +428,6 @@ Navigator::task_main() case NAVIGATION_STATE_AUTO_LANDGPSFAIL: _navigation_mode = &_gpsFailure; break; - case NAVIGATION_STATE_LAND: - case NAVIGATION_STATE_TERMINATION: case NAVIGATION_STATE_OFFBOARD: _navigation_mode = &_offboard; break; |