dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

mavlink: Warning fixes

This commit is contained in:
Lorenz Meier 2014-06-30 12:18:38 +02:00
parent 857b843d44
commit 8e41cbfdfa
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/mavlink/mavlink_main.cpp
View File

@ -474,7 +474,7 @@ Mavlink::get_instance_id()
return _instance_id; return _instance_id;
} }
const mavlink_channel_t mavlink_channel_t
Mavlink::get_channel() Mavlink::get_channel()
{ {
return _channel; return _channel;
@ -2109,7 +2109,7 @@ Mavlink::task_main(int argc, char *argv[])
write_ptr = (uint8_t*)&msg; write_ptr = (uint8_t*)&msg;
// Pull a single message from the buffer // Pull a single message from the buffer
int read_count = available; size_t read_count = available;
if (read_count > sizeof(mavlink_message_t)) { if (read_count > sizeof(mavlink_message_t)) {
read_count = sizeof(mavlink_message_t); read_count = sizeof(mavlink_message_t);
} }

12
src/modules/mavlink/mavlink_main.h
View File

@ -213,15 +213,15 @@ public:
*/ */
int enable_flow_control(bool enabled); 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 */ bool _task_should_exit; /**< if true, mavlink task should exit */
int get_mavlink_fd() { return _mavlink_fd; } 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. */ /* Functions for waiting to start transmission until message received. */
@ -311,15 +311,15 @@ private:
pthread_mutex_t _message_buffer_mutex; 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; bool _param_initialized;
param_t _param_system_id; param_t _param_system_id;
param_t _param_component_id; param_t _param_component_id;
param_t _param_system_type; param_t _param_system_type;
param_t _param_use_hil_gps; 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. * Send one parameter.
* *

4
src/modules/mavlink/mavlink_stream.cpp
View File

@ -44,10 +44,10 @@
#include "mavlink_main.h" #include "mavlink_main.h"
MavlinkStream::MavlinkStream() : MavlinkStream::MavlinkStream() :
_last_sent(0), next(nullptr),
_channel(MAVLINK_COMM_0), _channel(MAVLINK_COMM_0),
_interval(1000000), _interval(1000000),
next(nullptr) _last_sent(0)
{ {
} }