From 46f91154a4fc02895e5c048d3b959d745c5c2c31 Mon Sep 17 00:00:00 2001 From: Dennis Mannhart Date: Mon, 30 Apr 2018 20:17:10 +0200 Subject: [PATCH] Smoothing: initialize ModuleParam in body of constructor because of compiler error --- src/lib/FlightTasks/tasks/Utility/ManualSmoothingXY.cpp | 8 ++++++-- src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/lib/FlightTasks/tasks/Utility/ManualSmoothingXY.cpp b/src/lib/FlightTasks/tasks/Utility/ManualSmoothingXY.cpp index cc47883adf..53e08eecad 100644 --- a/src/lib/FlightTasks/tasks/Utility/ManualSmoothingXY.cpp +++ b/src/lib/FlightTasks/tasks/Utility/ManualSmoothingXY.cpp @@ -41,8 +41,12 @@ #include ManualSmoothingXY::ManualSmoothingXY(ModuleParams *parent, const matrix::Vector2f &vel) : - ModuleParams(parent), _acc_state_dependent(_acc_xy_max.get()), _jerk_state_dependent(_jerk_max.get()), _vel_sp_prev(vel) -{} + ModuleParams(parent), _vel_sp_prev(vel) + +{ + _acc_state_dependent = _acc_xy_max.get(); + _jerk_state_dependent =_jerk_max.get(); +} void ManualSmoothingXY::smoothVelocity(matrix::Vector2f &vel_sp, const matrix::Vector2f &vel, const float &yaw, diff --git a/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp b/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp index 6cf941f603..08ef232de8 100644 --- a/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp +++ b/src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp @@ -42,9 +42,10 @@ ManualSmoothingZ::ManualSmoothingZ(ModuleParams *parent, const float &vel, const float &stick) : ModuleParams(parent), - _vel(vel), _stick(stick), _acc_state_dependent(_acc_max_up.get()), _max_acceleration(_acc_max_up.get()), - _vel_sp_prev(vel) + _vel(vel), _stick(stick), _vel_sp_prev(vel) { + _acc_state_dependent = _acc_max_up.get(); + _max_acceleration = _acc_max_up.get(); } /* in manual altitude control apply acceleration limit based on stick input