fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-03 19:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dataman_state_nav_rewrite

Browse Source
This commit is contained in:
Anton Babushkin
2014-07-04 12:22:55 +02:00
parent d7394c7ef9 2389a11af1
commit 39dab45ac5
61 changed files with 1959 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_main.cpp
+2 -2
View File
@@ -470,7 +470,7 @@ Mavlink::get_instance_id()
return _instance_id;
}
const mavlink_channel_t
mavlink_channel_t
Mavlink::get_channel()
{
return _channel;
@@ -1472,7 +1472,7 @@ Mavlink::task_main(int argc, char *argv[])
write_ptr = (uint8_t*)&msg;
// Pull a single message from the buffer
int read_count = available;
size_t read_count = available;
if (read_count > sizeof(mavlink_message_t)) {
read_count = sizeof(mavlink_message_t);
}