diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-23 14:35:59 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-23 14:35:59 +0200 |
| commit | 194aa491107ca10a65065edef3977c20c02a507c (patch) | |
| tree | f47e88a1e7c58093f862d38dc4e75e27f8fd0460 /src/modules/mavlink/mavlink_main.h | |
| parent | f02de30c32acd313dcb4d9e5561634d5a3ab758c (diff) | |
| parent | 662a7403b2ef00018d6c1b38265ec0ba4a9ae6bf (diff) | |
| download | px4-firmware-194aa491107ca10a65065edef3977c20c02a507c.tar.gz px4-firmware-194aa491107ca10a65065edef3977c20c02a507c.tar.bz2 px4-firmware-194aa491107ca10a65065edef3977c20c02a507c.zip | |
Merged rate config changes
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index d3065e251..f74b7daa7 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -201,10 +201,14 @@ public: mavlink_channel_t get_channel(); + void configure_stream_threadsafe(const char *stream_name, const float rate); + bool _task_should_exit; /**< if true, mavlink task should exit */ int get_mavlink_fd() { return _mavlink_fd; } + MavlinkStream * get_streams() { return _streams; } const + /* Functions for waiting to start transmission until message received. */ void set_has_received_messages(bool received_messages) { _received_messages = received_messages; } @@ -356,7 +360,6 @@ private: int mavlink_open_uart(int baudrate, const char *uart_name, struct termios *uart_config_original, bool *is_usb); int configure_stream(const char *stream_name, const float rate); - void configure_stream_threadsafe(const char *stream_name, const float rate); int message_buffer_init(int size); |