diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-09-04 20:28:25 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-09-04 20:28:25 +0200 |
| commit | 2d5b2edc03fe784cd89a91ca66fd45284a00afe8 (patch) | |
| tree | cf73b92d2e00233f78b94d9066c31c61b1929699 /src/drivers | |
| parent | 2d3b6a88dee5220c1b35d6e32f264217da8e36b8 (diff) | |
| parent | 75e9497ab1fea94985b4e64b02069343e16821b6 (diff) | |
| download | px4-firmware-2d5b2edc03fe784cd89a91ca66fd45284a00afe8.tar.gz px4-firmware-2d5b2edc03fe784cd89a91ca66fd45284a00afe8.tar.bz2 px4-firmware-2d5b2edc03fe784cd89a91ca66fd45284a00afe8.zip | |
Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/hil/hil.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/drivers/hil/hil.cpp b/src/drivers/hil/hil.cpp index f17e99e9d..f0dc0c651 100644 --- a/src/drivers/hil/hil.cpp +++ b/src/drivers/hil/hil.cpp @@ -392,7 +392,8 @@ HIL::task_main() if (fds[0].revents & POLLIN) { /* get controls - must always do this to avoid spinning */ - orb_copy(ORB_ID_VEHICLE_ATTITUDE_CONTROLS, _t_actuators, &_controls); + orb_copy(_primary_pwm_device ? ORB_ID_VEHICLE_ATTITUDE_CONTROLS : + ORB_ID(actuator_controls_1), _t_actuators, &_controls); /* can we mix? */ if (_mixers != nullptr) { |