diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-04 12:22:55 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-04 12:22:55 +0200 |
| commit | 39dab45ac5f9321221eb86e23b0e203ae63f0936 (patch) | |
| tree | 7f3f99719a509586db29db0b7174b4e6fd2974ad /src/modules/mavlink/mavlink_main.h | |
| parent | d7394c7ef973e34d87187420444baad6fcf9854b (diff) | |
| parent | 2389a11af1249f657d85d36a5e71db83940a7959 (diff) | |
| download | px4-firmware-39dab45ac5f9321221eb86e23b0e203ae63f0936.tar.gz px4-firmware-39dab45ac5f9321221eb86e23b0e203ae63f0936.tar.bz2 px4-firmware-39dab45ac5f9321221eb86e23b0e203ae63f0936.zip | |
Merge branch 'master' into dataman_state_nav_rewrite
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index 67ef8d00f..1f4fb759f 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -172,9 +172,9 @@ 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 */ @@ -270,15 +270,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. * |