diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2013-10-24 18:18:24 +0200 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-10-24 18:18:24 +0200 |
commit | bff3bf8d87a2496bf6f1857287200926a4b21e0a (patch) | |
tree | 09ca1989f05181bae5d5ba122636beb84c1005b8 /src | |
parent | a5046fdfa02999f153502168682ade9bd5c15842 (diff) | |
parent | 00825aa3cf7a04de148f763b96ee69f977d2656f (diff) | |
download | px4-firmware-bff3bf8d87a2496bf6f1857287200926a4b21e0a.tar.gz px4-firmware-bff3bf8d87a2496bf6f1857287200926a4b21e0a.tar.bz2 px4-firmware-bff3bf8d87a2496bf6f1857287200926a4b21e0a.zip |
Merge branch 'fw_pid_cleanup' into fw_staging
Diffstat (limited to 'src')
-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 13c68f077..78952cb8d 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, |