diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-15 13:14:25 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-15 13:14:25 +0200 |
| commit | ba51ab2545bded39b389b7b8c2d862e10fc15b42 (patch) | |
| tree | f8a1c735951fc048448fe01e1576c038df0aacfb /src/modules/mavlink | |
| parent | 97e6090700510ba5845f50f73c3d47c79368a447 (diff) | |
| parent | ec409a1337a0f9c73cbe54776b254464e3dcd1d3 (diff) | |
| download | px4-firmware-ba51ab2545bded39b389b7b8c2d862e10fc15b42.tar.gz px4-firmware-ba51ab2545bded39b389b7b8c2d862e10fc15b42.tar.bz2 px4-firmware-ba51ab2545bded39b389b7b8c2d862e10fc15b42.zip | |
Merge branch 'ekf_params' of github.com:PX4/Firmware
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 3e44102fb..199e85305 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -189,9 +189,18 @@ mavlink_send_uart_bytes(mavlink_channel_t channel, const uint8_t *ch, int length /* If the wait until transmit flag is on, only transmit after we've received messages. Otherwise, transmit all the time. */ if (instance->should_transmit()) { - ssize_t ret = write(uart, ch, desired); + + /* 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; + } + } + + ssize_t ret = write(uart, ch, desired); if (ret != desired) { - // XXX do something here, but change to using FIONWRITE and OS buf size for detection + warnx("TX FAIL"); } } |