fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-31 22:11:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator

Browse Source
This commit is contained in:
Thomas Gubler
2013-11-26 15:25:22 +01:00
parent 126b0567fe a989e79663
commit d294953be7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/navigator_main.cpp
+6 -1
View File
@@ -944,11 +944,16 @@ Navigator::reset_mission_item_reached()
void void
Navigator::check_mission_item_reached() Navigator::check_mission_item_reached()
{ {
// warnx("checking mission item reached"); /* don't check if mission item is already reached */
if (_mission_item_reached) { if (_mission_item_reached) {
return; 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(); uint64_t now = hrt_absolute_time();
float orbit; float orbit;