diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-27 00:29:00 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-27 00:29:00 +0200 |
| commit | 1bae18377a444279f91b75281ffde5da70cc6086 (patch) | |
| tree | 797b1318b9500883f08a9f2905a9318a4a4489d3 /src/modules/navigator | |
| parent | 9ae44291b169a90945f090487e3757db9fc8c075 (diff) | |
| download | px4-firmware-1bae18377a444279f91b75281ffde5da70cc6086.tar.gz px4-firmware-1bae18377a444279f91b75281ffde5da70cc6086.tar.bz2 px4-firmware-1bae18377a444279f91b75281ffde5da70cc6086.zip | |
navigator: is_mission_item_reached() for LOITER items fixed
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/mission_block.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/modules/navigator/mission_block.cpp b/src/modules/navigator/mission_block.cpp index 5e545706d..8ef7be449 100644 --- a/src/modules/navigator/mission_block.cpp +++ b/src/modules/navigator/mission_block.cpp @@ -74,15 +74,10 @@ MissionBlock::is_mission_item_reached() } /* TODO: count turns */ -#if 0 - if ((_mission_item.nav_cmd == NAV_CMD_LOITER_TURN_COUNT || - _mission_item.nav_cmd == NAV_CMD_LOITER_TIME_LIMIT || - _mission_item.nav_cmd == NAV_CMD_LOITER_UNLIMITED) && - _mission_item.loiter_radius > 0.01f) { - + if ((/*_mission_item.nav_cmd == NAV_CMD_LOITER_TURN_COUNT ||*/ + _mission_item.nav_cmd == NAV_CMD_LOITER_UNLIMITED)) { return false; } -#endif hrt_abstime now = hrt_absolute_time(); |