MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-21 05:25:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

More changes to relinking and startup.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-08-24 08:54:20 +01:00
parent d80de2c215
commit 37384c6a16
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DMRGateway.cpp
View File

@@ -363,17 +363,22 @@ int CDMRGateway::run()
if (m_xlxNetwork != NULL) { if (m_xlxNetwork != NULL) {
bool connected = m_xlxNetwork->isConnected(); bool connected = m_xlxNetwork->isConnected();
if (connected && !m_xlxConnected) { if (connected && !m_xlxConnected) {
if (m_xlxRoom >= 4001U && m_xlxRoom <= 4026U) { if (m_xlxReflector >= 4001U && m_xlxReflector <= 4026U) {
writeXLXLink(m_xlxId, m_xlxReflector, m_xlxNetwork);
LogMessage("XLX, Linking to reflector %u in XLX%03u", m_xlxReflector, m_xlxNumber);
if (voice != NULL)
voice->linkedTo(m_xlxNumber, m_xlxReflector);
} else if (m_xlxRoom >= 4001U && m_xlxRoom <= 4026U) {
writeXLXLink(m_xlxId, m_xlxRoom, m_xlxNetwork); writeXLXLink(m_xlxId, m_xlxRoom, m_xlxNetwork);
LogMessage("XLX, Linking to reflector %u in XLX%03u", m_xlxRoom, m_xlxNumber); LogMessage("XLX, Linking to reflector %u in XLX%03u", m_xlxRoom, m_xlxNumber);
if (voice != NULL) if (voice != NULL)
voice->linkedTo(m_xlxNumber, m_xlxRoom); voice->linkedTo(m_xlxNumber, m_xlxRoom);
m_xlxReflector = m_xlxRoom;
} }
m_xlxReflector = m_xlxRoom;
m_xlxConnected = true; m_xlxConnected = true;
if (m_xlxNumber == m_xlxStartup) if (m_xlxNumber == m_xlxStartup && m_xlxRoom == m_xlxReflector)
m_xlxRelink.stop(); m_xlxRelink.stop();
else else
m_xlxRelink.start(); m_xlxRelink.start();
@@ -392,6 +397,7 @@ int CDMRGateway::run()
if (m_xlxNumber != m_xlxStartup) { if (m_xlxNumber != m_xlxStartup) {
if (m_xlxStartup > 0U) { if (m_xlxStartup > 0U) {
m_xlxReflector = 4000U;
LogMessage("XLX, Re-linking to startup reflector %u in XLX%03u due to RF inactivity timeout", m_xlxRoom, m_xlxNumber); LogMessage("XLX, Re-linking to startup reflector %u in XLX%03u due to RF inactivity timeout", m_xlxRoom, m_xlxNumber);
linkXLX(m_xlxStartup); linkXLX(m_xlxStartup);
} else { } else {