fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-18 23:49:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

ManualSmoothingZ: style fix

Browse Source
This commit is contained in:
Dennis Mannhart 2017-12-13 09:01:02 +01:00 committed by Beat Küng
parent 5343e49d1e
commit 0b551c1ede
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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()
}
}
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)
_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
View File

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