Add UseCOSAsLockout and FM Access Mode parameters.

This commit is contained in:
Jonathan Naylor
2020-07-13 16:02:04 +01:00
parent 16fac0b41c
commit 3e6d5d5a7f
9 changed files with 59 additions and 43 deletions

View File

@@ -112,6 +112,7 @@ m_modemNXDNTXLevel(50.0F),
m_modemPOCSAGTXLevel(50.0F),
m_modemFMTXLevel(50.0F),
m_modemRSSIMappingFile(),
m_modemUseCOSAsLockout(false),
m_modemTrace(false),
m_modemDebug(false),
m_transparentEnabled(false),
@@ -200,7 +201,7 @@ m_fmCTCSSLowThreshold(20U),
m_fmCTCSSLevel(2.0F),
m_fmKerchunkTime(0U),
m_fmHangTime(7U),
m_fmUseCOS(true),
m_fmAccessMode(1U),
m_fmCOSInvert(false),
m_fmRFAudioBoost(1U),
m_fmMaxDevLevel(90.0F),
@@ -524,6 +525,8 @@ bool CConf::read()
m_modemFMTXLevel = float(::atof(value));
else if (::strcmp(key, "RSSIMappingFile") == 0)
m_modemRSSIMappingFile = value;
else if (::strcmp(key, "UseCOSAsLockout") == 0)
m_modemUseCOSAsLockout = ::atoi(value) == 1;
else if (::strcmp(key, "Trace") == 0)
m_modemTrace = ::atoi(value) == 1;
else if (::strcmp(key, "Debug") == 0)
@@ -777,8 +780,8 @@ bool CConf::read()
m_fmKerchunkTime = (unsigned int)::atoi(value);
else if (::strcmp(key, "HangTime") == 0)
m_fmHangTime = (unsigned int)::atoi(value);
else if (::strcmp(key, "UseCOS") == 0)
m_fmUseCOS = ::atoi(value) == 1;
else if (::strcmp(key, "AccessMode") == 0)
m_fmAccessMode = (unsigned int)::atoi(value);
else if (::strcmp(key, "COSInvert") == 0)
m_fmCOSInvert = ::atoi(value) == 1;
else if (::strcmp(key, "RFAudioBoost") == 0)
@@ -1226,6 +1229,11 @@ std::string CConf::getModemRSSIMappingFile () const
return m_modemRSSIMappingFile;
}
bool CConf::getModemUseCOSAsLockout() const
{
return m_modemUseCOSAsLockout;
}
bool CConf::getModemTrace() const
{
return m_modemTrace;
@@ -1666,9 +1674,9 @@ unsigned int CConf::getFMHangTime() const
return m_fmHangTime;
}
bool CConf::getFMUseCOS() const
unsigned int CConf::getFMAccessMode() const
{
return m_fmUseCOS;
return m_fmAccessMode;
}
bool CConf::getFMCOSInvert() const