flight_mode_manager: merge with flight_tasks

This commit is contained in:
Daniel Agar
2021-01-04 10:21:47 -05:00
committed by Lorenz Meier
parent b1e442b830
commit 4d7b875ee2
79 changed files with 353 additions and 611 deletions
@@ -37,7 +37,6 @@
#include <lib/mathlib/mathlib.h>
#include <lib/matrix/matrix/math.hpp>
using namespace time_literals;
using namespace matrix;
MulticopterPositionControl::MulticopterPositionControl(bool vtol) :
@@ -271,7 +270,7 @@ void MulticopterPositionControl::Run()
failsafe(time_stamp_now, setpoint, _states, !was_in_failsafe);
_control.setInputSetpoint(setpoint);
constraints = FlightTask::empty_constraints;
constraints = {0, NAN, NAN, NAN, NAN, NAN, NAN, NAN, false, {}};
_control.update(dt);
}