From 0b551c1ede6ad09be4b3617bb37efd7d28907fa3 Mon Sep 17 00:00:00 2001
From: Dennis Mannhart <dennis.mannhart@gmail.com>
Date: Wed, 13 Dec 2017 09:01:02 +0100
Subject: [PATCH] ManualSmoothingZ: style fix
---
.../tasks/Utility/ManualSmoothingZ.cpp | 19 +++++++++----------
.../tasks/Utility/ManualSmoothingZ.hpp | 3 ---
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp b/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp
index 8d44fbd22b..8e3f9551ef 100644
--- a/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp
+++ b/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp
@@ -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()
{
diff --git a/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.hpp b/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.hpp
index 532d340ef5..45746ff895 100644
--- a/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.hpp
+++ b/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.hpp
@@ -50,9 +50,6 @@ public:
void smoothVelFromSticks(float vel_sp[2], const float dt);
-
-
-
private:
enum class Intention {
--
GitLab