diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-09 11:40:08 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-09 11:40:08 +0200 |
| commit | 47b2266b9128f013c8d3ece719c1076f9ae53cf1 (patch) | |
| tree | 23e9b31a94794842ca9def8958db6bc0f50c8819 /src/modules | |
| parent | a9c12bb4426bca6c15ba573600350e0049dcb5b9 (diff) | |
| parent | d3f182d433551c72a2fd8105481938129b8332ed (diff) | |
| download | px4-firmware-47b2266b9128f013c8d3ece719c1076f9ae53cf1.tar.gz px4-firmware-47b2266b9128f013c8d3ece719c1076f9ae53cf1.tar.bz2 px4-firmware-47b2266b9128f013c8d3ece719c1076f9ae53cf1.zip | |
Merge branch 'navigator_rewrite' into navigator_rewrite_estimator
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/navigator/mission_block.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/navigator/mission_block.cpp b/src/modules/navigator/mission_block.cpp index 92090d995..861aed813 100644 --- a/src/modules/navigator/mission_block.cpp +++ b/src/modules/navigator/mission_block.cpp @@ -69,6 +69,10 @@ MissionBlock::~MissionBlock() bool MissionBlock::is_mission_item_reached() { + /* don't check landed WPs */ + if (_mission_item.nav_cmd == NAV_CMD_LAND) { + return false; + } /* TODO: count turns */ #if 0 if ((_mission_item.nav_cmd == NAV_CMD_LOITER_TURN_COUNT || |