Fix the elapsed counters.

This commit is contained in:
Jonathan Naylor
2016-04-26 19:10:45 +01:00
parent 029c7cf8f9
commit a5c61cce24

View File

@@ -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