navigator land abort use reposition (#7574)

This commit is contained in:
Daniel Agar
2017-08-01 18:59:12 -04:00
committed by GitHub
parent 6bd4e84636
commit 9fb5c4f0e9
7 changed files with 51 additions and 43 deletions
+4 -2
View File
@@ -509,12 +509,12 @@ MissionBlock::item_contains_position(const struct mission_item_s *item)
item->nav_cmd == NAV_CMD_VTOL_LAND;
}
void
bool
MissionBlock::mission_item_to_position_setpoint(const struct mission_item_s *item, struct position_setpoint_s *sp)
{
/* don't change the setpoint for non-position items */
if (!item_contains_position(item)) {
return;
return false;
}
sp->lat = item->lat;
@@ -600,6 +600,8 @@ MissionBlock::mission_item_to_position_setpoint(const struct mission_item_s *ite
}
sp->valid = true;
return sp->valid;
}
void