diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-03-21 09:45:46 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-03-21 09:45:46 +0100 |
| commit | 49bdfa8cfb00ad671500b3d32c101e6cbf0fb03d (patch) | |
| tree | 29c33e0a5da58b3c1efb027af64834daea7c9b9c /src/drivers | |
| parent | 398da6a4d6aaba6dc66cb11746b35b51a5294c2b (diff) | |
| parent | eaef67f21df3d38a6523a79bb966fe62d44092ae (diff) | |
| download | px4-firmware-49bdfa8cfb00ad671500b3d32c101e6cbf0fb03d.tar.gz px4-firmware-49bdfa8cfb00ad671500b3d32c101e6cbf0fb03d.tar.bz2 px4-firmware-49bdfa8cfb00ad671500b3d32c101e6cbf0fb03d.zip | |
Merge pull request #748 from jgoppert/tmpl_fix
GCC 4.7 Template Use Fix
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/md25/md25.cpp | 4 | ||||
| -rw-r--r-- | src/drivers/md25/md25.hpp | 4 | ||||
| -rw-r--r-- | src/drivers/roboclaw/RoboClaw.cpp | 2 | ||||
| -rw-r--r-- | src/drivers/roboclaw/RoboClaw.hpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/md25/md25.cpp b/src/drivers/md25/md25.cpp index d43e3aef9..5d1f58b85 100644 --- a/src/drivers/md25/md25.cpp +++ b/src/drivers/md25/md25.cpp @@ -52,7 +52,7 @@ #include <arch/board/board.h> #include <mavlink/mavlink_log.h> -#include <controllib/uorb/UOrbPublication.hpp> +#include <uORB/Publication.hpp> #include <uORB/topics/debug_key_value.h> #include <drivers/drv_hrt.h> @@ -587,7 +587,7 @@ int md25Sine(const char *deviceName, uint8_t bus, uint8_t address, float amplitu float prev_revolution = md25.getRevolutions1(); // debug publication - control::UOrbPublication<debug_key_value_s> debug_msg(NULL, + uORB::Publication<debug_key_value_s> debug_msg(NULL, ORB_ID(debug_key_value)); // sine wave for motor 1 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; diff --git a/src/drivers/roboclaw/RoboClaw.cpp b/src/drivers/roboclaw/RoboClaw.cpp index d65a9be36..dd5e4d3e0 100644 --- a/src/drivers/roboclaw/RoboClaw.cpp +++ b/src/drivers/roboclaw/RoboClaw.cpp @@ -53,7 +53,7 @@ #include <arch/board/board.h> #include <mavlink/mavlink_log.h> -#include <controllib/uorb/UOrbPublication.hpp> +#include <uORB/Publication.hpp> #include <uORB/topics/debug_key_value.h> #include <drivers/drv_hrt.h> 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; |