fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 06:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'usb_buf_hotfix' into ekf_params

Browse Source
This commit is contained in:
Lorenz Meier
2014-04-20 21:04:35 +02:00
parent 200bd8e3dd 906abbcbb6
commit 9cc284742e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_main.cpp
+11 -2
View File
@@ -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. /* If the wait until transmit flag is on, only transmit after we've received messages.
Otherwise, transmit all the time. */ Otherwise, transmit all the time. */
if (instance->should_transmit()) { 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) { if (ret != desired) {
// XXX do something here, but change to using FIONWRITE and OS buf size for detection warnx("TX FAIL");
} }
} }