diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-26 07:56:54 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-26 07:56:54 +0100 |
commit | 6200a3e3a5f24f40ff9da8b3fb366b7014656941 (patch) | |
tree | 5fc03991b903894d869125af757954de92331279 /src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp | |
parent | 034d0a6a610c8838d6c43b51a4401ce818b77624 (diff) | |
parent | cbcd1ea1d143dfddd2331fb14d17d7be48fa8b6f (diff) | |
download | px4-firmware-6200a3e3a5f24f40ff9da8b3fb366b7014656941.tar.gz px4-firmware-6200a3e3a5f24f40ff9da8b3fb366b7014656941.tar.bz2 px4-firmware-6200a3e3a5f24f40ff9da8b3fb366b7014656941.zip |
Added TeraRanger one sensor
Diffstat (limited to 'src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp')
-rw-r--r-- | src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp b/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp index 46db788a6..926a8db2a 100644 --- a/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp @@ -169,7 +169,7 @@ float ECL_PitchController::control_bodyrate(float roll, float pitch, if (!lock_integrator && _k_i > 0.0f && airspeed > 0.5f * airspeed_min) { - float id = _rate_error * dt; + float id = _rate_error * dt * scaler; /* * anti-windup: do not allow integrator to increase if actuator is at limit @@ -190,7 +190,9 @@ float ECL_PitchController::control_bodyrate(float roll, float pitch, float integrator_constrained = math::constrain(_integrator * _k_i, -_integrator_max, _integrator_max); /* Apply PI rate controller and store non-limited output */ - _last_output = (_bodyrate_setpoint * _k_ff +_rate_error * _k_p + integrator_constrained) * scaler * scaler; //scaler is proportional to 1/airspeed + _last_output = _bodyrate_setpoint * _k_ff * scaler + + _rate_error * _k_p * scaler * scaler + + integrator_constrained; //scaler is proportional to 1/airspeed // warnx("pitch: _integrator: %.4f, _integrator_max: %.4f, airspeed %.4f, _k_i %.4f, _k_p: %.4f", (double)_integrator, (double)_integrator_max, (double)airspeed, (double)_k_i, (double)_k_p); // warnx("roll: _last_output %.4f", (double)_last_output); return math::constrain(_last_output, -1.0f, 1.0f); |