diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-04 15:28:02 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-04 15:28:02 +0200 |
| commit | 904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e (patch) | |
| tree | 009971a34ecac4218edd58dd50820bb8c2b1cd3f /src/modules/mavlink/mavlink_main.h | |
| parent | 59775efaad782a1e4f5e346832407c71f1355c89 (diff) | |
| parent | 2389a11af1249f657d85d36a5e71db83940a7959 (diff) | |
| download | px4-firmware-904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e.tar.gz px4-firmware-904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e.tar.bz2 px4-firmware-904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e.zip | |
Merge branch 'master' into navigator_rewrite_drton
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index 5f4117ae5..f94036a17 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -213,15 +213,15 @@ public: */ int enable_flow_control(bool enabled); - const mavlink_channel_t get_channel(); + mavlink_channel_t get_channel(); - void configure_stream_threadsafe(const char *stream_name, const float rate); + void configure_stream_threadsafe(const char *stream_name, 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 + MavlinkStream * get_streams() const { return _streams; } /* Functions for waiting to start transmission until message received. */ @@ -311,15 +311,15 @@ private: pthread_mutex_t _message_buffer_mutex; - perf_counter_t _loop_perf; /**< loop performance counter */ - perf_counter_t _txerr_perf; /**< TX error counter */ - bool _param_initialized; param_t _param_system_id; param_t _param_component_id; param_t _param_system_type; param_t _param_use_hil_gps; + perf_counter_t _loop_perf; /**< loop performance counter */ + perf_counter_t _txerr_perf; /**< TX error counter */ + /** * Send one parameter. * |