diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 00:05:29 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 00:05:29 +0200 |
| commit | 5559e568b6e5502ad51ec96fd531876c1191d641 (patch) | |
| tree | bc6356b5bed0481cced4a7d7e7ef99bd225d91a7 /src/drivers/md25/md25.cpp | |
| parent | 863385dbc4243c8ecb19890a0dfce4a0b7ead9d6 (diff) | |
| parent | d67089b23f58ac152253f58c5deaebbd57db0362 (diff) | |
| download | px4-firmware-safelink.tar.gz px4-firmware-safelink.tar.bz2 px4-firmware-safelink.zip | |
Merged master into safelinksafelink
Diffstat (limited to 'src/drivers/md25/md25.cpp')
| -rw-r--r-- | src/drivers/md25/md25.cpp | 4 |
1 files changed, 2 insertions, 2 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 |