diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 17:03:02 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 17:03:02 +0200 |
| commit | 478f923331cb8c3fd0e98a99afee462e4e158d44 (patch) | |
| tree | 59242aaa2fd8df814317e96117648fc4598c50c3 /src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp | |
| parent | 8a25c48071ed794b33e23f7ff7737cded58bea11 (diff) | |
| parent | 3c5f35da73cb6c37cf45a06909631e13b762f76d (diff) | |
| download | px4-firmware-478f923331cb8c3fd0e98a99afee462e4e158d44.tar.gz px4-firmware-478f923331cb8c3fd0e98a99afee462e4e158d44.tar.bz2 px4-firmware-478f923331cb8c3fd0e98a99afee462e4e158d44.zip | |
Merged master into mpc_in_flight_lock
Diffstat (limited to 'src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp')
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp b/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp index a0a18bc2e..46db788a6 100644 --- a/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp @@ -151,9 +151,6 @@ float ECL_PitchController::control_bodyrate(float roll, float pitch, if (dt_micros > 500000) lock_integrator = true; -// float k_ff = math::max((_k_p - _k_i * _tc) * _tc - _k_d, 0.0f); - float k_ff = 0; - /* input conditioning */ if (!isfinite(airspeed)) { /* airspeed is NaN, +- INF or not available, pick center of band */ |