From 1834b59e8b558d461481e03a5780e6c5040bcd6b Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 11 Jan 2020 08:58:08 +0100 Subject: [PATCH] fix extra send retry (fixes #328) --- src/ebusd/bushandler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 src/ebusd/bushandler.cpp diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp old mode 100755 new mode 100644 index 0b0ac176..230829da --- a/src/ebusd/bushandler.cpp +++ b/src/ebusd/bushandler.cpp @@ -328,7 +328,7 @@ result_t BusHandler::sendAndWait(const MasterSymbolString& master, SlaveSymbolSt ActiveBusRequest request(master, slave); logInfo(lf_bus, "send message: %s", master.getStr().c_str()); - for (int sendRetries = m_failedSendRetries + 1; sendRetries >= 0; sendRetries--) { + for (int sendRetries = m_failedSendRetries + 1; sendRetries > 0; sendRetries--) { m_nextRequests.push(&request); bool success = m_finishedRequests.remove(&request, true); result = success ? request.m_result : RESULT_ERR_TIMEOUT; @@ -339,7 +339,7 @@ result_t BusHandler::sendAndWait(const MasterSymbolString& master, SlaveSymbolSt logError(lf_bus, "send to %2.2x: %s, give up", master[1], getResultCode(result)); break; } - logError(lf_bus, "send to %2.2x: %s%s", master[1], getResultCode(result), sendRetries > 0 ? ", retry" : ""); + logError(lf_bus, "send to %2.2x: %s%s", master[1], getResultCode(result), sendRetries > 1 ? ", retry" : ""); request.m_busLostRetries = 0; } return result;