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

Clean up tabbing.

Browse Source
This commit is contained in:
Jonathan Naylor
2020-09-21 10:14:15 +01:00
parent 7934cc78bb
commit 5656547ec3
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
DMRGateway.cpp
View File

@@ -2161,7 +2161,7 @@ bool CDMRGateway::createDMRNetwork5()
bool CDMRGateway::createXLXNetwork() bool CDMRGateway::createXLXNetwork()
{ {
std::string fileName = m_conf.getXLXNetworkFile(); std::string fileName = m_conf.getXLXNetworkFile();
unsigned int reloadTime = m_conf.getXLXNetworkReloadTime(); unsigned int reloadTime = m_conf.getXLXNetworkReloadTime();
m_xlxReflectors = new CReflectors(fileName, reloadTime); m_xlxReflectors = new CReflectors(fileName, reloadTime);
@@ -2172,11 +2172,11 @@ bool CDMRGateway::createXLXNetwork()
} }
m_xlxLocal = m_conf.getXLXNetworkLocal(); m_xlxLocal = m_conf.getXLXNetworkLocal();
m_xlxPort = m_conf.getXLXNetworkPort(); m_xlxPort = m_conf.getXLXNetworkPort();
m_xlxPassword = m_conf.getXLXNetworkPassword(); m_xlxPassword = m_conf.getXLXNetworkPassword();
m_xlxId = m_conf.getXLXNetworkId(); m_xlxId = m_conf.getXLXNetworkId();
m_xlxDebug = m_conf.getXLXNetworkDebug(); m_xlxDebug = m_conf.getXLXNetworkDebug();
m_xlxUserControl = m_conf.getXLXNetworkUserControl(); m_xlxUserControl = m_conf.getXLXNetworkUserControl();
if (m_xlxId == 0U) if (m_xlxId == 0U)
m_xlxId = m_repeater->getId(); m_xlxId = m_repeater->getId();
@@ -2185,39 +2185,40 @@ bool CDMRGateway::createXLXNetwork()
m_xlxTG = m_conf.getXLXNetworkTG(); m_xlxTG = m_conf.getXLXNetworkTG();
m_xlxBase = m_conf.getXLXNetworkBase(); m_xlxBase = m_conf.getXLXNetworkBase();
m_xlxStartup = m_conf.getXLXNetworkStartup(); m_xlxStartup = m_conf.getXLXNetworkStartup();
m_xlxModule = m_conf.getXLXNetworkModule(); m_xlxModule = m_conf.getXLXNetworkModule();
unsigned int xlxRelink = m_conf.getXLXNetworkRelink(); unsigned int xlxRelink = m_conf.getXLXNetworkRelink();
LogInfo("XLX Network Parameters"); LogInfo("XLX Network Parameters");
LogInfo(" Id: %u", m_xlxId); LogInfo(" Id: %u", m_xlxId);
LogInfo(" Hosts file: %s", fileName.c_str()); LogInfo(" Hosts file: %s", fileName.c_str());
LogInfo(" Reload time: %u minutes", reloadTime); LogInfo(" Reload time: %u minutes", reloadTime);
if (m_xlxLocal > 0U) if (m_xlxLocal > 0U)
LogInfo(" Local: %u", m_xlxLocal); LogInfo(" Local: %u", m_xlxLocal);
else else
LogInfo(" Local: random"); LogInfo(" Local: random");
LogInfo(" Port: %u", m_xlxPort); LogInfo(" Port: %u", m_xlxPort);
LogInfo(" Slot: %u", m_xlxSlot); LogInfo(" Slot: %u", m_xlxSlot);
LogInfo(" TG: %u", m_xlxTG); LogInfo(" TG: %u", m_xlxTG);
LogInfo(" Base: %u", m_xlxBase); LogInfo(" Base: %u", m_xlxBase);
if (m_xlxStartup > 0U) if (m_xlxStartup > 0U)
LogInfo(" Startup: XLX%03u", m_xlxStartup); LogInfo(" Startup: XLX%03u", m_xlxStartup);
if (xlxRelink > 0U) { if (xlxRelink > 0U) {
m_xlxRelink.setTimeout(xlxRelink * 60U); m_xlxRelink.setTimeout(xlxRelink * 60U);
LogInfo(" Relink: %u minutes", xlxRelink); LogInfo(" Relink: %u minutes", xlxRelink);
} else { } else {
LogInfo(" Relink: disabled"); LogInfo(" Relink: disabled");
} }
if (m_xlxUserControl) {
LogInfo(" User Control: enabled"); if (m_xlxUserControl)
} else { LogInfo(" User Control: enabled");
LogInfo(" User Control: disabled"); else
} LogInfo(" User Control: disabled");
if (m_xlxModule) {
LogInfo(" Module: %c",m_xlxModule); if (m_xlxModule != 0U)
} LogInfo(" Module: %c", m_xlxModule);
if (m_xlxStartup > 0U) if (m_xlxStartup > 0U)
linkXLX(m_xlxStartup); linkXLX(m_xlxStartup);
@@ -2272,12 +2273,11 @@ bool CDMRGateway::linkXLX(unsigned int number)
return false; return false;
} }
m_xlxNumber = number; m_xlxNumber = number;
if (m_xlxModule) { if (m_xlxModule != 0U)
m_xlxRoom = ((int(m_xlxModule) - 64U) + 4000U); m_xlxRoom = ((int(m_xlxModule) - 64U) + 4000U);
} else { else
m_xlxRoom = reflector->m_startup; m_xlxRoom = reflector->m_startup;
}
m_xlxReflector = 4000U; m_xlxReflector = 4000U;
LogMessage("XLX, Connecting to XLX%03u", m_xlxNumber); LogMessage("XLX, Connecting to XLX%03u", m_xlxNumber);