Browse Source

ManualSmoothingZ: style fix

sbg
Dennis Mannhart 7 years ago committed by Beat Küng
parent
commit
0b551c1ede
  1. 19
      src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp
  2. 3
      src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.hpp

19
src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp

@ -37,7 +37,6 @@ @@ -37,7 +37,6 @@
* This Class is used for smoothing the velocity setpoints in Z-direction.
*/
#include "ManualSmoothingZ.hpp"
#include "uORB/topics/parameter_update.h"
#include <mathlib/mathlib.h>
@ -83,6 +82,15 @@ ManualSmoothingZ::updateParams() @@ -83,6 +82,15 @@ ManualSmoothingZ::updateParams()
}
}
void
ManualSmoothingZ::setParams()
{
param_get(_acc_max_up_h, &_acc_max_up);
param_get(_acc_max_down_h, &_acc_max_down);
param_get(_jerk_max_h, &_jerk_max);
}
void
ManualSmoothingZ::updateAcceleration(float &vel_sp_prev, const float dt)
{
@ -139,15 +147,6 @@ ManualSmoothingZ::updateAcceleration(float &vel_sp_prev, const float dt) @@ -139,15 +147,6 @@ ManualSmoothingZ::updateAcceleration(float &vel_sp_prev, const float dt)
_intention = intention;
}
void
ManualSmoothingZ::setParams()
{
param_get(_acc_max_up_h, &_acc_max_up);
param_get(_acc_max_down_h, &_acc_max_down);
param_get(_jerk_max_h, &_jerk_max);
}
float
ManualSmoothingZ::getMaxAcceleration()
{

3
src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.hpp

@ -50,9 +50,6 @@ public: @@ -50,9 +50,6 @@ public:
void smoothVelFromSticks(float vel_sp[2], const float dt);
private:
enum class Intention {

Loading…
Cancel
Save