From d4d1773b8c262cdc91a3b4332a9d59331942c4a6 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Wed, 21 Dec 2016 08:55:30 +0000
Subject: [PATCH] Improve the DMR data performance on RF.

---
 DMRSlot.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/DMRSlot.cpp b/DMRSlot.cpp
index 0905d28..7613d0b 100644
--- a/DMRSlot.cpp
+++ b/DMRSlot.cpp
@@ -133,10 +133,12 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
 	bool audioSync = (data[1U] & DMR_SYNC_AUDIO) == DMR_SYNC_AUDIO;
 
 	if (dataSync) {
-		CDMRSlotType slotType;
-		slotType.putData(data + 2U);
+		// Get the type from the packet metadata
+		unsigned char dataType = data[1U] & 0x0FU;
 
-		unsigned char dataType = slotType.getDataType();
+		CDMRSlotType slotType;
+		slotType.setColorCode(m_colorCode);
+		slotType.setDataType(dataType);
 
 		if (dataType == DT_VOICE_LC_HEADER) {
 			if (m_rfState == RS_RF_AUDIO)