g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-04 14:07:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into nxdn

Browse source
This commit is contained in:
Jonathan Naylor 2018-01-16 20:14:57 +00:00
commit 8fa4779ca9
5 changed files with 57 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Conf.cpp
View file

@ -113,7 +113,9 @@ m_dstarErrorReply(true),
m_dstarRemoteGateway(false),
m_dstarModeHang(10U),
m_dmrEnabled(false),
m_dmrBeacons(0U),
m_dmrBeacons(false),
m_dmrBeaconInterval(60U),
m_dmrBeaconDuration(3U),
m_dmrId(0U),
m_dmrColorCode(2U),
m_dmrSelfOnly(false),
@ -445,7 +447,11 @@ bool CConf::read()
if (::strcmp(key, "Enable") == 0)
m_dmrEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "Beacons") == 0)
m_dmrBeacons = (unsigned int)::atoi(value);
m_dmrBeacons = ::atoi(value) == 1;
else if (::strcmp(key, "BeaconInterval") == 0)
m_dmrBeaconInterval = (unsigned int)::atoi(value);
else if (::strcmp(key, "BeaconDuration") == 0)
m_dmrBeaconDuration = (unsigned int)::atoi(value);
else if (::strcmp(key, "Id") == 0)
m_dmrId = (unsigned int)::atoi(value);
else if (::strcmp(key, "ColorCode") == 0)
@ -983,11 +989,21 @@ bool CConf::getDMREnabled() const
return m_dmrEnabled;
}
unsigned int CConf::getDMRBeacons() const
bool CConf::getDMRBeacons() const
{
return m_dmrBeacons;
}
unsigned int CConf::getDMRBeaconInterval() const
{
return m_dmrBeaconInterval;
}
unsigned int CConf::getDMRBeaconDuration() const
{
return m_dmrBeaconDuration;
}
unsigned int CConf::getDMRId() const
{
return m_dmrId;