nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added revision info, avoid endless scanning of slaves that do not answer

Browse Source
This commit is contained in:
john30
2015-11-15 10:37:10 +01:00
parent 892f43a4de
commit ff7cf810e1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+3 -4
View File
@@ -121,8 +121,7 @@ void MainLoop::run()
Message* message = m_messages->getScanMessage(lastScanAddress); Message* message = m_messages->getScanMessage(lastScanAddress);
slave = message->getLastSlaveData(); slave = message->getLastSlaveData();
scanned = message->getLastUpdateTime()>0; scanned = message->getLastUpdateTime()>0;
} } else {
if (!scanned) {
result_t result = m_busHandler->scanAndWait(lastScanAddress, slave); result_t result = m_busHandler->scanAndWait(lastScanAddress, slave);
taskDelay = (result == RESULT_ERR_NO_SIGNAL) ? 10 : 1; taskDelay = (result == RESULT_ERR_NO_SIGNAL) ? 10 : 1;
if (result!=RESULT_OK) if (result!=RESULT_OK)
@@ -130,10 +129,10 @@ void MainLoop::run()
else { else {
scanned = true; scanned = true;
logInfo(lf_main, "scan config %2.2x message received", lastScanAddress); logInfo(lf_main, "scan config %2.2x message received", lastScanAddress);
m_busHandler->setScanConfigLoaded(lastScanAddress, false, "");
} }
} }
if (scanned) { if (scanned) {
m_busHandler->setScanConfigLoaded(lastScanAddress, false, "");
string file; string file;
result_t result = loadScanConfigFile(m_messages, lastScanAddress, slave, file); result_t result = loadScanConfigFile(m_messages, lastScanAddress, slave, file);
if (result==RESULT_OK) { if (result==RESULT_OK) {
@@ -983,7 +982,7 @@ string MainLoop::executeInfo(vector<string> &args)
" Report information about the daemon, the configuration, and seen devices."; " Report information about the daemon, the configuration, and seen devices.";
ostringstream result; ostringstream result;
result << "version: " << PACKAGE_STRING << "\n"; result << "version: " << PACKAGE_STRING << "." REVISION "\n";
if (m_busHandler->hasSignal()) { if (m_busHandler->hasSignal()) {
result << "signal: acquired\n"; result << "signal: acquired\n";
result << "symbol rate: " << static_cast<unsigned>(m_busHandler->getSymbolRate()) << "\n"; result << "symbol rate: " << static_cast<unsigned>(m_busHandler->getSymbolRate()) << "\n";