MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-21 13:35:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add an XLX base so the control ids can be shifted.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-05-25 18:24:05 +01:00
parent d12ac3ecb4
commit 87e261e99e
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Conf.cpp
View File

@@ -84,6 +84,7 @@ m_xlxNetworkLocal(0U),
m_xlxNetworkPassword(), m_xlxNetworkPassword(),
m_xlxNetworkSlot(2U), m_xlxNetworkSlot(2U),
m_xlxNetworkTG(9U), m_xlxNetworkTG(9U),
m_xlxNetworkBase(4000U),
m_xlxNetworkOptions(), m_xlxNetworkOptions(),
m_xlxNetworkDebug(false) m_xlxNetworkDebug(false)
{ {
@@ -183,6 +184,8 @@ bool CConf::read()
m_xlxNetworkSlot = (unsigned int)::atoi(value); m_xlxNetworkSlot = (unsigned int)::atoi(value);
else if (::strcmp(key, "TG") == 0) else if (::strcmp(key, "TG") == 0)
m_xlxNetworkTG = (unsigned int)::atoi(value); m_xlxNetworkTG = (unsigned int)::atoi(value);
else if (::strcmp(key, "Base") == 0)
m_xlxNetworkBase = (unsigned int)::atoi(value);
else if (::strcmp(key, "Options") == 0) else if (::strcmp(key, "Options") == 0)
m_xlxNetworkOptions = value; m_xlxNetworkOptions = value;
else if (::strcmp(key, "Debug") == 0) else if (::strcmp(key, "Debug") == 0)
@@ -452,6 +455,11 @@ unsigned int CConf::getXLXNetworkTG() const
return m_xlxNetworkTG; return m_xlxNetworkTG;
} }
unsigned int CConf::getXLXNetworkBase() const
{
return m_xlxNetworkBase;
}
std::string CConf::getXLXNetworkPassword() const std::string CConf::getXLXNetworkPassword() const
{ {
return m_xlxNetworkPassword; return m_xlxNetworkPassword;

2
Conf.h
View File

@@ -118,6 +118,7 @@ public:
std::string getXLXNetworkPassword() const; std::string getXLXNetworkPassword() const;
unsigned int getXLXNetworkSlot() const; unsigned int getXLXNetworkSlot() const;
unsigned int getXLXNetworkTG() const; unsigned int getXLXNetworkTG() const;
unsigned int getXLXNetworkBase() const;
std::string getXLXNetworkOptions() const; std::string getXLXNetworkOptions() const;
bool getXLXNetworkDebug() const; bool getXLXNetworkDebug() const;
@@ -174,6 +175,7 @@ private:
std::string m_xlxNetworkPassword; std::string m_xlxNetworkPassword;
unsigned int m_xlxNetworkSlot; unsigned int m_xlxNetworkSlot;
unsigned int m_xlxNetworkTG; unsigned int m_xlxNetworkTG;
unsigned int m_xlxNetworkBase;
std::string m_xlxNetworkOptions; std::string m_xlxNetworkOptions;
bool m_xlxNetworkDebug; bool m_xlxNetworkDebug;
}; };

8
DMRGateway.cpp
View File

@@ -125,6 +125,7 @@ m_xlxNetwork(NULL),
m_reflector(4000U), m_reflector(4000U),
m_xlxSlot(0U), m_xlxSlot(0U),
m_xlxTG(0U), m_xlxTG(0U),
m_xlxBase(0U),
m_rptRewrite(NULL), m_rptRewrite(NULL),
m_xlxRewrite(NULL), m_xlxRewrite(NULL),
m_dmr1NetRewrites(), m_dmr1NetRewrites(),
@@ -322,7 +323,10 @@ int CDMRGateway::run()
m_xlxNetwork->write(data); m_xlxNetwork->write(data);
status[slotNo] = DMRGWS_REFLECTOR; status[slotNo] = DMRGWS_REFLECTOR;
timer[slotNo]->start(); timer[slotNo]->start();
} else if (flco == FLCO_USER_USER && slotNo == m_xlxSlot && dstId >= 4000U && dstId <= 4026U) { } else if (flco == FLCO_USER_USER && slotNo == m_xlxSlot && dstId >= m_xlxBase && dstId <= (m_xlxBase + 26U)) {
dstId += 4000U;
dstId -= m_xlxBase;
if (dstId != m_reflector) { if (dstId != m_reflector) {
if (dstId == 4000U) if (dstId == 4000U)
LogMessage("Unlinking"); LogMessage("Unlinking");
@@ -804,9 +808,11 @@ bool CDMRGateway::createXLXNetwork()
m_xlxSlot = m_conf.getXLXNetworkSlot(); m_xlxSlot = m_conf.getXLXNetworkSlot();
m_xlxTG = m_conf.getXLXNetworkTG(); m_xlxTG = m_conf.getXLXNetworkTG();
m_xlxBase = m_conf.getXLXNetworkBase();
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);
m_rptRewrite = new CRewriteTG("XLX", XLX_SLOT, XLX_TG, m_xlxSlot, m_xlxTG, 1U); m_rptRewrite = new CRewriteTG("XLX", XLX_SLOT, XLX_TG, m_xlxSlot, m_xlxTG, 1U);
m_xlxRewrite = new CRewriteTG("XLX", m_xlxSlot, m_xlxTG, XLX_SLOT, XLX_TG, 1U); m_xlxRewrite = new CRewriteTG("XLX", m_xlxSlot, m_xlxTG, XLX_SLOT, XLX_TG, 1U);

1
DMRGateway.h
View File

@@ -45,6 +45,7 @@ private:
unsigned int m_reflector; unsigned int m_reflector;
unsigned int m_xlxSlot; unsigned int m_xlxSlot;
unsigned int m_xlxTG; unsigned int m_xlxTG;
unsigned int m_xlxBase;
CRewriteTG* m_rptRewrite; CRewriteTG* m_rptRewrite;
CRewriteTG* m_xlxRewrite; CRewriteTG* m_xlxRewrite;
std::vector<IRewrite*> m_dmr1NetRewrites; std::vector<IRewrite*> m_dmr1NetRewrites;

1
DMRGateway.ini
View File

@@ -27,6 +27,7 @@ Port=62030
# Options= # Options=
Slot=1 Slot=1
TG=8 TG=8
Base=4000
Password=passw0rd Password=passw0rd
Debug=0 Debug=0