diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-13 16:04:02 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-16 14:00:58 +0200 |
| commit | fbb3adde06e5ecf88a4c39e332a539fa12d173b3 (patch) | |
| tree | 4871f0791f891ec2d9a5385579af61fe1fd1bec2 /src/modules/mavlink/mavlink_stream.h | |
| parent | a72015c260dbb4e70d23c35120269cef61a439cc (diff) | |
| download | px4-firmware-fbb3adde06e5ecf88a4c39e332a539fa12d173b3.tar.gz px4-firmware-fbb3adde06e5ecf88a4c39e332a539fa12d173b3.tar.bz2 px4-firmware-fbb3adde06e5ecf88a4c39e332a539fa12d173b3.zip | |
mavlink app: Clean up allocations
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 def40d9ad..eb881edd7 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; @@ -67,9 +59,19 @@ public: void set_interval(const unsigned int interval); void set_channel(mavlink_channel_t channel); 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; }; |