diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-21 11:13:47 -0700 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-21 11:13:47 -0700 |
commit | 9ea0b2189992830f2698c7d4703ff472072a61b1 (patch) | |
tree | 872692c2a996ee949037a2714088a09e4744241e /src/modules/fw_att_control | |
parent | e7212df5e8b783df8e3f65db3a649804e81e2ee9 (diff) | |
parent | 328fc04d29f055df8cdbd2abc8313fb29eb45148 (diff) | |
download | px4-firmware-9ea0b2189992830f2698c7d4703ff472072a61b1.tar.gz px4-firmware-9ea0b2189992830f2698c7d4703ff472072a61b1.tar.bz2 px4-firmware-9ea0b2189992830f2698c7d4703ff472072a61b1.zip |
Merge pull request #988 from PX4/warning_fixes_v2
Warning fixes v2
Diffstat (limited to 'src/modules/fw_att_control')
-rw-r--r-- | src/modules/fw_att_control/fw_att_control_main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/fw_att_control/fw_att_control_main.cpp b/src/modules/fw_att_control/fw_att_control_main.cpp index 1f3e9f098..6943239e5 100644 --- a/src/modules/fw_att_control/fw_att_control_main.cpp +++ b/src/modules/fw_att_control/fw_att_control_main.cpp @@ -304,8 +304,8 @@ FixedwingAttitudeControl::FixedwingAttitudeControl() : /* publications */ _rate_sp_pub(-1), - _actuators_0_pub(-1), _attitude_sp_pub(-1), + _actuators_0_pub(-1), _actuators_1_pub(-1), /* performance counters */ @@ -773,7 +773,7 @@ FixedwingAttitudeControl::task_main() _parameters.airspeed_min, _parameters.airspeed_max, airspeed, airspeed_scaling, lock_integrator); _actuators.control[0] = (isfinite(roll_u)) ? roll_u + _parameters.trim_roll : _parameters.trim_roll; if (!isfinite(roll_u)) { - warnx("roll_u %.4f", roll_u); + warnx("roll_u %.4f", (double)roll_u); } float pitch_u = _pitch_ctrl.control_bodyrate(_att.roll, _att.pitch, |