diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-28 00:54:58 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-28 00:54:58 +0200 |
| commit | 8ddccb2dae509e3981ac8ca13a5f19ef27dce463 (patch) | |
| tree | b5006b3a7353d0234dca3b1893ac02e93ad33e7b /src/modules/fw_att_control/fw_att_control_main.cpp | |
| parent | 456e628e129b446d18246ab8ad312a15beea5996 (diff) | |
| parent | cc8f7f4c97de923f60f9469aa2847e6e1474d52d (diff) | |
| download | px4-firmware-8ddccb2dae509e3981ac8ca13a5f19ef27dce463.tar.gz px4-firmware-8ddccb2dae509e3981ac8ca13a5f19ef27dce463.tar.bz2 px4-firmware-8ddccb2dae509e3981ac8ca13a5f19ef27dce463.zip | |
Merge branch 'navigator_rewrite' into navigator_rewrite_drton
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 | 11 |
1 files changed, 9 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 178b590ae..3cd4ce928 100644 --- a/src/modules/fw_att_control/fw_att_control_main.cpp +++ b/src/modules/fw_att_control/fw_att_control_main.cpp @@ -707,14 +707,21 @@ FixedwingAttitudeControl::task_main() float throttle_sp = 0.0f; if (_vcontrol_mode.flag_control_velocity_enabled || _vcontrol_mode.flag_control_position_enabled) { + /* read in attitude setpoint from attitude setpoint uorb topic */ roll_sp = _att_sp.roll_body + _parameters.rollsp_offset_rad; pitch_sp = _att_sp.pitch_body + _parameters.pitchsp_offset_rad; throttle_sp = _att_sp.thrust; /* reset integrals where needed */ - if (_att_sp.roll_reset_integral) + if (_att_sp.roll_reset_integral) { _roll_ctrl.reset_integrator(); - + } + if (_att_sp.pitch_reset_integral) { + _pitch_ctrl.reset_integrator(); + } + if (_att_sp.yaw_reset_integral) { + _yaw_ctrl.reset_integrator(); + } } else { /* * Scale down roll and pitch as the setpoints are radians |