mirror of
https://github.com/ShaYmez/MMDVM_CM.git
synced 2024-10-05 10:46:33 -04:00
Add new options for YSF2DMR (WIP)
This commit is contained in:
parent
f70911fbb8
commit
9cf527cb99
@ -47,6 +47,7 @@ m_dstPort(0U),
|
|||||||
m_localAddress(),
|
m_localAddress(),
|
||||||
m_localPort(0U),
|
m_localPort(0U),
|
||||||
m_enableWiresX(false),
|
m_enableWiresX(false),
|
||||||
|
m_remoteGateway(false),
|
||||||
m_daemon(false),
|
m_daemon(false),
|
||||||
m_rxFrequency(0U),
|
m_rxFrequency(0U),
|
||||||
m_txFrequency(0U),
|
m_txFrequency(0U),
|
||||||
@ -71,6 +72,7 @@ m_dmrNetworkOptions(),
|
|||||||
m_dmrNetworkDebug(false),
|
m_dmrNetworkDebug(false),
|
||||||
m_dmrNetworkJitterEnabled(true),
|
m_dmrNetworkJitterEnabled(true),
|
||||||
m_dmrNetworkJitter(500U),
|
m_dmrNetworkJitter(500U),
|
||||||
|
m_dmrHangTime(1000U),
|
||||||
m_dmrNetworkEnableUnlink(true),
|
m_dmrNetworkEnableUnlink(true),
|
||||||
m_dmrNetworkIDUnlink(4000U),
|
m_dmrNetworkIDUnlink(4000U),
|
||||||
m_dmrNetworkPCUnlink(false),
|
m_dmrNetworkPCUnlink(false),
|
||||||
@ -164,6 +166,8 @@ bool CConf::read()
|
|||||||
m_localPort = (unsigned int)::atoi(value);
|
m_localPort = (unsigned int)::atoi(value);
|
||||||
else if (::strcmp(key, "EnableWiresX") == 0)
|
else if (::strcmp(key, "EnableWiresX") == 0)
|
||||||
m_enableWiresX = ::atoi(value) == 1;
|
m_enableWiresX = ::atoi(value) == 1;
|
||||||
|
else if (::strcmp(key, "RemoteGateway") == 0)
|
||||||
|
m_remoteGateway = ::atoi(value) == 1;
|
||||||
else if (::strcmp(key, "Daemon") == 0)
|
else if (::strcmp(key, "Daemon") == 0)
|
||||||
m_daemon = ::atoi(value) == 1;
|
m_daemon = ::atoi(value) == 1;
|
||||||
} else if (section == SECTION_INFO) {
|
} else if (section == SECTION_INFO) {
|
||||||
@ -217,6 +221,8 @@ bool CConf::read()
|
|||||||
m_dmrNetworkJitterEnabled = ::atoi(value) == 1;
|
m_dmrNetworkJitterEnabled = ::atoi(value) == 1;
|
||||||
else if (::strcmp(key, "Jitter") == 0)
|
else if (::strcmp(key, "Jitter") == 0)
|
||||||
m_dmrNetworkJitter = (unsigned int)::atoi(value);
|
m_dmrNetworkJitter = (unsigned int)::atoi(value);
|
||||||
|
else if (::strcmp(key, "HangTime") == 0)
|
||||||
|
m_dmrHangTime = (unsigned int)::atoi(value);
|
||||||
else if (::strcmp(key, "EnableUnlink") == 0)
|
else if (::strcmp(key, "EnableUnlink") == 0)
|
||||||
m_dmrNetworkEnableUnlink = ::atoi(value) == 1;
|
m_dmrNetworkEnableUnlink = ::atoi(value) == 1;
|
||||||
else if (::strcmp(key, "TGUnlink") == 0)
|
else if (::strcmp(key, "TGUnlink") == 0)
|
||||||
@ -297,6 +303,11 @@ bool CConf::getEnableWiresX() const
|
|||||||
return m_enableWiresX;
|
return m_enableWiresX;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CConf::getRemoteGateway() const
|
||||||
|
{
|
||||||
|
return m_remoteGateway;
|
||||||
|
}
|
||||||
|
|
||||||
bool CConf::getDaemon() const
|
bool CConf::getDaemon() const
|
||||||
{
|
{
|
||||||
return m_daemon;
|
return m_daemon;
|
||||||
@ -452,6 +463,11 @@ unsigned int CConf::getDMRNetworkJitter() const
|
|||||||
return m_dmrNetworkJitter;
|
return m_dmrNetworkJitter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned int CConf::getDMRHangTime() const
|
||||||
|
{
|
||||||
|
return m_dmrHangTime;
|
||||||
|
}
|
||||||
|
|
||||||
bool CConf::getDMRNetworkEnableUnlink() const
|
bool CConf::getDMRNetworkEnableUnlink() const
|
||||||
{
|
{
|
||||||
return m_dmrNetworkEnableUnlink;
|
return m_dmrNetworkEnableUnlink;
|
||||||
|
@ -40,6 +40,7 @@ public:
|
|||||||
std::string getLocalAddress() const;
|
std::string getLocalAddress() const;
|
||||||
unsigned int getLocalPort() const;
|
unsigned int getLocalPort() const;
|
||||||
bool getEnableWiresX() const;
|
bool getEnableWiresX() const;
|
||||||
|
bool getRemoteGateway() const;
|
||||||
bool getDaemon() const;
|
bool getDaemon() const;
|
||||||
|
|
||||||
// The Info section
|
// The Info section
|
||||||
@ -68,6 +69,7 @@ public:
|
|||||||
bool getDMRNetworkDebug() const;
|
bool getDMRNetworkDebug() const;
|
||||||
bool getDMRNetworkJitterEnabled() const;
|
bool getDMRNetworkJitterEnabled() const;
|
||||||
unsigned int getDMRNetworkJitter() const;
|
unsigned int getDMRNetworkJitter() const;
|
||||||
|
unsigned int getDMRHangTime() const;
|
||||||
bool getDMRNetworkEnableUnlink() const;
|
bool getDMRNetworkEnableUnlink() const;
|
||||||
unsigned int getDMRNetworkIDUnlink() const;
|
unsigned int getDMRNetworkIDUnlink() const;
|
||||||
bool getDMRNetworkPCUnlink() const;
|
bool getDMRNetworkPCUnlink() const;
|
||||||
@ -101,6 +103,7 @@ private:
|
|||||||
std::string m_localAddress;
|
std::string m_localAddress;
|
||||||
unsigned int m_localPort;
|
unsigned int m_localPort;
|
||||||
bool m_enableWiresX;
|
bool m_enableWiresX;
|
||||||
|
bool m_remoteGateway;
|
||||||
bool m_daemon;
|
bool m_daemon;
|
||||||
|
|
||||||
unsigned int m_rxFrequency;
|
unsigned int m_rxFrequency;
|
||||||
@ -127,6 +130,7 @@ private:
|
|||||||
bool m_dmrNetworkDebug;
|
bool m_dmrNetworkDebug;
|
||||||
bool m_dmrNetworkJitterEnabled;
|
bool m_dmrNetworkJitterEnabled;
|
||||||
unsigned int m_dmrNetworkJitter;
|
unsigned int m_dmrNetworkJitter;
|
||||||
|
unsigned int m_dmrHangTime;
|
||||||
bool m_dmrNetworkEnableUnlink;
|
bool m_dmrNetworkEnableUnlink;
|
||||||
unsigned int m_dmrNetworkIDUnlink;
|
unsigned int m_dmrNetworkIDUnlink;
|
||||||
bool m_dmrNetworkPCUnlink;
|
bool m_dmrNetworkPCUnlink;
|
||||||
|
@ -18,6 +18,7 @@ DstPort=42000
|
|||||||
LocalAddress=127.0.0.1
|
LocalAddress=127.0.0.1
|
||||||
LocalPort=42013
|
LocalPort=42013
|
||||||
EnableWiresX=1
|
EnableWiresX=1
|
||||||
|
RemoteGateway=0
|
||||||
Daemon=0
|
Daemon=0
|
||||||
|
|
||||||
[DMR Network]
|
[DMR Network]
|
||||||
@ -31,6 +32,7 @@ StartupPC=1
|
|||||||
Address=44.131.4.1
|
Address=44.131.4.1
|
||||||
Port=62031
|
Port=62031
|
||||||
Jitter=500
|
Jitter=500
|
||||||
|
HangTime=1000
|
||||||
EnableUnlink=1
|
EnableUnlink=1
|
||||||
TGUnlink=4000
|
TGUnlink=4000
|
||||||
PCUnlink=0
|
PCUnlink=0
|
||||||
|
Loading…
Reference in New Issue
Block a user