aboutsummaryrefslogtreecommitdiff
path: root/src/modules/mavlink/mavlink_main.h
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-06-30 12:18:38 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-06-30 12:18:38 +0200
commit8e41cbfdfa2083c421954b6d9aadde5c0e508cdc (patch)
treecbca1ce1822303d28b2b54b9700089d558cbac29 /src/modules/mavlink/mavlink_main.h
parent857b843d445f59f2dc393e4d5f879fc56f77a0e0 (diff)
downloadpx4-firmware-8e41cbfdfa2083c421954b6d9aadde5c0e508cdc.tar.gz
px4-firmware-8e41cbfdfa2083c421954b6d9aadde5c0e508cdc.tar.bz2
px4-firmware-8e41cbfdfa2083c421954b6d9aadde5c0e508cdc.zip
mavlink: Warning fixes
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
-rw-r--r--src/modules/mavlink/mavlink_main.h12
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.
*