diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-25 15:58:27 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-25 15:58:27 +0100 |
commit | 3c6f6618e8709c22ac21f8f0353f292f25da22f7 (patch) | |
tree | e472fd1aad3d301213305b1c349b2c507a0c9489 /src/drivers | |
parent | 55cf2fc61c7b90725cd960f9c7d72737024f1cfc (diff) | |
parent | 579ec36c28d4cbf08d93531853b2b8fd3f3461ac (diff) | |
download | px4-firmware-3c6f6618e8709c22ac21f8f0353f292f25da22f7.tar.gz px4-firmware-3c6f6618e8709c22ac21f8f0353f292f25da22f7.tar.bz2 px4-firmware-3c6f6618e8709c22ac21f8f0353f292f25da22f7.zip |
Merge remote-tracking branch 'upstream/uorbtinymerge' into dev_ros
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), |