Browse Source

Smoothing: initialize ModuleParam in body of constructor because of compiler error

sbg
Dennis Mannhart 7 years ago committed by Lorenz Meier
parent
commit
46f91154a4
  1. 8
      src/lib/FlightTasks/tasks/Utility/ManualSmoothingXY.cpp
  2. 5
      src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp

8
src/lib/FlightTasks/tasks/Utility/ManualSmoothingXY.cpp

@ -41,8 +41,12 @@ @@ -41,8 +41,12 @@
#include <float.h>
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,

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

@ -42,9 +42,10 @@ @@ -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

Loading…
Cancel
Save