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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index f73a58fa2..5c7eefa98 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -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); } |