diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-26 17:28:01 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-26 17:28:01 +0200 |
| commit | 0fe8ed509ad2d45a16eba1fe2683f586e530ee02 (patch) | |
| tree | ea4454175c5600a411c5828c3278a812dd7563ab /src/modules/mavlink/mavlink_stream.h | |
| parent | 8ea5fd20c1c268c6baf145606186592bf5bd3699 (diff) | |
| parent | f3a77705a701a92ae510e18280136b3b7f204b3e (diff) | |
| download | px4-firmware-0fe8ed509ad2d45a16eba1fe2683f586e530ee02.tar.gz px4-firmware-0fe8ed509ad2d45a16eba1fe2683f586e530ee02.tar.bz2 px4-firmware-0fe8ed509ad2d45a16eba1fe2683f586e530ee02.zip | |
Merge branch 'master' into power_enforce
Diffstat (limited to 'src/modules/mavlink/mavlink_stream.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_stream.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/modules/mavlink/mavlink_stream.h b/src/modules/mavlink/mavlink_stream.h index 2979d20de..a41ace48e 100644 --- a/src/modules/mavlink/mavlink_stream.h +++ b/src/modules/mavlink/mavlink_stream.h @@ -50,14 +50,6 @@ class MavlinkStream; class MavlinkStream { -private: - hrt_abstime _last_sent; - -protected: - mavlink_channel_t _channel; - unsigned int _interval; - - virtual void send(const hrt_abstime t) = 0; public: MavlinkStream *next; @@ -71,9 +63,19 @@ public: * @return 0 if updated / sent, -1 if unchanged */ int update(const hrt_abstime t); - virtual MavlinkStream *new_instance() = 0; + static MavlinkStream *new_instance(); + static const char *get_name_static(); virtual void subscribe(Mavlink *mavlink) = 0; - virtual const char *get_name() = 0; + virtual const char *get_name() const = 0; + +protected: + mavlink_channel_t _channel; + unsigned int _interval; + + virtual void send(const hrt_abstime t) = 0; + +private: + hrt_abstime _last_sent; }; |