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

Merge branch 'master' into XLXs

Browse Source
This commit is contained in:
Jonathan Naylor
2017-09-16 14:50:30 +01:00
parent 37384c6a16 52a85090ff
commit 5faeeed423
5 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DMRGateway.cpp
View File

@@ -416,7 +416,6 @@ int CDMRGateway::run()
}
m_xlxReflector = m_xlxRoom;
if (voice != NULL) {
if (m_xlxReflector < 4001U || m_xlxReflector > 4026U)
voice->unlinked();
@@ -830,6 +829,7 @@ bool CDMRGateway::createDMRNetwork1()
unsigned int local = m_conf.getDMRNetwork1Local();
unsigned int id = m_conf.getDMRNetwork1Id();
std::string password = m_conf.getDMRNetwork1Password();
bool location = m_conf.getDMRNetwork1Location();
bool debug = m_conf.getDMRNetwork1Debug();
m_dmr1Name = m_conf.getDMRNetwork1Name();
@@ -845,6 +845,7 @@ bool CDMRGateway::createDMRNetwork1()
LogInfo(" Local: %u", local);
else
LogInfo(" Local: random");
LogInfo(" Location Data: %s", location ? "yes" : "no");
m_dmrNetwork1 = new CDMRNetwork(address, port, local, id, password, m_dmr1Name, debug);
@@ -860,6 +861,9 @@ bool CDMRGateway::createDMRNetwork1()
unsigned char config[400U];
unsigned int len = m_repeater->getConfig(config);
if (!location)
::memcpy(config + 30U, "0.00000000.000000", 17U);
m_dmrNetwork1->setConfig(config, len);
bool ret = m_dmrNetwork1->open();
@@ -952,6 +956,7 @@ bool CDMRGateway::createDMRNetwork2()
unsigned int local = m_conf.getDMRNetwork2Local();
unsigned int id = m_conf.getDMRNetwork2Id();
std::string password = m_conf.getDMRNetwork2Password();
bool location = m_conf.getDMRNetwork2Location();
bool debug = m_conf.getDMRNetwork2Debug();
m_dmr2Name = m_conf.getDMRNetwork2Name();
@@ -967,6 +972,7 @@ bool CDMRGateway::createDMRNetwork2()
LogInfo(" Local: %u", local);
else
LogInfo(" Local: random");
LogInfo(" Location Data: %s", location ? "yes" : "no");
m_dmrNetwork2 = new CDMRNetwork(address, port, local, id, password, m_dmr2Name, debug);
@@ -982,6 +988,9 @@ bool CDMRGateway::createDMRNetwork2()
unsigned char config[400U];
unsigned int len = m_repeater->getConfig(config);
if (!location)
::memcpy(config + 30U, "0.00000000.000000", 17U);
m_dmrNetwork2->setConfig(config, len);
bool ret = m_dmrNetwork2->open();