ShaYmez
/
MMDVM_CM
mirror of https://github.com/ShaYmez/MMDVM_CM.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Enable YSF network debug for DMR2YSF

This commit is contained in:
Andy CA6JAU 2018-10-08 20:30:31 -03:00
parent f2cc04bbb2
commit b84d4f3825
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DMR2YSF/Conf.cpp
View File

@ -44,6 +44,7 @@ m_localAddress(),
m_localPort(0U),
m_fcsFile(),
m_daemon(false),
m_debug(false),
m_dmrId(0U),
m_dmrRptAddress(),
m_dmrRptPort(0U),
@ -129,6 +130,8 @@ bool CConf::read()
m_fcsFile = value;
else if (::strcmp(key, "Daemon") == 0)
m_daemon = ::atoi(value) == 1;
else if (::strcmp(key, "Debug") == 0)
m_debug = ::atoi(value) == 1;
} else if (section == SECTION_DMR_NETWORK) {
if (::strcmp(key, "Id") == 0)
m_dmrId = (unsigned int)::atoi(value);
@ -205,6 +208,11 @@ bool CConf::getDaemon() const
return m_daemon;
}
bool CConf::getDebug() const
{
return m_debug;
}
unsigned int CConf::getDMRId() const
{
return m_dmrId;

6
DMR2YSF/Conf.h
View File

@ -39,7 +39,8 @@ public:
unsigned int getLocalPort() const;
std::string getFCSFile() const;
bool getDaemon() const;
bool getDebug() const;
// The DMR Network section
unsigned int getDMRId() const;
std::string getDMRRptAddress() const;
@ -70,7 +71,8 @@ private:
unsigned int m_localPort;
std::string m_fcsFile;
bool m_daemon;
bool m_debug;
unsigned int m_dmrId;
std::string m_dmrRptAddress;
unsigned int m_dmrRptPort;

3
DMR2YSF/DMR2YSF.cpp
View File

@ -259,8 +259,9 @@ int CDMR2YSF::run()
unsigned int dstPort = m_conf.getDstPort();
std::string localAddress = m_conf.getLocalAddress();
unsigned int localPort = m_conf.getLocalPort();
unsigned int ysfdebug = m_conf.getDebug();
m_ysfNetwork = new CYSFNetwork(localAddress, localPort, m_callsign, false);
m_ysfNetwork = new CYSFNetwork(localAddress, localPort, m_callsign, ysfdebug);
m_ysfNetwork->setDestination(dstAddress, dstPort);
ret = m_ysfNetwork->open();

1
DMR2YSF/DMR2YSF.ini
View File

@ -6,6 +6,7 @@ LocalAddress=127.0.0.1
LocalPort=3200
FCSRooms=FCSRooms.txt
Daemon=0
Debug=0
[DMR Network]
Id=1234567

2
DMR2YSF/Version.h
View File

@ -20,6 +20,6 @@
#if !defined(VERSION_H)
#define VERSION_H
const char* VERSION = "20180902";
const char* VERSION = "20181008";
#endif