diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-21 20:43:32 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-21 20:43:32 +0200 |
| commit | 05de7fb7a08a4786b12ab3c9eeda040f70b01228 (patch) | |
| tree | 0a54c1d767e9f7764508a4e5449bae7fa943ba38 /src/modules/fw_att_control/fw_att_control_main.cpp | |
| parent | 9a35bac2adc1e803dea7cdb6a2db277f111724e0 (diff) | |
| parent | 9ea0b2189992830f2698c7d4703ff472072a61b1 (diff) | |
| download | px4-firmware-05de7fb7a08a4786b12ab3c9eeda040f70b01228.tar.gz px4-firmware-05de7fb7a08a4786b12ab3c9eeda040f70b01228.tar.bz2 px4-firmware-05de7fb7a08a4786b12ab3c9eeda040f70b01228.zip | |
Merge remote-tracking branch 'upstream/master' into fwattrobustify
Conflicts:
src/modules/fw_att_control/fw_att_control_main.cpp
Diffstat (limited to 'src/modules/fw_att_control/fw_att_control_main.cpp')
| -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 cafce4417..59854e734 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 */ @@ -779,7 +779,7 @@ FixedwingAttitudeControl::task_main() if (!isfinite(roll_u)) { _roll_ctrl.reset_integrator(); if (loop_counter % 10 == 0) { - warnx("roll_u %.4f", roll_u); + warnx("roll_u %.4f", (double)roll_u); } } |