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

This commit is contained in:
Doug McLain 2020-06-20 00:32:57 -04:00
parent 0d21a6614e
commit bd35aad04a

View File

@ -377,8 +377,13 @@ int CP252DMR::run()
m_p25Dst = dstId;
if(!m_xlxConnected){
if(m_p25Dst == 20U) {
m_dstid = m_conf.getDMRDstId();
}
else{
m_dstid = m_p25Dst;
}
}
} else if (m_p25Frame[0U] == 0x66U && !m_p25info) {
srcId = (m_p25Frame[1U] << 16) & 0xFF0000U;
@ -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();