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

Merge remote-tracking branch 'upstream/pr/1040' into uorbtinymerge

Browse Source 
Conflicts:
	mavlink/include/mavlink/v1.0
	src/modules/mc_att_control/mc_att_control_main.cpp
This commit is contained in:
Thomas Gubler
2014-11-25 10:49:29 +01:00
parent c37ff71e62 72f9fab4a2
commit 5b80a2ae38
8 changed files with 199 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/roboclaw/RoboClaw.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ RoboClaw::RoboClaw(const char *deviceName, uint16_t address,
_pulsesPerRev(pulsesPerRev),
_uart(0),
_controlPoll(),
_actuators(NULL, ORB_ID(actuator_controls_0), 20),
_actuators(ORB_ID(actuator_controls_0), 20),
_motor1Position(0),
_motor1Speed(0),
_motor1Overflow(0),