From 8846123afb77e1dd3d0bfb092fdc40d0806fb430 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 29 Feb 2016 06:51:34 +0000 Subject: [PATCH] Fix the RF count of N. --- DMRSlot.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 1e304f6..6980e03 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -383,6 +383,8 @@ void CDMRSlot::writeModem(unsigned char *data) } } else { if (m_rfState == RS_RF_AUDIO) { + m_rfN = data[1U] & 0x0FU; + CDMREMB emb; emb.putData(data + 2U); @@ -393,8 +395,7 @@ void CDMRSlot::writeModem(unsigned char *data) unsigned char fid = m_rfLC->getFID(); if (fid == FID_ETSI || fid == FID_DMRA) { 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, n, errors); + LogDebug("DMR Slot %u, audio sequence no. %u, errs: %u/141", m_slotNo, m_rfN, errors); m_rfErrs += errors; } @@ -448,6 +449,8 @@ void CDMRSlot::writeModem(unsigned char *data) writeNetworkRF(start, DT_VOICE_LC_HEADER); + m_rfN = data[1U] & 0x0FU; + // Regenerate the EMB emb.getData(data + 2U); @@ -455,8 +458,7 @@ void CDMRSlot::writeModem(unsigned char *data) unsigned char fid = m_rfLC->getFID(); if (fid == FID_ETSI || fid == FID_DMRA) { 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, n, errors); + LogDebug("DMR Slot %u, audio sequence no. %u, errs: %u/141", m_slotNo, m_rfN, errors); m_rfErrs += errors; }