From b20bd076a0aef8ce2d7fedfe304355b92f6bc72c Mon Sep 17 00:00:00 2001 From: Dennis Mannhart Date: Fri, 2 Mar 2018 11:09:17 +0100 Subject: [PATCH] FlightTaskAuto: always update type --- src/lib/FlightTasks/tasks/FlightTaskAuto.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp b/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp index b14bc08d5e..a006f3d7f4 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp +++ b/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp @@ -90,9 +90,11 @@ bool FlightTaskAuto::_evaluateTriplets() /* Best we can do is to just set all waypoints to current state */ _prev_prev_wp = _prev_wp = _target = _next_wp = _position; _yaw_wp = _yaw; + _type = WaypointType::position; return false; } + _type = (WaypointType)_sub_triplet_setpoint->get().current.type; /* Always update cruise speed since that can change without waypoint changes */ _mc_cruise_speed = _sub_triplet_setpoint->get().current.cruising_speed; @@ -141,8 +143,6 @@ bool FlightTaskAuto::_evaluateTriplets() } - _type = (WaypointType)_sub_triplet_setpoint->get().current.type; - _prev_prev_wp = _prev_wp; // previous -1 is set to previous if (_isFinite(_sub_triplet_setpoint->get().previous) && _sub_triplet_setpoint->get().previous.valid) {