diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-14 10:38:34 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-14 10:38:34 +0200 |
| commit | 51a4ef5de1bc542ac4f7072d95250cd62ea73ed6 (patch) | |
| tree | b71db4faea6a0ac39e4fa28481421a2acc13a896 /src/drivers/roboclaw/RoboClaw.hpp | |
| parent | 5e0911046173e01a6c66b91d3e38212e093159d0 (diff) | |
| parent | ddc8f1fa5f5b88549af5e4f5f46c751a5f3af3ce (diff) | |
| download | px4-firmware-51a4ef5de1bc542ac4f7072d95250cd62ea73ed6.tar.gz px4-firmware-51a4ef5de1bc542ac4f7072d95250cd62ea73ed6.tar.bz2 px4-firmware-51a4ef5de1bc542ac4f7072d95250cd62ea73ed6.zip | |
merged upstream/master into sbus2_sensorssbus2_sensors
Diffstat (limited to 'src/drivers/roboclaw/RoboClaw.hpp')
| -rw-r--r-- | src/drivers/roboclaw/RoboClaw.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/roboclaw/RoboClaw.hpp b/src/drivers/roboclaw/RoboClaw.hpp index e9f35cf95..58994d6fa 100644 --- a/src/drivers/roboclaw/RoboClaw.hpp +++ b/src/drivers/roboclaw/RoboClaw.hpp @@ -45,7 +45,7 @@ #include <poll.h> #include <stdio.h> -#include <controllib/uorb/UOrbSubscription.hpp> +#include <uORB/Subscription.hpp> #include <uORB/topics/actuator_controls.h> #include <drivers/device/i2c.h> @@ -169,7 +169,7 @@ private: struct pollfd _controlPoll; /** actuator controls subscription */ - control::UOrbSubscription<actuator_controls_s> _actuators; + uORB::Subscription<actuator_controls_s> _actuators; // private data float _motor1Position; |