Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 03:49:12 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

mission: when land start marker present, look for loiter to altitude item

Browse Source 
instead of using the previous waypoint as landing target
- the previous waypoint could be miles away

Signed-off-by: RomanBapst <bapstroman@gmail.com>
This commit is contained in:
RomanBapst
2020-10-23 10:32:27 +03:00
committed by Lorenz Meier
parent e0c394a00b
commit 12875f7869
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/mission.cpp
+10 -8
View File
@@ -398,16 +398,18 @@ Mission::find_mission_land_start()
break; break;
} }
// first check for DO_LAND_START marker if (missionitem.nav_cmd == NAV_CMD_DO_LAND_START) {
if ((missionitem.nav_cmd == NAV_CMD_DO_LAND_START) && (missionitem_prev.nav_cmd == NAV_CMD_WAYPOINT)) {
_land_start_available = true; _land_start_available = true;
_land_start_index = i; _land_start_index = i;
// the DO_LAND_START marker contains no position sp, so take them from the previous mission item }
_landing_lat = missionitem_prev.lat;
_landing_lon = missionitem_prev.lon; if (_land_start_available && (missionitem.nav_cmd == NAV_CMD_LOITER_TO_ALT)) {
_landing_alt = missionitem_prev.altitude_is_relative ? missionitem_prev.altitude + // use the loiter to altitude item of the mission landing as target landing location
_navigator->get_home_position()->alt : missionitem_prev.altitude; _landing_lat = missionitem.lat;
_landing_lon = missionitem.lon;
_landing_alt = missionitem.altitude_is_relative ? missionitem.altitude +
_navigator->get_home_position()->alt : missionitem.altitude;
return true; return true;
// if no DO_LAND_START marker available, also check for VTOL_LAND or normal LAND // if no DO_LAND_START marker available, also check for VTOL_LAND or normal LAND