PositionControl: set vel_dot to 0 if thrust setpoint is used

This commit is contained in:
Dennis Mannhart
2018-01-09 09:44:46 +01:00
committed by Beat Küng
parent 5ad37cec71
commit 6a639373ae
@@ -160,6 +160,7 @@ void PositionControl::_interfaceMapping()
_pos_sp(i) = _pos(i);
_vel_sp(i) = _vel(i);
_thr_int(i) = 0.0f;
_vel_dot(i) = 0.0f;
} else {
PX4_WARN("TODO: add safety");
@@ -235,6 +236,7 @@ void PositionControl::_velocityController(const float &dt)
* scale _thrust_sp by that value. This only has an effect for altitude mode where
* _thr_sp(0:1).length() > 0.0f.
*/
if (matrix::Vector2f(&_thr_sp(0)).length() > FLT_EPSILON) {
float thr_xy_max = fabsf(thr_sp(2)) * tanf(tilt_max);
@@ -249,7 +251,6 @@ void PositionControl::_velocityController(const float &dt)
* It is to note that pure manual and rate control will never enter _velocityController method. */
_thr_sp = ControlMath::constrainTilt(_thr_sp, tilt_max);
/* Constrain thrust set-point and update saturation flag */
/* To get (r-y) for horizontal direction, we look at the dot-product
* for vel_err and _vel_sp. The sign of the dot product indicates