ShaYmez/MMDVM_CM
1
0
Fork 0
mirror of https://github.com/ShaYmez/MMDVM_CM.git synced 2024-11-19 14:41:46 -05:00
Code Issues Projects Releases Wiki Activity

Add option for default Dst TG in DMR2YSF

Browse Source
This commit is contained in:
Andy CA6JAU 2018-07-24 01:07:18 -04:00
parent fbe30c930c
commit dd4be1354e
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DMR2YSF/Conf.cpp
View File

@ -48,6 +48,7 @@ m_dmrRptAddress(),
m_dmrRptPort(0U), m_dmrRptPort(0U),
m_dmrLocalAddress(), m_dmrLocalAddress(),
m_dmrLocalPort(0U), m_dmrLocalPort(0U),
m_dmrDefaultDstTG(9U),
m_dmrDebug(false), m_dmrDebug(false),
m_dmrIdLookupFile(), m_dmrIdLookupFile(),
m_dmrIdLookupTime(0U), m_dmrIdLookupTime(0U),
@ -134,6 +135,8 @@ bool CConf::read()
m_dmrLocalAddress = value; m_dmrLocalAddress = value;
else if (::strcmp(key, "LocalPort") == 0) else if (::strcmp(key, "LocalPort") == 0)
m_dmrLocalPort = (unsigned int)::atoi(value); m_dmrLocalPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "DefaultDstTG") == 0)
m_dmrDefaultDstTG = (unsigned int)::atoi(value);
else if (::strcmp(key, "Debug") == 0) else if (::strcmp(key, "Debug") == 0)
m_dmrDebug = ::atoi(value) == 1; m_dmrDebug = ::atoi(value) == 1;
} else if (section == SECTION_DMRID_LOOKUP) { } else if (section == SECTION_DMRID_LOOKUP) {
@ -213,6 +216,11 @@ unsigned int CConf::getDMRLocalPort() const
return m_dmrLocalPort; return m_dmrLocalPort;
} }
unsigned int CConf::getDMRDefaultDstTG() const
{
return m_dmrDefaultDstTG;
}
bool CConf::getDMRDebug() const bool CConf::getDMRDebug() const
{ {
return m_dmrDebug; return m_dmrDebug;

2
DMR2YSF/Conf.h
View File

@ -45,6 +45,7 @@ public:
unsigned int getDMRRptPort() const; unsigned int getDMRRptPort() const;
std::string getDMRLocalAddress() const; std::string getDMRLocalAddress() const;
unsigned int getDMRLocalPort() const; unsigned int getDMRLocalPort() const;
unsigned int getDMRDefaultDstTG() const;
bool getDMRDebug() const; bool getDMRDebug() const;
// The DMR Id section // The DMR Id section
@ -71,6 +72,7 @@ private:
unsigned int m_dmrRptPort; unsigned int m_dmrRptPort;
std::string m_dmrLocalAddress; std::string m_dmrLocalAddress;
unsigned int m_dmrLocalPort; unsigned int m_dmrLocalPort;
unsigned int m_dmrDefaultDstTG;
bool m_dmrDebug; bool m_dmrDebug;
std::string m_dmrIdLookupFile; std::string m_dmrIdLookupFile;

1
DMR2YSF/DMR2YSF.cpp
View File

@ -203,6 +203,7 @@ int CDMR2YSF::run()
m_callsign = m_conf.getCallsign(); m_callsign = m_conf.getCallsign();
m_defsrcid = m_conf.getDMRId(); m_defsrcid = m_conf.getDMRId();
m_dstid = m_conf.getDMRDefaultDstTG();
in_addr dstAddress = CUDPSocket::lookup(m_conf.getDstAddress()); in_addr dstAddress = CUDPSocket::lookup(m_conf.getDstAddress());
unsigned int dstPort = m_conf.getDstPort(); unsigned int dstPort = m_conf.getDstPort();

1
DMR2YSF/DMR2YSF.ini
View File

@ -12,6 +12,7 @@ RptAddress=127.0.0.1
RptPort=62032 RptPort=62032
LocalAddress=127.0.0.1 LocalAddress=127.0.0.1
LocalPort=62031 LocalPort=62031
DefaultDstTG=9
Debug=0 Debug=0
[DMR Id Lookup] [DMR Id Lookup]