From a5c61cce2442a8ff3ab597c002b91bf9952fb93b Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 26 Apr 2016 19:10:45 +0100 Subject: [PATCH] Fix the elapsed counters. --- DMRSlot.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 497c4bb..3a6899c 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -400,6 +400,8 @@ void CDMRSlot::writeModem(unsigned char *data) m_rfBits += 141U; + m_rfFrames++; + data[0U] = TAG_DATA; data[1U] = 0x00U; @@ -435,6 +437,8 @@ void CDMRSlot::writeModem(unsigned char *data) m_rfBits += 141U; + m_rfFrames++; + data[0U] = TAG_DATA; data[1U] = 0x00U; @@ -515,6 +519,8 @@ void CDMRSlot::writeModem(unsigned char *data) m_rfBits += 141U; + m_rfFrames++; + data[0U] = TAG_DATA; data[1U] = 0x00U; @@ -818,8 +824,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) for (unsigned int i = 0U; i < 8U; i++) writeQueueNet(data); - writeEndNet(); - #if defined(DUMP_DMR) writeFile(data); closeFile(); @@ -828,6 +832,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) m_netFrames += 2U; if (m_netBits == 0U) m_netBits = 1U; LogMessage("DMR Slot %u, received network end of voice transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", m_slotNo, float(m_netFrames) / 16.667F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); + + writeEndNet(); } else if (dataType == DT_DATA_HEADER) { if (m_netState == RS_NET_DATA) return; @@ -943,6 +949,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) writeQueueNet(data); m_packetTimer.start(); + m_netFrames++; // Save details in case we need to infill data @@ -992,6 +999,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) writeQueueNet(data); m_packetTimer.start(); + m_netFrames++; // Save details in case we need to infill data