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

Merge pull request #1026 from PX4/mavlink_fixes

Browse Source 
Minor fixes to MAVLink
This commit is contained in:
Lorenz Meier
2014-05-29 23:32:21 -07:00
parent 58c9d7a723 46301f753d
commit 861249d571
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_main.cpp
+5 -2
View File
@@ -190,8 +190,9 @@ mavlink_send_uart_bytes(mavlink_channel_t channel, const uint8_t *ch, int length
/* check if there is space in the buffer, let it overflow else */ /* check if there is space in the buffer, let it overflow else */
if (!ioctl(uart, FIONWRITE, (unsigned long)&buf_free)) { if (!ioctl(uart, FIONWRITE, (unsigned long)&buf_free)) {
if (desired > buf_free) { if (buf_free < desired) {
desired = buf_free; /* we don't want to send anything just in half, so return */
return;
} }
} }
@@ -222,6 +223,8 @@ Mavlink::Mavlink() :
_subscriptions(nullptr), _subscriptions(nullptr),
_streams(nullptr), _streams(nullptr),
_mission_pub(-1), _mission_pub(-1),
_mode(MAVLINK_MODE_NORMAL),
_total_counter(0),
_verbose(false), _verbose(false),
_forwarding_on(false), _forwarding_on(false),
_passing_on(false), _passing_on(false),