From d0c931e783381f27a86b8752eaef9a5105c05968 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 17 Oct 2015 14:16:57 +0200 Subject: [PATCH] do not claim about received SYN after sending SYN or when in skip state, fixed debug message --- src/ebusd/bushandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp index 0d8572cb..d98e3044 100644 --- a/src/ebusd/bushandler.cpp +++ b/src/ebusd/bushandler.cpp @@ -371,13 +371,13 @@ result_t BusHandler::handleSymbol() } m_lastReceive = now; - if (recvSymbol == SYN) { + if ((recvSymbol == SYN) && (m_state != bs_sendSyn)) { if (!sending && m_remainLockCount > 0 && m_command.size() != 1) m_remainLockCount--; else if (!sending && m_remainLockCount == 0 && m_command.size() == 1) m_remainLockCount = 1; // wait for next AUTO-SYN after SYN / address / SYN (bus locked for own priority) - return setState(bs_ready, RESULT_ERR_SYN); + return setState(bs_ready, m_state == bs_skip ? RESULT_OK : RESULT_ERR_SYN); } unsigned int headerLen, crcPos; @@ -630,7 +630,7 @@ result_t BusHandler::setState(BusState state, result_t result, bool firstRepetit { if (m_currentRequest != NULL) { if (result == RESULT_ERR_BUS_LOST && m_currentRequest->m_busLostRetries < m_busLostRetries) { - logDebug(lf_bus, "%s during %s, retry", getResultCode(result)); + logDebug(lf_bus, "%s during %s, retry", getResultCode(result), getStateCode(m_state)); m_currentRequest->m_busLostRetries++; m_nextRequests.add(m_currentRequest); // repeat m_currentRequest = NULL;