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

Fix the RF count of N.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-02-29 06:51:34 +00:00
parent b82b802e6e
commit 8846123afb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DMRSlot.cpp
View File

@@ -383,6 +383,8 @@ void CDMRSlot::writeModem(unsigned char *data)
} }
} else { } else {
if (m_rfState == RS_RF_AUDIO) { if (m_rfState == RS_RF_AUDIO) {
m_rfN = data[1U] & 0x0FU;
CDMREMB emb; CDMREMB emb;
emb.putData(data + 2U); emb.putData(data + 2U);
@@ -393,8 +395,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) {
unsigned int errors = m_fec.regenerateDMR(data + 2U); unsigned int errors = m_fec.regenerateDMR(data + 2U);
unsigned char n = data[1U] & 0x0FU; 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, n, errors);
m_rfErrs += errors; m_rfErrs += errors;
} }
@@ -448,6 +449,8 @@ void CDMRSlot::writeModem(unsigned char *data)
writeNetworkRF(start, DT_VOICE_LC_HEADER); writeNetworkRF(start, DT_VOICE_LC_HEADER);
m_rfN = data[1U] & 0x0FU;
// Regenerate the EMB // Regenerate the EMB
emb.getData(data + 2U); emb.getData(data + 2U);
@@ -455,8 +458,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) {
unsigned int errors = m_fec.regenerateDMR(data + 2U); unsigned int errors = m_fec.regenerateDMR(data + 2U);
unsigned char n = data[1U] & 0x0FU; 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, n, errors);
m_rfErrs += errors; m_rfErrs += errors;
} }