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

Merge pull request #15 from g0wfv/develop

Browse Source 
Add status message to XLX via PC to 5000 +/- base
This commit is contained in:
Jonathan Naylor
2017-06-01 22:38:36 +01:00
committed by GitHub
parent f90dbb5874 b92b119e8d
commit a232addbde
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
DMRGateway.cpp
View File

@@ -425,13 +425,18 @@ int CDMRGateway::run()
m_xlxNetwork2->write(data); m_xlxNetwork2->write(data);
status[slotNo] = DMRGWS_XLXREFLECTOR2; status[slotNo] = DMRGWS_XLXREFLECTOR2;
timer[slotNo]->start(); timer[slotNo]->start();
} else if (flco == FLCO_USER_USER && slotNo == m_xlx1Slot && dstId >= m_xlx1Base && dstId <= (m_xlx1Base + 26U)) { } else if ((dstId <= (m_xlx1Base + 26U) || dstId == (m_xlx1Base + 1000U)) && flco == FLCO_USER_USER && slotNo == m_xlx1Slot && dstId >= m_xlx1Base) {
dstId += 4000U; dstId += 4000U;
dstId -= m_xlx1Base; dstId -= m_xlx1Base;
if (dstId != m_xlx1Reflector) { if (dstId != m_xlx1Reflector) {
if (dstId == 4000U) { if (dstId == 4000U) {
LogMessage("XLX-1, Unlinking"); LogMessage("XLX-1, Unlinking");
} else if (dstId == 5000U) {
if (m_xlx1Reflector != 4000U)
voice1->linkedTo(m_xlx1Reflector);
else
voice1->unlinked();
} else { } else {
if (m_xlx1Reflector != 4000U) if (m_xlx1Reflector != 4000U)
writeXLXLink(srcId, 4000U, m_xlxNetwork1); writeXLXLink(srcId, 4000U, m_xlxNetwork1);
@@ -439,9 +444,11 @@ int CDMRGateway::run()
LogMessage("XLX-1, Linking to reflector %u", dstId); LogMessage("XLX-1, Linking to reflector %u", dstId);
} }
writeXLXLink(srcId, dstId, m_xlxNetwork1); if (dstId != 5000U ) {
m_xlx1Reflector = dstId; writeXLXLink(srcId, dstId, m_xlxNetwork1);
changed = true; m_xlx1Reflector = dstId;
changed = true;
}
} }
status[slotNo] = DMRGWS_XLXREFLECTOR1; status[slotNo] = DMRGWS_XLXREFLECTOR1;
@@ -459,13 +466,18 @@ int CDMRGateway::run()
} }
} }
} }
} else if (flco == FLCO_USER_USER && slotNo == m_xlx2Slot && dstId >= m_xlx2Base && dstId <= (m_xlx2Base + 26U)) { } else if ((dstId <= (m_xlx2Base + 26U) || dstId == (m_xlx2Base + 1000U)) && flco == FLCO_USER_USER && slotNo == m_xlx2Slot && dstId >= m_xlx2Base) {
dstId += 4000U; dstId += 4000U;
dstId -= m_xlx2Base; dstId -= m_xlx2Base;
if (dstId != m_xlx2Reflector) { if (dstId != m_xlx2Reflector) {
if (dstId == 4000U) { if (dstId == 4000U) {
LogMessage("XLX-2, Unlinking"); LogMessage("XLX-2, Unlinking");
} else if (dstId == 5000U) {
if (m_xlx2Reflector != 4000U)
voice2->linkedTo(m_xlx2Reflector);
else
voice2->unlinked();
} else { } else {
if (m_xlx2Reflector != 4000U) if (m_xlx2Reflector != 4000U)
writeXLXLink(srcId, 4000U, m_xlxNetwork2); writeXLXLink(srcId, 4000U, m_xlxNetwork2);
@@ -473,9 +485,11 @@ int CDMRGateway::run()
LogMessage("XLX-2, Linking to reflector %u", dstId); LogMessage("XLX-2, Linking to reflector %u", dstId);
} }
writeXLXLink(srcId, dstId, m_xlxNetwork2); if (dstId != 5000U ) {
m_xlx2Reflector = dstId; writeXLXLink(srcId, dstId, m_xlxNetwork2);
changed = true; m_xlx2Reflector = dstId;
changed = true;
}
} }
status[slotNo] = DMRGWS_XLXREFLECTOR2; status[slotNo] = DMRGWS_XLXREFLECTOR2;