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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
g0wfv
2017-06-01 16:40:51 +01:00
parent 9914c43e1a f90dbb5874
commit 61e21d4eb5
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DMRGateway.cpp
View File

@@ -363,6 +363,7 @@ int CDMRGateway::run()
if (connected && !m_xlx1Connected) { if (connected && !m_xlx1Connected) {
if (m_xlx1Startup != 4000U) { if (m_xlx1Startup != 4000U) {
writeXLXLink(m_xlx1Id, m_xlx1Startup, m_xlxNetwork1); writeXLXLink(m_xlx1Id, m_xlx1Startup, m_xlxNetwork1);
LogMessage("XLX-1, Linking to reflector %u at startup", m_xlx1Startup);
if (voice1 != NULL) if (voice1 != NULL)
voice1->linkedTo(m_xlx1Startup); voice1->linkedTo(m_xlx1Startup);
} }
@@ -370,8 +371,11 @@ int CDMRGateway::run()
m_xlx1Reflector = m_xlx1Startup; m_xlx1Reflector = m_xlx1Startup;
m_xlx1Connected = true; m_xlx1Connected = true;
} else if (!connected && m_xlx1Connected) { } else if (!connected && m_xlx1Connected) {
if (m_xlx1Reflector != 4000U && voice1 != NULL) if (m_xlx1Reflector != 4000U) {
voice1->unlinked(); LogMessage("XLX-1, Unlinking due to loss of connection");
if (voice1 != NULL)
voice1->unlinked();
}
m_xlx1Reflector = 4000U; m_xlx1Reflector = 4000U;
m_xlx1Connected = false; m_xlx1Connected = false;
@@ -383,6 +387,7 @@ int CDMRGateway::run()
if (connected && !m_xlx2Connected) { if (connected && !m_xlx2Connected) {
if (m_xlx2Startup != 4000U) { if (m_xlx2Startup != 4000U) {
writeXLXLink(m_xlx2Id, m_xlx2Startup, m_xlxNetwork2); writeXLXLink(m_xlx2Id, m_xlx2Startup, m_xlxNetwork2);
LogMessage("XLX-2, Linking to reflector %u at startup", m_xlx2Startup);
if (voice2 != NULL) if (voice2 != NULL)
voice2->linkedTo(m_xlx2Startup); voice2->linkedTo(m_xlx2Startup);
} }
@@ -390,8 +395,11 @@ int CDMRGateway::run()
m_xlx2Reflector = m_xlx2Startup; m_xlx2Reflector = m_xlx2Startup;
m_xlx2Connected = true; m_xlx2Connected = true;
} else if (!connected && m_xlx2Connected) { } else if (!connected && m_xlx2Connected) {
if (m_xlx2Reflector != 4000U && voice2 != NULL) if (m_xlx2Reflector != 4000U) {
voice2->unlinked(); LogMessage("XLX-2, Unlinking due to loss of connection");
if (voice2 != NULL)
voice2->unlinked();
}
m_xlx2Reflector = 4000U; m_xlx2Reflector = 4000U;
m_xlx2Connected = false; m_xlx2Connected = false;