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

Change conversion method

Browse Source 
1
This commit is contained in:
Tony Corbett, G0WFV
2017-10-04 16:18:29 +01:00
parent 1d08926da2
commit f4f5ec4024
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
DMRGateway.cpp
View File

@@ -366,16 +366,14 @@ int CDMRGateway::run()
if (connected && !m_xlxConnected) { if (connected && !m_xlxConnected) {
if (m_xlxReflector >= 4001U && m_xlxReflector <= 4026U) { if (m_xlxReflector >= 4001U && m_xlxReflector <= 4026U) {
writeXLXLink(m_xlxId, m_xlxReflector, m_xlxNetwork); writeXLXLink(m_xlxId, m_xlxReflector, m_xlxNetwork);
unsigned int ascii = m_xlxReflector - 3936; char c = ('A' + (m_xlxReflector % 100U)) - 1U;
char ch = (char)ascii; LogMessage("XLX, Linking to reflector XLX%03u %c", m_xlxNumber, c);
LogMessage("XLX, Linking to reflector XLX%03u %c", m_xlxNumber, ch);
if (voice != NULL) if (voice != NULL)
voice->linkedTo(m_xlxNumber, m_xlxReflector); voice->linkedTo(m_xlxNumber, m_xlxReflector);
} else if (m_xlxRoom >= 4001U && m_xlxRoom <= 4026U) { } else if (m_xlxRoom >= 4001U && m_xlxRoom <= 4026U) {
writeXLXLink(m_xlxId, m_xlxRoom, m_xlxNetwork); writeXLXLink(m_xlxId, m_xlxRoom, m_xlxNetwork);
unsigned int ascii = m_xlxRoom - 3936; char c = ('A' + (m_xlxRoom % 100U)) - 1U;
char ch = (char)ascii; LogMessage("XLX, Linking to reflector XLX%03u %c", m_xlxNumber, c);
LogMessage("XLX, Linking to reflector XLX%03u %c", m_xlxNumber, ch);
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;
@@ -404,9 +402,8 @@ int CDMRGateway::run()
if (m_xlxNumber != m_xlxStartup) { if (m_xlxNumber != m_xlxStartup) {
if (m_xlxStartup > 0U) { if (m_xlxStartup > 0U) {
m_xlxReflector = 4000U; m_xlxReflector = 4000U;
unsigned int ascii = m_xlxRoom - 3936; char c = ('A' + (m_xlxRoom % 100U)) - 1U;
char ch = (char)ascii; LogMessage("XLX, Re-linking to startup reflector XLX%03u %c due to RF inactivity timeout", m_xlxNumber, c);
LogMessage("XLX, Re-linking to startup reflector XLX%03u %c due to RF inactivity timeout", m_xlxNumber, ch);
linkXLX(m_xlxStartup); linkXLX(m_xlxStartup);
} else { } else {
LogMessage("XLX, Unlinking from XLX%03u due to RF inactivity timeout", m_xlxNumber); LogMessage("XLX, Unlinking from XLX%03u due to RF inactivity timeout", m_xlxNumber);
@@ -418,13 +415,11 @@ int CDMRGateway::run()
if (m_xlxRoom >= 4001U && m_xlxRoom <= 4026U) { if (m_xlxRoom >= 4001U && m_xlxRoom <= 4026U) {
writeXLXLink(m_xlxId, m_xlxRoom, m_xlxNetwork); writeXLXLink(m_xlxId, m_xlxRoom, m_xlxNetwork);
unsigned int ascii = m_xlxRoom - 3936; char c = ('A' + (m_xlxRoom % 100U)) - 1U;
char ch = (char)ascii; LogMessage("XLX, Re-linking to startup reflector XLX%03u %c due to RF inactivity timeout", m_xlxNumber, c);
LogMessage("XLX, Re-linking to startup reflector XLX%03u %c due to RF inactivity timeout", m_xlxNumber, ch);
} else if (m_xlxReflector >= 4001U && m_xlxReflector <= 4026U) { } else if (m_xlxReflector >= 4001U && m_xlxReflector <= 4026U) {
unsigned int ascii = m_xlxReflector - 3936; char c = ('A' + (m_xlxReflector % 100U)) - 1U;
char ch = (char)ascii; LogMessage("XLX, Unlinking from reflector XLX%03u %c due to RF inactivity timeout", m_xlxNumber, c);
LogMessage("XLX, Unlinking from reflector XLX%03u %c due to RF inactivity timeout", m_xlxNumber, ch);
} }
m_xlxReflector = m_xlxRoom; m_xlxReflector = m_xlxRoom;
@@ -464,17 +459,15 @@ int CDMRGateway::run()
if (dstId == 4000U) { if (dstId == 4000U) {
writeXLXLink(srcId, 4000U, m_xlxNetwork); writeXLXLink(srcId, 4000U, m_xlxNetwork);
m_xlxReflector = 4000U; m_xlxReflector = 4000U;
unsigned int ascii = m_xlxRoom - 3936; char c = ('A' + (m_xlxRoom % 100U)) - 1U;
char ch = (char)ascii; LogMessage("XLX, Unlinking from reflector XLX%03u %c", m_xlxNumber, c);
LogMessage("XLX, Unlinking from reflector XLX%03u %c", m_xlxNumber, ch);
} else if (dstId != 5000U) { } else if (dstId != 5000U) {
if (m_xlxReflector != 4000U) if (m_xlxReflector != 4000U)
writeXLXLink(srcId, 4000U, m_xlxNetwork); writeXLXLink(srcId, 4000U, m_xlxNetwork);
writeXLXLink(srcId, dstId, m_xlxNetwork); writeXLXLink(srcId, dstId, m_xlxNetwork);
m_xlxReflector = dstId; m_xlxReflector = dstId;
unsigned int ascii = dstId - 3936; char c = ('A' + (dstId % 100U)) - 1U;
char ch = (char)ascii; LogMessage("XLX, Linking to reflector XLX%03u %c", m_xlxNumber, c);
LogMessage("XLX, Linking to reflector XLX%03u %c", m_xlxNumber, ch);
} }
if (m_xlxReflector != m_xlxRoom) if (m_xlxReflector != m_xlxRoom)