g4klx/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway.git synced 2026-04-05 22:45:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

XLX: Add option to overide default module in config.

Browse source
This commit is contained in:
Simon 2018-10-21 15:26:54 +01:00
parent 6a449f4d90
commit 8ed2565a25
4 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
DMRGateway.cpp
View file

@ -157,6 +157,7 @@ m_xlxRelink(1000U),
m_xlxConnected(false),
m_xlxDebug(false),
m_xlxUserControl(true),
m_xlxModule(),
m_rptRewrite(NULL),
m_xlxRewrite(NULL),
m_dmr1NetRewrites(),
@ -1385,6 +1386,7 @@ bool CDMRGateway::createXLXNetwork()
m_xlxTG = m_conf.getXLXNetworkTG();
m_xlxBase = m_conf.getXLXNetworkBase();
m_xlxStartup = m_conf.getXLXNetworkStartup();
m_xlxModule = m_conf.getXLXNetworkModule();
unsigned int xlxRelink = m_conf.getXLXNetworkRelink();
@ -1413,6 +1415,9 @@ bool CDMRGateway::createXLXNetwork()
} else {
LogInfo(" User Control: disabled");
}
if (m_xlxModule) {
LogInfo(" Module: %c",m_xlxModule);
}
if (m_xlxStartup > 0U)
@ -1454,7 +1459,11 @@ bool CDMRGateway::linkXLX(unsigned int number)
}
m_xlxNumber = number;
m_xlxRoom = reflector->m_startup;
if (m_xlxModule) {
m_xlxRoom = (int(m_xlxModule) - 94);
} else {
m_xlxRoom = reflector->m_startup;
}
m_xlxReflector = 4000U;
LogMessage("XLX, Connecting to XLX%03u", m_xlxNumber);