MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 06:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into nxdn

Browse Source
This commit is contained in:
Jonathan Naylor
2018-01-15 21:12:56 +00:00
parent 712cfc89c6 cae6bed370
commit 10b0d3c14c
8 changed files with 90 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Conf.cpp
View File

@@ -113,7 +113,7 @@ m_dstarErrorReply(true),
m_dstarRemoteGateway(false),
m_dstarModeHang(10U),
m_dmrEnabled(false),
m_dmrBeacons(false),
m_dmrBeacons(0U),
m_dmrId(0U),
m_dmrColorCode(2U),
m_dmrSelfOnly(false),
@@ -445,7 +445,7 @@ bool CConf::read()
if (::strcmp(key, "Enable") == 0)
m_dmrEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "Beacons") == 0)
m_dmrBeacons = ::atoi(value) == 1;
m_dmrBeacons = (unsigned int)::atoi(value);
else if (::strcmp(key, "Id") == 0)
m_dmrId = (unsigned int)::atoi(value);
else if (::strcmp(key, "ColorCode") == 0)
@@ -983,7 +983,7 @@ bool CConf::getDMREnabled() const
return m_dmrEnabled;
}
bool CConf::getDMRBeacons() const
unsigned int CConf::getDMRBeacons() const
{
return m_dmrBeacons;
}