From 8dcfcf5b9ecb1e6765ef6d4e6a3cd837114b4329 Mon Sep 17 00:00:00 2001 From: KonradRudin <98741601+KonradRudin@users.noreply.github.com> Date: Mon, 11 Mar 2024 09:46:16 +0100 Subject: [PATCH] mission_base: land_start_item invalid only when negative. (#22856) rtl: land_start_item invalid only when negative. Update src/modules/navigator/rtl.cpp --- src/modules/navigator/mission_base.h | 2 +- src/modules/navigator/rtl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/navigator/mission_base.h b/src/modules/navigator/mission_base.h index 3f7e2ce91d..6fa0f100b4 100644 --- a/src/modules/navigator/mission_base.h +++ b/src/modules/navigator/mission_base.h @@ -123,7 +123,7 @@ protected: * @return true If mission has a land start of land item and a land item * @return false otherwise */ - bool hasMissionLandStart() const { return _mission.land_start_index > 0 && _mission.land_index > 0;}; + bool hasMissionLandStart() const { return _mission.land_start_index >= 0 && _mission.land_index >= 0;}; /** * @brief Go to next Mission Item * Go to next non jump mission item diff --git a/src/modules/navigator/rtl.cpp b/src/modules/navigator/rtl.cpp index db20f8cf74..f039c42832 100644 --- a/src/modules/navigator/rtl.cpp +++ b/src/modules/navigator/rtl.cpp @@ -604,7 +604,7 @@ void RTL::parameters_update() bool RTL::hasMissionLandStart() const { - return _mission_sub.get().land_start_index > 0; + return _mission_sub.get().land_start_index >= 0 && _mission_sub.get().land_index >= 0; } bool RTL::hasVtolLandApproach(const PositionYawSetpoint &rtl_position) const