diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-29 23:32:21 -0700 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-29 23:32:21 -0700 |
| commit | 861249d571dbe0d7b7c4e45ca5d18b343e90866c (patch) | |
| tree | cc6266bb835b91d88a3010fa6218a676f37f2c60 | |
| parent | 58c9d7a7239942ff2c28babcbf6db90fc95b98b3 (diff) | |
| parent | 46301f753d212b55e151a394bc9d4b3b787f35ef (diff) | |
| download | px4-firmware-861249d571dbe0d7b7c4e45ca5d18b343e90866c.tar.gz px4-firmware-861249d571dbe0d7b7c4e45ca5d18b343e90866c.tar.bz2 px4-firmware-861249d571dbe0d7b7c4e45ca5d18b343e90866c.zip | |
Merge pull request #1026 from PX4/mavlink_fixes
Minor fixes to MAVLink
| -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), |