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

This commit is contained in:
Thomas Gubler 2013-11-26 15:25:22 +01:00
commit d294953be7
1 changed files with 6 additions and 1 deletions

View File

@ -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;