diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-30 00:25:26 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-30 00:25:26 +0400 |
| commit | d2553bfd2930eb02664d564559fa361b80c63f61 (patch) | |
| tree | 21cda568519c33a261edaaa9c370cc9ba9c7f466 /src/drivers/md25/md25.hpp | |
| parent | 0789189c0588ebebd24a523f9639411be89c6a9b (diff) | |
| parent | 9b1de5004c673ebe8bdf68f1b518565cccd6b05b (diff) | |
| download | px4-firmware-d2553bfd2930eb02664d564559fa361b80c63f61.tar.gz px4-firmware-d2553bfd2930eb02664d564559fa361b80c63f61.tar.bz2 px4-firmware-d2553bfd2930eb02664d564559fa361b80c63f61.zip | |
Merge branch 'master' into offboard2
Diffstat (limited to 'src/drivers/md25/md25.hpp')
| -rw-r--r-- | src/drivers/md25/md25.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/md25/md25.hpp b/src/drivers/md25/md25.hpp index 1661f67f9..962c6b881 100644 --- a/src/drivers/md25/md25.hpp +++ b/src/drivers/md25/md25.hpp @@ -46,7 +46,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> @@ -270,7 +270,7 @@ private: struct pollfd _controlPoll; /** actuator controls subscription */ - control::UOrbSubscription<actuator_controls_s> _actuators; + uORB::Subscription<actuator_controls_s> _actuators; // local copy of data from i2c device uint8_t _version; |