diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-02-26 00:24:14 +0400 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-02-26 00:24:14 +0400 |
commit | e291af990fd9a4f447cbad2416b78d031cd33f5c (patch) | |
tree | 9ef863c24d110f91bd96771868a157671ccca0b3 /src/modules/mavlink/mavlink_stream.cpp | |
parent | 4e27fd9a381bd32ba5b79d275528ac19d1fb9442 (diff) | |
download | px4-firmware-e291af990fd9a4f447cbad2416b78d031cd33f5c.tar.gz px4-firmware-e291af990fd9a4f447cbad2416b78d031cd33f5c.tar.bz2 px4-firmware-e291af990fd9a4f447cbad2416b78d031cd33f5c.zip |
mavlink: adding message stream by name implemnted, mavlink streams definitions and formatters moved to mavlink_messages.h/cpp, mavlink_orb_listener class and thread removed
Diffstat (limited to 'src/modules/mavlink/mavlink_stream.cpp')
-rw-r--r-- | src/modules/mavlink/mavlink_stream.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/mavlink/mavlink_stream.cpp b/src/modules/mavlink/mavlink_stream.cpp index 2a6728fdb..9df4263ee 100644 --- a/src/modules/mavlink/mavlink_stream.cpp +++ b/src/modules/mavlink/mavlink_stream.cpp @@ -7,20 +7,20 @@ #include <stdlib.h> -#include "mavlink_orb_listener.h" +#include "mavlink_stream.h" +#include "mavlink_main.h" -MavlinkStream::MavlinkStream(MavlinkOrbListener *listener, void (*callback)(const MavlinkStream *), const unsigned int subs_n, const struct orb_metadata **metas, const size_t *sizes, const uintptr_t arg, const unsigned int interval) +MavlinkStream::MavlinkStream(Mavlink *mavlink, void (*callback)(const MavlinkStream *), const unsigned int subs_n, const struct orb_metadata **topics, const size_t *sizes, const uintptr_t arg, const unsigned int interval) { this->callback = callback; this->arg = arg; this->interval = interval * 1000; this->mavlink = mavlink; - this->listener = listener; this->subscriptions_n = subs_n; this->subscriptions = (MavlinkOrbSubscription **) malloc(subs_n * sizeof(MavlinkOrbSubscription *)); for (int i = 0; i < subs_n; i++) { - this->subscriptions[i] = listener->add_subscription(metas[i], sizes[i], this, interval); + this->subscriptions[i] = mavlink->add_orb_subscription(topics[i], sizes[i]); } } |