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.h | |
| 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.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_stream.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/modules/mavlink/mavlink_stream.h b/src/modules/mavlink/mavlink_stream.h index 0f959d720..c3e60917e 100644 --- a/src/modules/mavlink/mavlink_stream.h +++ b/src/modules/mavlink/mavlink_stream.h @@ -8,8 +8,13 @@ #ifndef MAVLINK_STREAM_H_ #define MAVLINK_STREAM_H_ +#include <drivers/drv_hrt.h> + class Mavlink; -class MavlinkOrbListener; +class MavlinkStream; + +#include "mavlink_main.h" + class MavlinkOrbSubscription; class MavlinkStream { @@ -22,9 +27,8 @@ public: unsigned int interval; MavlinkStream *next; Mavlink *mavlink; - MavlinkOrbListener* listener; - 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(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); ~MavlinkStream(); int update(const hrt_abstime t); }; |