From bd35aad04a9dbe7010c950dfa3221345dddbe8f9 Mon Sep 17 00:00:00 2001
From: Doug McLain <doug@nostar.net>
Date: Sat, 20 Jun 2020 00:32:57 -0400
Subject: [PATCH] I didn't realize this until now, that P25 radios only support
 16 bit TGs.  Now when a P25 radio transmits on TG20, P252DMR will use the DMR
 Network StartupDstId TG ID from the ini file, where values higher than 65535
 can be assigned.  Also removed the 5ms sleep, which was causing continuous
 dropouts from DMR -> P25

---
 P252DMR/P252DMR.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/P252DMR/P252DMR.cpp b/P252DMR/P252DMR.cpp
index 62fffd8..e3d01f9 100644
--- a/P252DMR/P252DMR.cpp
+++ b/P252DMR/P252DMR.cpp
@@ -377,7 +377,12 @@ int CP252DMR::run()
 					m_p25Dst = dstId;
 					
 					if(!m_xlxConnected){
-						m_dstid = m_p25Dst;
+						if(m_p25Dst == 20U) {
+							m_dstid = m_conf.getDMRDstId();
+						}
+						else{
+							m_dstid = m_p25Dst;
+						}
 					}
 					
 				} else if (m_p25Frame[0U] == 0x66U && !m_p25info) {
@@ -783,15 +788,12 @@ int CP252DMR::run()
 			pollTimer.start();
 		}
 
-
 		m_dmrNetwork->clock(ms);
 
 		if (m_xlxReflectors != NULL)
 			m_xlxReflectors->clock(ms);
 
-
-		if (ms < 5U)
-			CThread::sleep(5U);
+		//if (ms < 5U) CThread::sleep(5U);
 	}
 
 	m_p25Network->close();