Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HAL_Linux: don't clear buffers on no baud change

This commit is contained in:
Andrew Tridgell 2018-07-12 09:36:45 +10:00
parent fe07a73935
commit 1d1af5fd68
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/AP_HAL_Linux/UARTDriver.cpp
View File

@ -86,9 +86,20 @@ void UARTDriver::begin(uint32_t b, uint16_t rxS, uint16_t txS)
_device->set_speed(b); _device->set_speed(b);
_baudrate = b; bool clear_buffers = false;
if (b != 0) {
if (_baudrate != b && hal.console != this) {
clear_buffers = true;
}
_baudrate = b;
}
_allocate_buffers(rxS, txS); _allocate_buffers(rxS, txS);
if (clear_buffers) {
_readbuf.clear();
_writebuf.clear();
}
} }
void UARTDriver::_allocate_buffers(uint16_t rxS, uint16_t txS) void UARTDriver::_allocate_buffers(uint16_t rxS, uint16_t txS)
@ -108,10 +119,6 @@ void UARTDriver::_allocate_buffers(uint16_t rxS, uint16_t txS)
if (_writebuf.set_size(txS) && _readbuf.set_size(rxS)) { if (_writebuf.set_size(txS) && _readbuf.set_size(rxS)) {
_initialised = true; _initialised = true;
} }
if (hal.console != this) { // don't clear USB buffers (allows early startup messages to escape)
_readbuf.clear();
_writebuf.clear();
}
} }
void UARTDriver::_deallocate_buffers() void UARTDriver::_deallocate_buffers()