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

Change ovcm config to int value

Browse Source
This commit is contained in:
Shawn Chain
2019-11-16 23:06:26 +08:00
parent aa7ae2371c
commit 2f9595949a
8 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Conf.cpp
View File

@@ -146,8 +146,7 @@ m_dmrSlot2TGWhiteList(),
m_dmrCallHang(10U),
m_dmrTXHang(4U),
m_dmrModeHang(10U),
m_dmrOVCM(false),
m_dmrOVCMRX(false),
m_dmrOVCM(0),
m_fusionEnabled(false),
m_fusionLowDeviation(false),
m_fusionRemoteGateway(false),
@@ -594,9 +593,7 @@ bool CConf::read()
else if (::strcmp(key, "ModeHang") == 0)
m_dmrModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "OVCM") == 0)
m_dmrOVCM = ::atoi(value) == 1;
else if (::strcmp(key, "OVCMRX") == 0)
m_dmrOVCMRX = ::atoi(value) == 1;
m_dmrOVCM = ::atoi(value);
} else if (section == SECTION_FUSION) {
if (::strcmp(key, "Enable") == 0)
m_fusionEnabled = ::atoi(value) == 1;
@@ -1258,16 +1255,11 @@ unsigned int CConf::getDMRModeHang() const
return m_dmrModeHang;
}
bool CConf::getDMROVCM() const
int CConf::getDMROVCM() const
{
return m_dmrOVCM;
}
bool CConf::getDMROVCMRX() const
{
return m_dmrOVCMRX;
}
bool CConf::getFusionEnabled() const
{
return m_fusionEnabled;