diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-09-30 15:40:11 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-09-30 15:40:11 +0200 |
| commit | e7313683cdee3e436518fd88cbc403c7251673f7 (patch) | |
| tree | e47fa29f07ef163ca95e38193f29a62d4cccf1a2 /src/modules/navigator | |
| parent | 6da52c5543012a1391c5e5c4384434c1292b919b (diff) | |
| parent | 47f151d4cefa5d7a9da34d6139aa493259f8b2fd (diff) | |
| download | px4-firmware-e7313683cdee3e436518fd88cbc403c7251673f7.tar.gz px4-firmware-e7313683cdee3e436518fd88cbc403c7251673f7.tar.bz2 px4-firmware-e7313683cdee3e436518fd88cbc403c7251673f7.zip | |
Merge remote-tracking branch 'upstream/master' into swissfang
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index b81155efe..4e2511e7a 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -430,9 +430,6 @@ Navigator::task_main() _can_loiter_at_sp = false; break; case NAVIGATION_STATE_AUTO_MISSION: - /* Some failsafe modes prohibit the fallback to mission - * usually this is done after some time to make sure - * that the full failsafe operation is performed */ _navigation_mode = &_mission; break; case NAVIGATION_STATE_AUTO_LOITER: @@ -448,7 +445,7 @@ Navigator::task_main() case NAVIGATION_STATE_AUTO_RTL: _navigation_mode = &_rtl; break; - case NAVIGATION_STATE_AUTO_RTGS: //XXX OBC: differentiate between rc loss and dl loss here + case NAVIGATION_STATE_AUTO_RTGS: /* Use complex data link loss mode only when enabled via param * otherwise use rtl */ if (_param_datalinkloss_obc.get() != 0) { |