fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 00:51:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fwattrobustify

Browse Source 
Conflicts:
	src/modules/fw_att_control/fw_att_control_main.cpp
This commit is contained in:
Thomas Gubler
2014-05-21 20:43:32 +02:00
parent 9a35bac2ad 9ea0b21899
commit 05de7fb7a0
39 changed files with 283 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/fw_att_control/fw_att_control_main.cpp
+2 -2
View File
@@ -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);
}
}