diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-26 09:37:56 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-26 09:37:56 +0200 |
| commit | 47e39841df7f4dce7ea05644d3d069bb3e4c4a4c (patch) | |
| tree | 853fb1e43c3aa141cf69b09f96167bdbc53acccf /src/drivers | |
| parent | 943463391241cdad88cc169d9cedbb5cb4cddf47 (diff) | |
| parent | 65af8ec55e45261a73e247f3fd28c7abf4fc22bd (diff) | |
| download | px4-firmware-47e39841df7f4dce7ea05644d3d069bb3e4c4a4c.tar.gz px4-firmware-47e39841df7f4dce7ea05644d3d069bb3e4c4a4c.tar.bz2 px4-firmware-47e39841df7f4dce7ea05644d3d069bb3e4c4a4c.zip | |
Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swissfang
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) { |