aboutsummaryrefslogtreecommitdiff
path: root/src/modules/fw_att_control/fw_att_control_main.cpp
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2013-10-20 17:36:49 +0200
committerThomas Gubler <thomasgubler@gmail.com>2013-10-24 18:18:03 +0200
commit00825aa3cf7a04de148f763b96ee69f977d2656f (patch)
tree066155f76f929b10acfc0ff039e04353b61c6c1f /src/modules/fw_att_control/fw_att_control_main.cpp
parent61fafcbc785525641b137389e3e5cd96b72cfbc1 (diff)
downloadpx4-firmware-00825aa3cf7a04de148f763b96ee69f977d2656f.tar.gz
px4-firmware-00825aa3cf7a04de148f763b96ee69f977d2656f.tar.bz2
px4-firmware-00825aa3cf7a04de148f763b96ee69f977d2656f.zip
fix small bug where roll instead of pitch was used
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.cpp4
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 277259330..c29cf4cc3 100644
--- a/src/modules/fw_att_control/fw_att_control_main.cpp
+++ b/src/modules/fw_att_control/fw_att_control_main.cpp
@@ -442,7 +442,7 @@ FixedwingAttitudeControl::vehicle_airspeed_poll()
if (airspeed_updated) {
orb_copy(ORB_ID(airspeed), _airspeed_sub, &_airspeed);
- warnx("airspeed poll: ind: %.4f, true: %.4f", _airspeed.indicated_airspeed_m_s, _airspeed.true_airspeed_m_s);
+// warnx("airspeed poll: ind: %.4f, true: %.4f", _airspeed.indicated_airspeed_m_s, _airspeed.true_airspeed_m_s);
return true;
}
@@ -698,7 +698,7 @@ FixedwingAttitudeControl::task_main()
_att.pitchspeed, _att.yawspeed,
_yaw_ctrl.get_desired_rate(),
_parameters.airspeed_min, _parameters.airspeed_max, airspeed, airspeed_scaling, lock_integrator);
- _actuators.control[1] = (isfinite(roll_u)) ? roll_u : 0.0f;
+ _actuators.control[1] = (isfinite(pitch_u)) ? pitch_u : 0.0f;
float yaw_u = _yaw_ctrl.control_bodyrate( _att.roll, _att.pitch,
_att.pitchspeed, _att.yawspeed,