From be7416c823500627a525b12de9581f0cca253390 Mon Sep 17 00:00:00 2001 From: Simone Guscetti Date: Tue, 6 Nov 2018 15:21:31 +0100 Subject: [PATCH] FlightTask Auto: Adapt to new message and rename variable --- src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp | 2 +- src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp index 8a17c89d78..96a2204e0e 100644 --- a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp +++ b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp @@ -224,7 +224,7 @@ bool FlightTaskAuto::_evaluateTriplets() if (triplet_update || (_current_state != previous_state)) { _updateInternalWaypoints(); _updateAvoidanceWaypoints(); - _deploy_gear = _sub_triplet_setpoint->get().current.deploy_gear; + _mission_gear = _sub_triplet_setpoint->get().current.landing_gear; } if (MPC_OBS_AVOID.get() && _sub_vehicle_status->get().is_rotary_wing) { diff --git a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp index 441cbbf912..6594a3d8e2 100644 --- a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp +++ b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp @@ -103,7 +103,7 @@ protected: State _current_state{State::none}; float _target_acceptance_radius = 0.0f; /**< Acceptances radius of the target */ - bool _deploy_gear = false; + int _mission_gear = landing_gear_s::GEAR_KEEP; DEFINE_PARAMETERS_CUSTOM_PARENT(FlightTask, (ParamFloat) MPC_XY_CRUISE,