From 1d4443eafdc0fba5d2d0f82c3e70e9fc0b87f13d Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Mon, 14 Mar 2016 20:43:04 +0000
Subject: [PATCH] Changes to improve DMR data efficiency.

---
 DMRDataHeader.cpp | 4 ++++
 DMRSlot.cpp       | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/DMRDataHeader.cpp b/DMRDataHeader.cpp
index 444a385..99ac789 100644
--- a/DMRDataHeader.cpp
+++ b/DMRDataHeader.cpp
@@ -184,8 +184,12 @@ void CDMRDataHeader::getTerminator(unsigned char* bytes) const
 	payload[10U] = parity[1U] ^ TERMINATOR_WITH_LC_CRC_MASK[1U];
 	payload[11U] = parity[0U] ^ TERMINATOR_WITH_LC_CRC_MASK[2U];
 
+	CUtils::dump(1U, "Data Terminator payload", payload, 12U);
+
 	CBPTC19696 bptc;
 	bptc.encode(payload, bytes);
+
+	CUtils::dump(1U, "Data Terminator bytes", bytes, DMR_FRAME_LENGTH_BYTES);
 }
 
 CDMRDataHeader& CDMRDataHeader::operator=(const CDMRDataHeader& header)
diff --git a/DMRSlot.cpp b/DMRSlot.cpp
index a719ec1..2daf625 100644
--- a/DMRSlot.cpp
+++ b/DMRSlot.cpp
@@ -216,9 +216,6 @@ void CDMRSlot::writeModem(unsigned char *data)
 
 			writeEndRF();
 		} else if (dataType == DT_DATA_HEADER) {
-			if (m_rfState == RS_RF_DATA)
-				return;
-
 			CDMRDataHeader dataHeader;
 			bool valid = dataHeader.put(data + 2U);
 			if (!valid) {
@@ -754,9 +751,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 		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));
 	} else if (dataType == DT_DATA_HEADER) {
-		if (m_netState == RS_NET_DATA)
-			return;
-
 		CDMRDataHeader dataHeader;
 		bool valid = dataHeader.put(data + 2U);
 		if (!valid) {