diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-05-30 22:13:57 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-05-30 22:13:57 +0200 |
| commit | 612b25711f6c24abbddf0be84adc3368e73c0d43 (patch) | |
| tree | d8d61141a3ba64c3ad3837459e3edfef531cc994 /src/modules | |
| parent | 0bdde089243bbf7e3651f9535f5c847f894e0ac7 (diff) | |
| parent | efb44969d584e1b2613d96a795fc94a3ef728d9a (diff) | |
| download | px4-firmware-612b25711f6c24abbddf0be84adc3368e73c0d43.tar.gz px4-firmware-612b25711f6c24abbddf0be84adc3368e73c0d43.tar.bz2 px4-firmware-612b25711f6c24abbddf0be84adc3368e73c0d43.zip | |
Merge branch 'ubx_no_debug' into inav_gps_delay
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index bb1ad86ef..28cdf65a3 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -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 */ if (!ioctl(uart, FIONWRITE, (unsigned long)&buf_free)) { - if (desired > buf_free) { - desired = buf_free; + if (buf_free < desired) { + /* we don't want to send anything just in half, so return */ + return; } } @@ -222,6 +223,8 @@ Mavlink::Mavlink() : _subscriptions(nullptr), _streams(nullptr), _mission_pub(-1), + _mode(MAVLINK_MODE_NORMAL), + _total_counter(0), _verbose(false), _forwarding_on(false), _passing_on(false), |