diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-11 19:44:17 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-11 19:44:17 +0200 |
| commit | e548eeb5890d3691514c7a2ff67be75136c1c557 (patch) | |
| tree | b8c95bccce230bc7752a07a0222ac4296aa29a93 /src/lib | |
| parent | e03411fc89fcdf36bfca68b5e27e319b56985782 (diff) | |
| parent | 251760679a4bed86fdb10746062fde2cc23e460f (diff) | |
| download | px4-firmware-e548eeb5890d3691514c7a2ff67be75136c1c557.tar.gz px4-firmware-e548eeb5890d3691514c7a2ff67be75136c1c557.tar.bz2 px4-firmware-e548eeb5890d3691514c7a2ff67be75136c1c557.zip | |
Merge remote-tracking branch 'upstream/master' into mtecs
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp | 4 | ||||
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_roll_controller.cpp | 4 | ||||
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp | 4 |
3 files changed, 6 insertions, 6 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() diff --git a/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp b/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp index 82903ef5a..d2a231694 100644 --- a/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp @@ -59,9 +59,9 @@ ECL_RollController::ECL_RollController() : _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 roll nonfinite input")) { - perf_alloc(PC_COUNT, "fw att control roll nonfinite input"); } ECL_RollController::~ECL_RollController() diff --git a/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp b/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp index e53ffc644..79184e2cd 100644 --- a/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp @@ -58,9 +58,9 @@ ECL_YawController::ECL_YawController() : _rate_error(0.0f), _rate_setpoint(0.0f), _bodyrate_setpoint(0.0f), - _coordinated_min_speed(1.0f) + _coordinated_min_speed(1.0f), + _nonfinite_input_perf(perf_alloc(PC_COUNT, "fw att control yaw nonfinite input")) { - perf_alloc(PC_COUNT, "fw att control yaw nonfinite input"); } ECL_YawController::~ECL_YawController() |