fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 08:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swissfang

Browse Source
This commit is contained in:
Lorenz Meier
2014-08-26 09:37:56 +02:00
parent 9434633912 65af8ec55e
commit 47e39841df
15 changed files with 1034 additions and 25 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) {