Simplify the FM configuration.

This commit is contained in:
Jonathan Naylor
2020-04-18 13:43:36 +01:00
parent f8bce3823a
commit 11cd5679a7
7 changed files with 29 additions and 47 deletions

View File

@@ -179,8 +179,7 @@ m_fmCallsignSpeed(20U),
m_fmCallsignFrequency(1000U),
m_fmCallsignTime(10U),
m_fmCallsignHoldoff(1U),
m_fmCallsignHighLevel(80.0F),
m_fmCallsignLowLevel(40.0F),
m_fmCallsignLevel(40.0F),
m_fmCallsignAtStart(true),
m_fmCallsignAtEnd(true),
m_fmRFAck("K"),
@@ -707,10 +706,8 @@ bool CConf::read()
m_fmCallsignTime = (unsigned int)::atoi(value);
else if (::strcmp(key, "CallsignHoldoff") == 0)
m_fmCallsignHoldoff = (unsigned int)::atoi(value);
else if (::strcmp(key, "CallsignHighLevel") == 0)
m_fmCallsignHighLevel = float(::atof(value));
else if (::strcmp(key, "CallsignLowLevel") == 0)
m_fmCallsignLowLevel = float(::atof(value));
else if (::strcmp(key, "CallsignLevel") == 0)
m_fmCallsignLevel = float(::atof(value));
else if (::strcmp(key, "CallsignAtStart") == 0)
m_fmCallsignAtStart = ::atoi(value) == 1;
else if (::strcmp(key, "CallsignAtEnd") == 0)
@@ -1521,14 +1518,9 @@ unsigned int CConf::getFMCallsignHoldoff() const
return m_fmCallsignHoldoff;
}
float CConf::getFMCallsignHighLevel() const
float CConf::getFMCallsignLevel() const
{
return m_fmCallsignHighLevel;
}
float CConf::getFMCallsignLowLevel() const
{
return m_fmCallsignLowLevel;
return m_fmCallsignLevel;
}
bool CConf::getFMCallsignAtStart() const