From d7c48ea5f2eee95367bf96c7ca16a9bd97b47fad Mon Sep 17 00:00:00 2001 From: Dennis Mannhart Date: Fri, 29 Dec 2017 17:27:11 +0100 Subject: [PATCH] FlightTaskManualAltitude/Position: set thrust setpoint to NAN (only temporary) --- src/lib/FlightTasks/tasks/FlightTaskManualAltitude.cpp | 2 +- src/lib/FlightTasks/tasks/FlightTaskManualPosition.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/FlightTasks/tasks/FlightTaskManualAltitude.cpp b/src/lib/FlightTasks/tasks/FlightTaskManualAltitude.cpp index 9aff51c8fa..69114ea8ac 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskManualAltitude.cpp +++ b/src/lib/FlightTasks/tasks/FlightTaskManualAltitude.cpp @@ -100,7 +100,7 @@ bool FlightTaskManualAltitude::update() _setVelocitySetpoint(Vector3f(NAN, NAN, _vel_sp_z)); _setYawSetpoint(_yaw_sp); _setYawspeedSetpoint(_yaw_rate_sp); - //_setThrustSetpoint(...) TODO + _setThrustSetpoint(Vector3f(NAN, NAN, NAN)); return true; } diff --git a/src/lib/FlightTasks/tasks/FlightTaskManualPosition.cpp b/src/lib/FlightTasks/tasks/FlightTaskManualPosition.cpp index b36c63247c..5272f72905 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskManualPosition.cpp +++ b/src/lib/FlightTasks/tasks/FlightTaskManualPosition.cpp @@ -110,6 +110,8 @@ bool FlightTaskManualPosition::update() _setVelocitySetpoint(Vector3f(_vel_sp_xy(0), _vel_sp_xy(1), _vel_sp_z)); _setYawSetpoint(_yaw_sp); _setYawspeedSetpoint(_yaw_rate_sp); + _setThrustSetpoint(Vector3f(NAN, NAN, NAN)); + return true; }