diff --git a/src/modules/navigator/land.cpp b/src/modules/navigator/land.cpp index ee2c7115f8..0c5fb3a50c 100644 --- a/src/modules/navigator/land.cpp +++ b/src/modules/navigator/land.cpp @@ -50,7 +50,7 @@ void Land::on_activation() { /* set current mission item to Land */ - set_land_item(&_mission_item, true); + set_land_item(&_mission_item); _navigator->get_mission_result()->finished = false; _navigator->set_mission_result_updated(); reset_mission_item_reached(); diff --git a/src/modules/navigator/mission_block.cpp b/src/modules/navigator/mission_block.cpp index e6ff8107f6..3e22126246 100644 --- a/src/modules/navigator/mission_block.cpp +++ b/src/modules/navigator/mission_block.cpp @@ -831,7 +831,7 @@ MissionBlock::set_takeoff_item(struct mission_item_s *item, float abs_altitude) } void -MissionBlock::set_land_item(struct mission_item_s *item, bool at_current_location) +MissionBlock::set_land_item(struct mission_item_s *item) { /* VTOL transition to RW before landing */ if (_navigator->force_vtol()) { @@ -846,18 +846,9 @@ MissionBlock::set_land_item(struct mission_item_s *item, bool at_current_locatio /* set the land item */ item->nav_cmd = NAV_CMD_LAND; - /* use current position */ - if (at_current_location) { - item->lat = (double)NAN; //descend at current position - item->lon = (double)NAN; //descend at current position - item->yaw = _navigator->get_local_position()->heading; - - } else { - /* use home position */ - item->lat = _navigator->get_home_position()->lat; - item->lon = _navigator->get_home_position()->lon; - item->yaw = _navigator->get_home_position()->yaw; - } + item->lat = (double)NAN; //descend at current position + item->lon = (double)NAN; //descend at current position + item->yaw = _navigator->get_local_position()->heading; item->altitude = 0; item->altitude_is_relative = false; diff --git a/src/modules/navigator/mission_block.h b/src/modules/navigator/mission_block.h index c2c05eb17d..1a62643041 100644 --- a/src/modules/navigator/mission_block.h +++ b/src/modules/navigator/mission_block.h @@ -164,7 +164,7 @@ protected: /** * Set a land mission item */ - void set_land_item(struct mission_item_s *item, bool at_current_location); + void set_land_item(struct mission_item_s *item); /** * Set idle mission item