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

HAL_SITL: read in larger chunks

This commit is contained in:
Andrew Tridgell 2016-01-10 17:31:50 +11:00
parent 655f57ad01
commit deb0b9c197
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/AP_HAL_SITL/UARTDriver.cpp
View File

@ -400,18 +400,19 @@ void UARTDriver::_timer_tick(void)
}
}
if (_readbuffer.space() == 0) {
uint32_t space = _readbuffer.space();
if (space == 0) {
return;
}
ssize_t nread;
char c;
char buf[space];
ssize_t nread = 0;
if (!_use_send_recv) {
int fd = _console?0:_fd;
nread = ::read(fd, &c, 1);
nread = ::read(fd, buf, space);
} else {
if (_select_check(_fd)) {
nread = recv(_fd, &c, 1, MSG_DONTWAIT);
nread = recv(_fd, buf, space, MSG_DONTWAIT);
if (nread <= 0) {
// the socket has reached EOF
close(_fd);
@ -424,8 +425,8 @@ void UARTDriver::_timer_tick(void)
nread = 0;
}
}
if (nread == 1) {
_readbuffer.write((uint8_t *)&c, 1);
if (nread > 0) {
_readbuffer.write((uint8_t *)buf, nread);
}
}