|
|
|
@ -519,7 +519,7 @@ MulticopterAttitudeControl::control_attitude_rates(float dt)
@@ -519,7 +519,7 @@ MulticopterAttitudeControl::control_attitude_rates(float dt)
|
|
|
|
|
rates(2) -= _sensor_bias.gyro_z_bias; |
|
|
|
|
|
|
|
|
|
Vector3f rates_p_scaled = _rate_p.emult(pid_attenuations(_tpa_breakpoint_p.get(), _tpa_rate_p.get())); |
|
|
|
|
//Vector3f rates_i_scaled = _rate_i.emult(pid_attenuations(_tpa_breakpoint_i.get(), _tpa_rate_i.get()));
|
|
|
|
|
Vector3f rates_i_scaled = _rate_i.emult(pid_attenuations(_tpa_breakpoint_i.get(), _tpa_rate_i.get())); |
|
|
|
|
Vector3f rates_d_scaled = _rate_d.emult(pid_attenuations(_tpa_breakpoint_d.get(), _tpa_rate_d.get())); |
|
|
|
|
|
|
|
|
|
/* angular rates error */ |
|
|
|
@ -567,7 +567,7 @@ MulticopterAttitudeControl::control_attitude_rates(float dt)
@@ -567,7 +567,7 @@ MulticopterAttitudeControl::control_attitude_rates(float dt)
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Perform the integration using a first order method and do not propagate the result if out of range or invalid
|
|
|
|
|
float rate_i = _rates_int(i) + _rate_i(i) * rates_err(i) * dt; |
|
|
|
|
float rate_i = _rates_int(i) + rates_i_scaled(i) * rates_err(i) * dt; |
|
|
|
|
|
|
|
|
|
if (PX4_ISFINITE(rate_i) && rate_i > -_rate_int_lim(i) && rate_i < _rate_int_lim(i)) { |
|
|
|
|
_rates_int(i) = rate_i; |
|
|
|
|