diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-30 09:15:55 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-30 09:15:55 +0100 |
| commit | dc80d6745e94df71d351f4338c610f910c2a4e94 (patch) | |
| tree | bd4fbaa1d68fa6f38919167cea8285ba94b7e594 /src/modules/fw_att_control | |
| parent | 34d2f318ac8a72cce63e3e14e004daee45001011 (diff) | |
| parent | 0fa03e65ab3ab0e173e487b3e5f5321780f3afff (diff) | |
| download | px4-firmware-dc80d6745e94df71d351f4338c610f910c2a4e94.tar.gz px4-firmware-dc80d6745e94df71d351f4338c610f910c2a4e94.tar.bz2 px4-firmware-dc80d6745e94df71d351f4338c610f910c2a4e94.zip | |
Merge branch 'master' of github.com:PX4/Firmware into pwm_ioctls
Diffstat (limited to 'src/modules/fw_att_control')
| -rw-r--r-- | src/modules/fw_att_control/fw_att_control_main.cpp | 4 |
1 files changed, 4 insertions, 0 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 ae9aaa2da..eb67874db 100644 --- a/src/modules/fw_att_control/fw_att_control_main.cpp +++ b/src/modules/fw_att_control/fw_att_control_main.cpp @@ -683,6 +683,10 @@ FixedwingAttitudeControl::task_main() _actuators.control[4] = _manual.flaps; } + _actuators.control[5] = _manual.aux1; + _actuators.control[6] = _manual.aux2; + _actuators.control[7] = _manual.aux3; + /* lazily publish the setpoint only once available */ _actuators.timestamp = hrt_absolute_time(); |