From 1ea993880cdbee61393e4a9eb0203edaf32c1eaa Mon Sep 17 00:00:00 2001 From: Antonio Sanjurjo C <74329840+antonio-sc66@users.noreply.github.com> Date: Fri, 24 Mar 2023 05:49:14 +0100 Subject: [PATCH] Fix typo in WORK_ITEM_TYPE (#21311) Signed-off-by: Antonio Sanjurjo C <74329840+antonio-sc66@users.noreply.github.com> --- src/modules/navigator/mission.cpp | 6 +++--- src/modules/navigator/mission.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/navigator/mission.cpp b/src/modules/navigator/mission.cpp index d87b1eaac2..baef5b3304 100644 --- a/src/modules/navigator/mission.cpp +++ b/src/modules/navigator/mission.cpp @@ -877,7 +877,7 @@ Mission::set_mission_items() /* check if the vtol_takeoff waypoint is on top of us */ if (do_need_move_to_takeoff()) { - new_work_item_type = WORK_ITEM_TYPE_TRANSITON_AFTER_TAKEOFF; + new_work_item_type = WORK_ITEM_TYPE_TRANSITION_AFTER_TAKEOFF; } set_vtol_transition_item(&_mission_item, vtol_vehicle_status_s::VEHICLE_VTOL_STATE_FW); @@ -889,7 +889,7 @@ Mission::set_mission_items() /* takeoff completed and transitioned, move to takeoff wp as fixed wing */ if (_mission_item.nav_cmd == NAV_CMD_VTOL_TAKEOFF - && _work_item_type == WORK_ITEM_TYPE_TRANSITON_AFTER_TAKEOFF + && _work_item_type == WORK_ITEM_TYPE_TRANSITION_AFTER_TAKEOFF && new_work_item_type == WORK_ITEM_TYPE_DEFAULT) { new_work_item_type = WORK_ITEM_TYPE_DEFAULT; @@ -900,7 +900,7 @@ Mission::set_mission_items() /* move to land wp as fixed wing */ if (_mission_item.nav_cmd == NAV_CMD_VTOL_LAND - && (_work_item_type == WORK_ITEM_TYPE_DEFAULT || _work_item_type == WORK_ITEM_TYPE_TRANSITON_AFTER_TAKEOFF) + && (_work_item_type == WORK_ITEM_TYPE_DEFAULT || _work_item_type == WORK_ITEM_TYPE_TRANSITION_AFTER_TAKEOFF) && new_work_item_type == WORK_ITEM_TYPE_DEFAULT && !_navigator->get_land_detected()->landed) { diff --git a/src/modules/navigator/mission.h b/src/modules/navigator/mission.h index 1215dbe8c6..989a875425 100644 --- a/src/modules/navigator/mission.h +++ b/src/modules/navigator/mission.h @@ -287,7 +287,7 @@ private: WORK_ITEM_TYPE_TAKEOFF, /**< takeoff before moving to waypoint */ WORK_ITEM_TYPE_MOVE_TO_LAND, /**< move to land waypoint before descent */ WORK_ITEM_TYPE_ALIGN, /**< align for next waypoint */ - WORK_ITEM_TYPE_TRANSITON_AFTER_TAKEOFF, + WORK_ITEM_TYPE_TRANSITION_AFTER_TAKEOFF, WORK_ITEM_TYPE_MOVE_TO_LAND_AFTER_TRANSITION, WORK_ITEM_TYPE_PRECISION_LAND } _work_item_type{WORK_ITEM_TYPE_DEFAULT}; /**< current type of work to do (sub mission item) */