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

Re-add debug BER displays for D-Star and DMR.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-06-01 09:43:39 +01:00
parent 96d6883fea
commit ed8ea92468
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
DMRSlot.cpp
View File

@@ -389,7 +389,7 @@ void CDMRSlot::writeModem(unsigned char *data)
unsigned char fid = m_rfLC->getFID(); unsigned char fid = m_rfLC->getFID();
if (fid == FID_ETSI || fid == FID_DMRA) { if (fid == FID_ETSI || fid == FID_DMRA) {
errors = m_fec.regenerateDMR(data + 2U); errors = m_fec.regenerateDMR(data + 2U);
// LogDebug("DMR Slot %u, audio sequence no. 0, errs: %u/141", m_slotNo, errors); LogDebug("DMR Slot %u, audio sequence no. 0, errs: %u/141", m_slotNo, errors);
m_rfErrs += errors; m_rfErrs += errors;
} }
@@ -426,7 +426,7 @@ void CDMRSlot::writeModem(unsigned char *data)
unsigned char fid = m_rfLC->getFID(); unsigned char fid = m_rfLC->getFID();
if (fid == FID_ETSI || fid == FID_DMRA) { if (fid == FID_ETSI || fid == FID_DMRA) {
errors = m_fec.regenerateDMR(data + 2U); errors = m_fec.regenerateDMR(data + 2U);
// LogDebug("DMR Slot %u, audio sequence no. %u, errs: %u/141", m_slotNo, m_rfN, errors); LogDebug("DMR Slot %u, audio sequence no. %u, errs: %u/141", m_slotNo, m_rfN, errors);
m_rfErrs += errors; m_rfErrs += errors;
} }
@@ -509,7 +509,7 @@ void CDMRSlot::writeModem(unsigned char *data)
unsigned char fid = m_rfLC->getFID(); unsigned char fid = m_rfLC->getFID();
if (fid == FID_ETSI || fid == FID_DMRA) { if (fid == FID_ETSI || fid == FID_DMRA) {
errors = m_fec.regenerateDMR(data + 2U); errors = m_fec.regenerateDMR(data + 2U);
// LogDebug("DMR Slot %u, audio sequence no. %u, errs: %u/141", m_slotNo, m_rfN, errors); LogDebug("DMR Slot %u, audio sequence no. %u, errs: %u/141", m_slotNo, m_rfN, errors);
m_rfErrs += errors; m_rfErrs += errors;
} }
@@ -942,12 +942,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
if (m_netState == RS_NET_AUDIO) { if (m_netState == RS_NET_AUDIO) {
unsigned char fid = m_netLC->getFID(); unsigned char fid = m_netLC->getFID();
if (fid == FID_ETSI || fid == FID_DMRA) { if (fid == FID_ETSI || fid == FID_DMRA)
unsigned int errors = m_fec.regenerateDMR(data + 2U); m_netErrs += m_fec.regenerateDMR(data + 2U);
// LogDebug("DMR Slot %u, audio, errs: %u/141", m_slotNo, errors);
m_netErrs += errors;
}
m_netBits += 141U; m_netBits += 141U;
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
@@ -986,12 +982,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return; return;
unsigned char fid = m_netLC->getFID(); unsigned char fid = m_netLC->getFID();
if (fid == FID_ETSI || fid == FID_DMRA) { if (fid == FID_ETSI || fid == FID_DMRA)
unsigned int errors = m_fec.regenerateDMR(data + 2U); m_netErrs += m_fec.regenerateDMR(data + 2U);
// LogDebug("DMR Slot %u, audio, errs: %u/141", m_slotNo, errors);
m_netErrs += errors;
}
m_netBits += 141U; m_netBits += 141U;
// Regenerate the embedded LC // Regenerate the embedded LC

4
DStarControl.cpp
View File

@@ -246,7 +246,7 @@ bool CDStarControl::writeModem(unsigned char *data)
if (m_rfN == 0U) if (m_rfN == 0U)
CSync::addDStarSync(data + 1U); CSync::addDStarSync(data + 1U);
// LogDebug("D-Star, audio sequence no. %u, errs: %u/48", m_rfN, errors); LogDebug("D-Star, audio sequence no. %u, errs: %u/48", m_rfN, errors);
if (m_net) if (m_net)
writeNetworkDataRF(data, errors, false); writeNetworkDataRF(data, errors, false);
@@ -355,7 +355,7 @@ bool CDStarControl::writeModem(unsigned char *data)
m_rfErrs += errors; m_rfErrs += errors;
m_rfBits += 48U; m_rfBits += 48U;
// LogDebug("D-Star, audio sequence no. %u, errs: %u/48", m_rfN, errors); LogDebug("D-Star, audio sequence no. %u, errs: %u/48", m_rfN, errors);
if (m_net) if (m_net)
writeNetworkDataRF(data, errors, false); writeNetworkDataRF(data, errors, false);