diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-11-26 15:25:22 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-11-26 15:25:22 +0100 |
| commit | d294953be701fc039443fb9ba87febd242c41811 (patch) | |
| tree | 85944ad0af0dd2cb7a9f5e4328d0835307e0f99e /src/modules/navigator | |
| parent | 126b0567feb7384ce30997f01a5e9eb873e018aa (diff) | |
| parent | a989e796638256caf5acba403760673384a24d64 (diff) | |
| download | px4-firmware-d294953be701fc039443fb9ba87febd242c41811.tar.gz px4-firmware-d294953be701fc039443fb9ba87febd242c41811.tar.bz2 px4-firmware-d294953be701fc039443fb9ba87febd242c41811.zip | |
Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 936e0589c..e7a15d68d 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -944,11 +944,16 @@ Navigator::reset_mission_item_reached() void Navigator::check_mission_item_reached() { - // warnx("checking mission item reached"); + /* don't check if mission item is already reached */ if (_mission_item_reached) { return; } + /* don't try to reach the landing mission, just stay in that mode */ + if (_mission_item_triplet.current.nav_cmd == MAV_CMD_NAV_LAND) { + return; + } + uint64_t now = hrt_absolute_time(); float orbit; |