fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-02 05:30:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe

Browse Source
This commit is contained in:
Thomas Gubler
2014-09-04 20:28:25 +02:00
parent 2d3b6a88de 75e9497ab1
commit 2d5b2edc03
11 changed files with 1102 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/hil/hil.cpp
+2 -1
View File
@@ -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) {