aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-06-08 15:28:37 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-06-08 15:28:37 +0200
commit497b89165972b7c4836fcb8bc0da681d8e67fb32 (patch)
tree0a5cf6005df7f7b5b67d6deca559e252947949e7
parent3e66d7e0c9eaa61caf427f38ba4b7a1ab86b1ff3 (diff)
parent85b2dfa0c662298d49f584e6bd774954b04cec35 (diff)
downloadpx4-firmware-497b89165972b7c4836fcb8bc0da681d8e67fb32.tar.gz
px4-firmware-497b89165972b7c4836fcb8bc0da681d8e67fb32.tar.bz2
px4-firmware-497b89165972b7c4836fcb8bc0da681d8e67fb32.zip
Merge pull request #1047 from PX4/fwattfixperfc
fix initialization of perfcounters in fw att controllers
-rw-r--r--src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp4
-rw-r--r--src/lib/ecl/attitude_fw/ecl_roll_controller.cpp4
-rw-r--r--src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp4
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()