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

do not claim about received SYN after sending SYN or when in skip state, fixed debug message

Browse Source
This commit is contained in:
john30
2015-10-17 14:16:57 +02:00
parent b1c84170c3
commit d0c931e783
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+3 -3
View File
@@ -371,13 +371,13 @@ result_t BusHandler::handleSymbol()
} }
m_lastReceive = now; m_lastReceive = now;
if (recvSymbol == SYN) { if ((recvSymbol == SYN) && (m_state != bs_sendSyn)) {
if (!sending && m_remainLockCount > 0 && m_command.size() != 1) if (!sending && m_remainLockCount > 0 && m_command.size() != 1)
m_remainLockCount--; m_remainLockCount--;
else if (!sending && m_remainLockCount == 0 && m_command.size() == 1) 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) 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; unsigned int headerLen, crcPos;
@@ -630,7 +630,7 @@ result_t BusHandler::setState(BusState state, result_t result, bool firstRepetit
{ {
if (m_currentRequest != NULL) { if (m_currentRequest != NULL) {
if (result == RESULT_ERR_BUS_LOST && m_currentRequest->m_busLostRetries < m_busLostRetries) { 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_currentRequest->m_busLostRetries++;
m_nextRequests.add(m_currentRequest); // repeat m_nextRequests.add(m_currentRequest); // repeat
m_currentRequest = NULL; m_currentRequest = NULL;