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

Add extra debugging to D-Star transmissions.

Browse source
This commit is contained in:
Jonathan Naylor 2016-07-13 07:19:08 +01:00
parent 83e65173a9
commit 33d78bc3bd
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
DStarControl.cpp
View file

@ -473,12 +473,12 @@ void CDStarControl::writeNetwork()
m_ackTimer.stop(); m_ackTimer.stop();
m_netFrames = 0U; m_netFrames = 0U;
m_netLost = 0U; m_netLost = 0U;
m_netN = 0U; m_netN = 20U;
m_netBits = 1U; m_netBits = 1U;
m_netErrs = 0U; m_netErrs = 0U;
writeQueueHeaderNet(data); writeQueueHeaderNet(data);
@ -536,12 +536,14 @@ void CDStarControl::writeNetwork()
m_netErrs += errors; m_netErrs += errors;
m_netBits += 48U; m_netBits += 48U;
m_netN = n;
LogDebug("D-Star, audio sequence no. %u, errs: %u/48", m_netN, errors);
// Regenerate the sync // Regenerate the sync
if (n == 0U) if (n == 0U)
CSync::addDStarSync(data + 2U); CSync::addDStarSync(data + 2U);
m_netN = n;
m_packetTimer.start(); m_packetTimer.start();
m_netFrames++; m_netFrames++;

19
Modem.cpp
View file

@ -419,14 +419,17 @@ void CModem::clock(unsigned int ms)
if (m_debug) { if (m_debug) {
switch (buffer[3U]) { switch (buffer[3U]) {
case MMDVM_DSTAR_HEADER: case MMDVM_DSTAR_HEADER:
LogDebug("D-Star header space reported = %u", m_dstarSpace);
CUtils::dump(1U, "TX D-Star Header", m_buffer, len); CUtils::dump(1U, "TX D-Star Header", m_buffer, len);
m_dstarSpace -= 4U; m_dstarSpace -= 4U;
break; break;
case MMDVM_DSTAR_DATA: case MMDVM_DSTAR_DATA:
LogDebug("D-Star data space reported = %u", m_dstarSpace);
CUtils::dump(1U, "TX D-Star Data", m_buffer, len); CUtils::dump(1U, "TX D-Star Data", m_buffer, len);
m_dstarSpace -= 1U; m_dstarSpace -= 1U;
break; break;
default: default:
LogDebug("D-Star EOT space reported = %u", m_dstarSpace);
CUtils::dump(1U, "TX D-Star EOT", m_buffer, len); CUtils::dump(1U, "TX D-Star EOT", m_buffer, len);
m_dstarSpace -= 1U; m_dstarSpace -= 1U;
break; break;
@ -574,10 +577,18 @@ bool CModem::writeDStarData(const unsigned char* data, unsigned int length)
buffer[1U] = length + 2U; buffer[1U] = length + 2U;
switch (data[0U]) { switch (data[0U]) {
case TAG_HEADER: buffer[2U] = MMDVM_DSTAR_HEADER; break; case TAG_HEADER:
case TAG_DATA: buffer[2U] = MMDVM_DSTAR_DATA; break; buffer[2U] = MMDVM_DSTAR_HEADER;
case TAG_EOT: buffer[2U] = MMDVM_DSTAR_EOT; break; break;
default: return false; case TAG_DATA:
buffer[2U] = MMDVM_DSTAR_DATA;
break;
case TAG_EOT:
buffer[2U] = MMDVM_DSTAR_EOT;
break;
default:
CUtils::dump(2U, "Unknown D-Star packet type", data, length);
return false;
} }
::memcpy(buffer + 3U, data + 1U, length - 1U); ::memcpy(buffer + 3U, data + 1U, length - 1U);