1
0
Fork 0

Merge pull request #110 from juribeparada/master

Not load FCS rooms if FCS is disabled
ycs232-kbc
Jonathan Naylor 7 years ago committed by GitHub
commit c8c211c4d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -89,7 +89,8 @@ m_current(),
m_startup(), m_startup(),
m_exclude(false), m_exclude(false),
m_inactivityTimer(1000U), m_inactivityTimer(1000U),
m_lostTimer(1000U, 120U) m_lostTimer(1000U, 120U),
m_fcsNetworkEnabled(false)
{ {
} }
@ -204,8 +205,8 @@ int CYSFGateway::run()
} }
} }
bool fcsNetworkEnabled = m_conf.getFCSNetworkEnabled(); m_fcsNetworkEnabled = m_conf.getFCSNetworkEnabled();
if (fcsNetworkEnabled) { if (m_fcsNetworkEnabled) {
unsigned int txFrequency = m_conf.getTxFrequency(); unsigned int txFrequency = m_conf.getTxFrequency();
unsigned int rxFrequency = m_conf.getRxFrequency(); unsigned int rxFrequency = m_conf.getRxFrequency();
std::string locator = calculateLocator(); std::string locator = calculateLocator();
@ -478,7 +479,8 @@ void CYSFGateway::createWiresX(CYSFNetwork* rptNetwork)
m_wiresX->setYSF2P25(address, port); m_wiresX->setYSF2P25(address, port);
std::string filename = m_conf.getFCSNetworkFile(); std::string filename = m_conf.getFCSNetworkFile();
readFCSRoomsFile(filename); if (m_fcsNetworkEnabled)
readFCSRoomsFile(filename);
m_reflectors->load(); m_reflectors->load();
m_wiresX->start(); m_wiresX->start();

@ -60,6 +60,7 @@ private:
bool m_exclude; bool m_exclude;
CTimer m_inactivityTimer; CTimer m_inactivityTimer;
CTimer m_lostTimer; CTimer m_lostTimer;
bool m_fcsNetworkEnabled;
void startupLinking(); void startupLinking();
std::string calculateLocator(); std::string calculateLocator();

Loading…
Cancel
Save