ShaYmez/MMDVM_CM
1
0
Fork 0
mirror of https://github.com/ShaYmez/MMDVM_CM.git synced 2025-09-03 13:47:47 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40 from nostar/master

Browse Source 
When not connected to XLX, pass P25 destination TG and DMR destinatio…
This commit is contained in:
Andy CA6JAU 2020-06-19 14:23:48 -04:00 committed by GitHub
commit 98a6994f30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
P252DMR/P252DMR.cpp
View File

@ -375,6 +375,11 @@ int CP252DMR::run()
m_conv.putP25Header(); m_conv.putP25Header();
} }
m_p25Dst = dstId; m_p25Dst = dstId;
if(!m_xlxConnected){
m_dstid = m_p25Dst;
}
} else if (m_p25Frame[0U] == 0x66U && !m_p25info) { } else if (m_p25Frame[0U] == 0x66U && !m_p25info) {
srcId = (m_p25Frame[1U] << 16) & 0xFF0000U; srcId = (m_p25Frame[1U] << 16) & 0xFF0000U;
srcId |= (m_p25Frame[2U] << 8) & 0x00FF00U; srcId |= (m_p25Frame[2U] << 8) & 0x00FF00U;
@ -646,6 +651,11 @@ int CP252DMR::run()
if (p25Watch.elapsed() > P25_FRAME_PER) { if (p25Watch.elapsed() > P25_FRAME_PER) {
unsigned int p25FrameType = m_conv.getP25(m_p25Frame); unsigned int p25FrameType = m_conv.getP25(m_p25Frame);
m_p25Src = m_dmrSrc; m_p25Src = m_dmrSrc;
if(!m_xlxConnected){
m_p25Dst = m_dmrDst;
}
if(p25FrameType == TAG_HEADER) { if(p25FrameType == TAG_HEADER) {
p25_cnt = 0U; p25_cnt = 0U;
p25Watch.start(); p25Watch.start();