fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-02 23:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

prevent RTL if already landing

Browse Source
This commit is contained in:
Jake Dahl
2018-07-25 13:45:49 -06:00
committed by Lorenz Meier
parent 7c84e77312
commit 130cdf25bf
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/rtl.cpp
+3 -2
View File
@@ -72,8 +72,9 @@ RTL::rtl_type() const
void
RTL::on_activation()
{
if (_navigator->get_land_detected()->landed) {
// for safety reasons don't go into RTL if landed
if (_navigator->get_land_detected()->landed
|| (_navigator->get_position_setpoint_triplet()->current.type == position_setpoint_s::SETPOINT_TYPE_LAND)) {
// for safety reasons don't go into RTL if landed or currently in landing
_rtl_state = RTL_STATE_LANDED;
} else if ((rtl_type() == RTL_LAND) && _navigator->on_mission_landing()) {