MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 00:35:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

More intelligent D-Star space checking in the MMDVM driver.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-01-18 19:37:08 +00:00
parent 25c34af20e
commit 2cef149785
1 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Modem.cpp
View File

@@ -317,21 +317,21 @@ void CModem::clock(unsigned int ms)
bool adcOverflow = (m_buffer[5U] & 0x02U) == 0x02U; bool adcOverflow = (m_buffer[5U] & 0x02U) == 0x02U;
if (adcOverflow) if (adcOverflow)
LogWarning("MMDVM ADC levels have overflowed"); LogError("MMDVM ADC levels have overflowed");
bool rxOverflow = (m_buffer[5U] & 0x04U) == 0x04U; bool rxOverflow = (m_buffer[5U] & 0x04U) == 0x04U;
if (rxOverflow) if (rxOverflow)
LogWarning("RX buffer has overflowed"); LogError("MMDVM RX buffer has overflowed");
bool txOverflow = (m_buffer[5U] & 0x08U) == 0x08U; bool txOverflow = (m_buffer[5U] & 0x08U) == 0x08U;
if (txOverflow) if (txOverflow)
LogWarning("TX buffer has overflowed"); LogError("MMDVM TX buffer has overflowed");
m_dstarSpace = m_buffer[6U]; m_dstarSpace = m_buffer[6U];
m_dmrSpace1 = m_buffer[7U]; m_dmrSpace1 = m_buffer[7U];
m_dmrSpace2 = m_buffer[8U]; m_dmrSpace2 = m_buffer[8U];
m_ysfSpace = m_buffer[9U]; m_ysfSpace = m_buffer[9U];
// LogMessage("tx=%d, space=%u,%u,%u,%u", int(m_tx), m_dstarSpace, m_dmrSpace1, m_dmrSpace2, m_ysfSpace); // LogMessage("status=%02X, tx=%d, space=%u,%u,%u,%u", m_buffer[5U], int(m_tx), m_dstarSpace, m_dmrSpace1, m_dmrSpace2, m_ysfSpace);
} }
break; break;
@@ -364,28 +364,37 @@ void CModem::clock(unsigned int ms)
} }
if (m_dstarSpace > 1U && !m_txDStarData.isEmpty()) { if (m_dstarSpace > 1U && !m_txDStarData.isEmpty()) {
unsigned char len = 0U; unsigned char buffer[2U];
m_txDStarData.getData(&len, 1U); m_txDStarData.peek(buffer, 2U);
m_txDStarData.getData(m_buffer, len);
if (m_debug) { if ((buffer[1U] == TAG_HEADER && m_dstarSpace > 4U) ||
if (len > (DSTAR_FRAME_LENGTH_BYTES + 3U)) (buffer[1U] == TAG_DATA && m_dstarSpace > 1U) ||
CUtils::dump(1U, "TX D-Star Header", m_buffer, len); (buffer[1U] == TAG_EOT && m_dstarSpace > 1U)) {
else if (len == (DSTAR_FRAME_LENGTH_BYTES + 3U)) unsigned char len = 0U;
CUtils::dump(1U, "TX D-Star Data", m_buffer, len); m_txDStarData.getData(&len, 1U);
else m_txDStarData.getData(m_buffer, len);
CUtils::dump(1U, "TX D-Star EOT", m_buffer, len);
if (m_debug) {
switch (buffer[1U]) {
case TAG_HEADER:
CUtils::dump(1U, "TX D-Star Header", m_buffer, len);
m_dstarSpace -= 4U;
break;
case TAG_DATA:
CUtils::dump(1U, "TX D-Star Data", m_buffer, len);
m_dstarSpace -= 1U;
break;
default:
CUtils::dump(1U, "TX D-Star EOT", m_buffer, len);
m_dstarSpace -= 1U;
break;
}
}
int ret = m_serial.write(m_buffer, len);
if (ret != int(len))
LogWarning("Error when writing D-Star data to the MMDVM");
} }
int ret = m_serial.write(m_buffer, len);
if (ret != int(len))
LogWarning("Error when writing D-Star data to the MMDVM");
// Headers take four slots in the queues in the modem
if (len > (DSTAR_FRAME_LENGTH_BYTES + 3U))
m_dstarSpace -= 4U;
else
m_dstarSpace -= 1U;
} }
if (m_dmrSpace1 > 1U && !m_txDMRData1.isEmpty()) { if (m_dmrSpace1 > 1U && !m_txDMRData1.isEmpty()) {