diff --git a/src/lib/FlightTasks/tasks/FlightTaskManualAltitudeSmooth.cpp b/src/lib/FlightTasks/tasks/FlightTaskManualAltitudeSmooth.cpp index 936c33a87a0b8bdc9f7889f2dc174a0c9fff6df1..f319e8e83038aaa9ca3ff200c9613cc1414c5c87 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskManualAltitudeSmooth.cpp +++ b/src/lib/FlightTasks/tasks/FlightTaskManualAltitudeSmooth.cpp @@ -44,20 +44,13 @@ FlightTaskManualAltitudeSmooth::FlightTaskManualAltitudeSmooth(control::SuperBlo _smoothing(_velocity(2), _sticks(2)) {} - -bool FlightTaskManualAltitudeSmooth::activate() -{ - _vel_sp_prev_z = _velocity(2); - return FlightTaskManualAltitude::activate(); -} - void FlightTaskManualAltitudeSmooth::_updateSetpoints() { /* Get yaw, thrust */ FlightTaskManualAltitude::_updateSetpoints(); /* Smooth velocity in z*/ - _smoothing.smoothVelFromSticks(_vel_sp_z, _deltatime); + _smoothing.smoothVelFromSticks(_vel_sp(2), _deltatime); /* Check for altitude lock*/ _updateAltitudeLock(); diff --git a/src/lib/FlightTasks/tasks/FlightTaskManualAltitudeSmooth.hpp b/src/lib/FlightTasks/tasks/FlightTaskManualAltitudeSmooth.hpp index 6779c6d5de3c61df7e9b53f1feb7c9c8024d4419..628141615fdca84c27f3f2495fb88c20b04f56ea 100644 --- a/src/lib/FlightTasks/tasks/FlightTaskManualAltitudeSmooth.hpp +++ b/src/lib/FlightTasks/tasks/FlightTaskManualAltitudeSmooth.hpp @@ -45,19 +45,11 @@ class FlightTaskManualAltitudeSmooth : public FlightTaskManualAltitude { public: FlightTaskManualAltitudeSmooth(control::SuperBlock *parent, const char *name); - virtual ~FlightTaskManualAltitudeSmooth() = default; - bool activate() override; - - protected: - virtual void _updateSetpoints() override; private: - - ManualSmoothingZ _smoothing; // Smoothing for velocity setpoints. - float _vel_sp_prev_z{}; // Velocity setpoint from previous iteration. - + ManualSmoothingZ _smoothing; /**< smoothing for velocity setpoints */ };