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

VelocitySmoothing - (Re)set _state_init every time _state is (re)set

Browse Source
This commit is contained in:
bresch 2019-09-12 17:08:48 +02:00 committed by Matthias Grob
parent 654938f6a1
commit 8490266be8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/FlightTasks/tasks/Utility/VelocitySmoothing.cpp
View File

@ -48,6 +48,8 @@ void VelocitySmoothing::reset(float accel, float vel, float pos)
_state.a = accel;
_state.v = vel;
_state.x = pos;
_state_init = _state;
}
float VelocitySmoothing::saturateT1ForAccel(float a0, float j_max, float T1, float a_max)

6
src/lib/FlightTasks/tasks/Utility/VelocitySmoothing.hpp
View File

@ -100,11 +100,11 @@ public:
void setMaxVel(float max_vel) { _max_vel = max_vel; }
float getCurrentJerk() const { return _state.j; }
void setCurrentAcceleration(const float accel) { _state.a = accel; }
void setCurrentAcceleration(const float accel) { _state.a = _state_init.a = accel; }
float getCurrentAcceleration() const { return _state.a; }
void setCurrentVelocity(const float vel) { _state.v = vel; }
void setCurrentVelocity(const float vel) { _state.v = _state_init.v = vel; }
float getCurrentVelocity() const { return _state.v; }
void setCurrentPosition(const float pos) { _state.x = pos; }
void setCurrentPosition(const float pos) { _state.x = _state_init.x = pos; }
float getCurrentPosition() const { return _state.x; }
float getVelSp() const { return _vel_sp; }