fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 03:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dennis Mannhart
2018-07-20 09:26:18 +02:00
committed by Lorenz Meier
parent 9c2ec3c229
commit 46f91154a4
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/tasks/Utility/ManualSmoothingXY.cpp
+6 -2
View File
@@ -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,
src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.cpp
+3 -2
View File
@@ -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