diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-25 10:49:29 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-25 10:49:29 +0100 |
| commit | 5b80a2ae38121f8e3aa81b60ec594979f764ee38 (patch) | |
| tree | a5b58c326688cd847a44661624fb455b88f47f84 /src/drivers | |
| parent | c37ff71e625310cdc777719a04c3702d9afa1f7f (diff) | |
| parent | 72f9fab4a22bd96ad83aced62a481b484b2d69bc (diff) | |
| download | px4-firmware-5b80a2ae38121f8e3aa81b60ec594979f764ee38.tar.gz px4-firmware-5b80a2ae38121f8e3aa81b60ec594979f764ee38.tar.bz2 px4-firmware-5b80a2ae38121f8e3aa81b60ec594979f764ee38.zip | |
Merge remote-tracking branch 'upstream/pr/1040' into uorbtinymerge
Conflicts:
mavlink/include/mavlink/v1.0
src/modules/mc_att_control/mc_att_control_main.cpp
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/roboclaw/RoboClaw.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/roboclaw/RoboClaw.cpp b/src/drivers/roboclaw/RoboClaw.cpp index fdaa7f27b..eb9453b50 100644 --- a/src/drivers/roboclaw/RoboClaw.cpp +++ b/src/drivers/roboclaw/RoboClaw.cpp @@ -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), |