Add seperate RF and Network mode timeouts.

This commit is contained in:
Jonathan Naylor
2016-06-22 18:03:56 +01:00
parent 1aa7ca537d
commit 10e3a85691
5 changed files with 76 additions and 32 deletions

View File

@@ -51,7 +51,8 @@ m_file(file),
m_callsign(),
m_timeout(120U),
m_duplex(true),
m_modeHang(10U),
m_rfModeHang(10U),
m_netModeHang(3U),
m_display(),
m_daemon(false),
m_rxFrequency(0U),
@@ -219,7 +220,11 @@ bool CConf::read()
else if (::strcmp(key, "Duplex") == 0)
m_duplex = ::atoi(value) == 1;
else if (::strcmp(key, "ModeHang") == 0)
m_modeHang = (unsigned int)::atoi(value);
m_rfModeHang = m_netModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "RFModeHang") == 0)
m_rfModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "NetModeHang") == 0)
m_netModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "Display") == 0)
m_display = value;
else if (::strcmp(key, "Daemon") == 0)
@@ -498,9 +503,14 @@ bool CConf::getDuplex() const
return m_duplex;
}
unsigned int CConf::getModeHang() const
unsigned int CConf::getRFModeHang() const
{
return m_modeHang;
return m_rfModeHang;
}
unsigned int CConf::getNetModeHang() const
{
return m_netModeHang;
}
std::string CConf::getDisplay() const