Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Drain the serial queue of invalid data.

Browse source
This commit is contained in:
Jonathan Naylor 2016-03-16 08:08:28 +00:00
parent 702ea80edf
commit 40def7dd70
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Modem.cpp
View file

@ -867,19 +867,21 @@ RESP_TYPE_MMDVM CModem::getResponse(unsigned char *buffer, unsigned int& length)
assert(buffer != NULL);
// Get the start of the frame or nothing at all
int ret = m_serial.read(buffer + 0U, 1U);
if (ret < 0) {
LogError("Error when reading from the modem");
return RTM_ERROR;
for (;;) {
int ret = m_serial.read(buffer + 0U, 1U);
if (ret < 0) {
LogError("Error when reading from the modem");
return RTM_ERROR;
}
if (ret == 0)
return RTM_TIMEOUT;
if (buffer[0U] == MMDVM_FRAME_START)
break;
}
if (ret == 0)
return RTM_TIMEOUT;
if (buffer[0U] != MMDVM_FRAME_START)
return RTM_TIMEOUT;
ret = m_serial.read(buffer + 1U, 1U);
int ret = m_serial.read(buffer + 1U, 1U);
if (ret < 0) {
LogError("Error when reading from the modem");
return RTM_ERROR;