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

Merge branch 'master' into P25

Browse Source
This commit is contained in:
Jonathan Naylor
2016-09-10 14:58:41 +01:00
parent 22d2d074c4 bce0056101
commit 434cee8ce0
12 changed files with 42684 additions and 41542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Conf.cpp
View File

@@ -123,6 +123,7 @@ m_dmrNetworkPort(0U),
m_dmrNetworkLocal(0U),
m_dmrNetworkPassword(),
m_dmrNetworkDebug(false),
m_dmrNetworkJitter(300U),
m_dmrNetworkSlot1(true),
m_dmrNetworkSlot2(true),
m_dmrNetworkRSSI(false),
@@ -463,6 +464,8 @@ bool CConf::read()
m_dmrNetworkPassword = value;
else if (::strcmp(key, "Debug") == 0)
m_dmrNetworkDebug = ::atoi(value) == 1;
else if (::strcmp(key, "Jitter") == 0)
m_dmrNetworkJitter = (unsigned int)::atoi(value);
else if (::strcmp(key, "Slot1") == 0)
m_dmrNetworkSlot1 = ::atoi(value) == 1;
else if (::strcmp(key, "Slot2") == 0)
@@ -906,6 +909,11 @@ bool CConf::getDMRNetworkDebug() const
return m_dmrNetworkDebug;
}
unsigned int CConf::getDMRNetworkJitter() const
{
return m_dmrNetworkJitter;
}
bool CConf::getDMRNetworkSlot1() const
{
return m_dmrNetworkSlot1;