diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-09 07:48:50 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-09 07:48:50 +0200 |
| commit | d8f77a2b396b651410c7f28cfad84c6f8288925c (patch) | |
| tree | b5fff2eff1b1522a7757ef33ca405640e70f3e4c /src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp | |
| parent | 13b6dffb2e719219ffccccd6681d36e695165aa5 (diff) | |
| parent | 497b89165972b7c4836fcb8bc0da681d8e67fb32 (diff) | |
| download | px4-firmware-d8f77a2b396b651410c7f28cfad84c6f8288925c.tar.gz px4-firmware-d8f77a2b396b651410c7f28cfad84c6f8288925c.tar.bz2 px4-firmware-d8f77a2b396b651410c7f28cfad84c6f8288925c.zip | |
Merge remote-tracking branch 'px4/master' into navigator_rewrite
Conflicts:
src/modules/position_estimator_inav/position_estimator_inav_main.c
Diffstat (limited to 'src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp')
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp | 4 |
1 files changed, 2 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 0a909d02f..a0a18bc2e 100644 --- a/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp @@ -61,9 +61,9 @@ ECL_PitchController::ECL_PitchController() : _integrator(0.0f), _rate_error(0.0f), _rate_setpoint(0.0f), - _bodyrate_setpoint(0.0f) + _bodyrate_setpoint(0.0f), + _nonfinite_input_perf(perf_alloc(PC_COUNT, "fw att control pitch nonfinite input")) { - perf_alloc(PC_COUNT, "fw att control pitch nonfinite input"); } ECL_PitchController::~ECL_PitchController() |