juribeparada/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/juribeparada/MMDVM_HS.git synced 2026-04-05 06:15:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adding Jonathan’s ring buffer to serial repeater

Browse source
This commit is contained in:
Andy CA6JAU 2017-07-04 14:27:57 -04:00
parent eefda572bf
commit 6486bf4efc
4 changed files with 76 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
SerialPort.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013,2015,2016 by Jonathan Naylor G4KLX
* Copyright (C) 2013,2015,2016,2017 by Jonathan Naylor G4KLX
* Copyright (C) 2016 by Colin Durbridge G4EML
* Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
*
@ -90,7 +90,8 @@ CSerialPort::CSerialPort() :
m_buffer(),
m_ptr(0U),
m_len(0U),
m_debug(false)
m_debug(false),
m_repeat()
{
}
@ -536,12 +537,11 @@ void CSerialPort::process()
}
break;
#if defined(SERIAL_REPEATER)
case MMDVM_SERIAL:
writeInt(3U, m_buffer + 3U, m_len - 3U);
for (uint8_t i = 3U; i < m_len; i++)
m_repeat.put(m_buffer[i]);
break;
#endif
default:
// Handle this, send a NAK back
sendNAK(1U);
@ -555,7 +555,20 @@ void CSerialPort::process()
}
#if defined(SERIAL_REPEATER)
// Drain any incoming serial data
// Write any outgoing serial data
uint16_t space = m_repeat.getData();
if (space > 0U) {
int avail = availableForWriteInt(3U);
if (avail < space)
space = avail;
for (uint16_t i = 0U; i < space; i++) {
uint8_t c = m_repeat.get();
writeInt(3U, &c, 1U);
}
}
// Read any incoming serial data
while (availableInt(3U))
readInt(3U);
#endif