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

avoid unnecessary waits when there is no signal

Browse Source
This commit is contained in:
John
2023-01-06 11:39:13 +01:00
parent fe2849ec65
commit 780703c6ff
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+3
View File
@@ -362,6 +362,9 @@ void BusHandler::clear() {
} }
result_t BusHandler::sendAndWait(const MasterSymbolString& master, SlaveSymbolString* slave) { result_t BusHandler::sendAndWait(const MasterSymbolString& master, SlaveSymbolString* slave) {
if (m_state == bs_noSignal) {
return RESULT_ERR_NO_SIGNAL; // don't wait when there is no signal
}
result_t result = RESULT_ERR_NO_SIGNAL; result_t result = RESULT_ERR_NO_SIGNAL;
slave->clear(); slave->clear();
ActiveBusRequest request(master, slave); ActiveBusRequest request(master, slave);
src/ebusd/mainloop.cpp
+4 -1
View File
@@ -299,7 +299,7 @@ void MainLoop::run() {
reload = false; reload = false;
} }
} }
if (!loadDelay) { if (!loadDelay && m_busHandler->hasSignal()) {
lastScanAddress = m_busHandler->getNextScanAddress(lastScanAddress, scanCompleted >= SCAN_REPEAT_COUNT); lastScanAddress = m_busHandler->getNextScanAddress(lastScanAddress, scanCompleted >= SCAN_REPEAT_COUNT);
if (lastScanAddress == SYN) { if (lastScanAddress == SYN) {
taskDelay = 5; taskDelay = 5;
@@ -1825,6 +1825,9 @@ result_t MainLoop::executeScan(const vector<string>& args, const string& levels,
return RESULT_OK; return RESULT_OK;
} }
if (!m_busHandler->hasSignal()) {
return RESULT_ERR_NO_SIGNAL;
}
result_t result; result_t result;
symbol_t dstAddress = (symbol_t)parseInt(args[1].c_str(), 16, 0, 0xff, &result); symbol_t dstAddress = (symbol_t)parseInt(args[1].c_str(), 16, 0, 0xff, &result);
if (result == RESULT_OK && !isValidAddress(dstAddress, false)) { if (result == RESULT_OK && !isValidAddress(dstAddress, false)) {