diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-03-21 13:33:19 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-03-21 13:33:19 +0100 |
| commit | bc451eef4b92e21f575ad0b695d869f7316df2ce (patch) | |
| tree | 42eb3552554eb4dd68a3f348c91d84d74283de55 /src/drivers/roboclaw/RoboClaw.hpp | |
| parent | d2a74dff673e2d3f49fc98dea601be753bd18416 (diff) | |
| parent | 057bcf3172f3c8d1bab561e7e4cad14977cd74d0 (diff) | |
| download | px4-firmware-bc451eef4b92e21f575ad0b695d869f7316df2ce.tar.gz px4-firmware-bc451eef4b92e21f575ad0b695d869f7316df2ce.tar.bz2 px4-firmware-bc451eef4b92e21f575ad0b695d869f7316df2ce.zip | |
Merge remote-tracking branch 'upstream/master' into diff_press_filter
Conflicts:
src/drivers/meas_airspeed/meas_airspeed.cpp
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; |