From b9b82ecce7b69a9d3ad993ebbda8a0dd89fe08e7 Mon Sep 17 00:00:00 2001 From: RomanBapst Date: Fri, 20 Dec 2024 09:47:24 +0300 Subject: [PATCH] added check for vtol Signed-off-by: RomanBapst --- src/modules/navigator/mission.cpp | 2 +- src/modules/navigator/rtl_direct_mission_land.cpp | 2 +- src/modules/navigator/rtl_mission_fast_reverse.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/navigator/mission.cpp b/src/modules/navigator/mission.cpp index 6957f0dd99bc..08a200eda02f 100644 --- a/src/modules/navigator/mission.cpp +++ b/src/modules/navigator/mission.cpp @@ -215,7 +215,7 @@ void Mission::setActiveMissionItems() && isLanding() && _mission_item.nav_cmd == NAV_CMD_WAYPOINT; const bool mc_landing_after_transition = _vehicle_status_sub.get().vehicle_type == - vehicle_status_s::VEHICLE_TYPE_ROTARY_WING && + vehicle_status_s::VEHICLE_TYPE_ROTARY_WING && _vehicle_status_sub.get().is_vtol && new_work_item_type == WorkItemType::WORK_ITEM_TYPE_MOVE_TO_LAND; if (fw_on_mission_landing || mc_landing_after_transition) { diff --git a/src/modules/navigator/rtl_direct_mission_land.cpp b/src/modules/navigator/rtl_direct_mission_land.cpp index 6c9d5c5d3608..6b7f2f649a6d 100644 --- a/src/modules/navigator/rtl_direct_mission_land.cpp +++ b/src/modules/navigator/rtl_direct_mission_land.cpp @@ -219,7 +219,7 @@ void RtlDirectMissionLand::setActiveMissionItems() && isLanding() && _mission_item.nav_cmd == NAV_CMD_WAYPOINT; const bool mc_landing_after_transition = _vehicle_status_sub.get().vehicle_type == - vehicle_status_s::VEHICLE_TYPE_ROTARY_WING && + vehicle_status_s::VEHICLE_TYPE_ROTARY_WING && _vehicle_status_sub.get().is_vtol && new_work_item_type == WorkItemType::WORK_ITEM_TYPE_MOVE_TO_LAND; if (fw_on_mission_landing || mc_landing_after_transition) { diff --git a/src/modules/navigator/rtl_mission_fast_reverse.cpp b/src/modules/navigator/rtl_mission_fast_reverse.cpp index a0489e1806de..707219b1b37a 100644 --- a/src/modules/navigator/rtl_mission_fast_reverse.cpp +++ b/src/modules/navigator/rtl_mission_fast_reverse.cpp @@ -156,7 +156,7 @@ void RtlMissionFastReverse::setActiveMissionItems() mission_item_to_position_setpoint(_mission_item, &pos_sp_triplet->current); const bool mc_landing_after_transition = _vehicle_status_sub.get().vehicle_type == - vehicle_status_s::VEHICLE_TYPE_ROTARY_WING && + vehicle_status_s::VEHICLE_TYPE_ROTARY_WING && _vehicle_status_sub.get().is_vtol && new_work_item_type == WorkItemType::WORK_ITEM_TYPE_MOVE_TO_LAND; if (mc_landing_after_transition) {