From 43ba199c370b8d3a866670958452d04ad06abeec Mon Sep 17 00:00:00 2001 From: Silvan Fuhrer Date: Mon, 11 Dec 2023 14:35:56 +0100 Subject: [PATCH] Navigator: same logic for VTOL_TAKEOFF as for TAKEOFF (#22519) Signed-off-by: Silvan Fuhrer --- src/modules/navigator/mission_block.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/modules/navigator/mission_block.cpp b/src/modules/navigator/mission_block.cpp index 565b2f2150..3f923fce3f 100644 --- a/src/modules/navigator/mission_block.cpp +++ b/src/modules/navigator/mission_block.cpp @@ -694,6 +694,7 @@ MissionBlock::mission_item_to_position_setpoint(const mission_item_s &item, posi break; case NAV_CMD_TAKEOFF: + case NAV_CMD_VTOL_TAKEOFF: // if already flying (armed and !landed) treat TAKEOFF like regular POSITION if ((_navigator->get_vstatus()->arming_state == vehicle_status_s::ARMING_STATE_ARMED) @@ -707,10 +708,6 @@ MissionBlock::mission_item_to_position_setpoint(const mission_item_s &item, posi break; - case NAV_CMD_VTOL_TAKEOFF: - sp->type = position_setpoint_s::SETPOINT_TYPE_TAKEOFF; - break; - case NAV_CMD_LAND: case NAV_CMD_VTOL_LAND: sp->type = position_setpoint_s::SETPOINT_TYPE_LAND;