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

fixed ebusd not correctly handling scan answer (issue #76), add transfer latency when receiving active command ACK, avoid debug log when SYN was not used by any participant, add missing debug log on some state transfers

Browse Source
This commit is contained in:
john30
2017-04-17 12:09:23 +02:00
parent 606f4a6b75
commit 038bb0e8ea
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+10 -5
View File
@@ -468,10 +468,13 @@ result_t BusHandler::handleSymbol() {
case bs_recvCmd: case bs_recvCmd:
case bs_recvCmdCrc: case bs_recvCmdCrc:
case bs_recvCmdAck:
timeout = m_slaveRecvTimeout; timeout = m_slaveRecvTimeout;
break; break;
case bs_recvCmdAck:
timeout = m_slaveRecvTimeout+(m_currentRequest ? m_transferLatency:0);
break;
case bs_recvRes: case bs_recvRes:
case bs_recvResCrc: case bs_recvResCrc:
if (m_response.size() > 0 || m_slaveRecvTimeout > SYN_TIMEOUT) { if (m_response.size() > 0 || m_slaveRecvTimeout > SYN_TIMEOUT) {
@@ -521,7 +524,7 @@ result_t BusHandler::handleSymbol() {
break; break;
case bs_sendResCrc: case bs_sendResCrc:
if (m_currentRequest != NULL) { if (m_answer) {
sendSymbol = m_crc; sendSymbol = m_crc;
sending = true; sending = true;
} }
@@ -893,7 +896,7 @@ result_t BusHandler::handleSymbol() {
return RESULT_OK; return RESULT_OK;
case bs_sendResCrc: case bs_sendResCrc:
if (!sending || m_currentRequest == NULL) { if (!sending || !m_answer) {
return setState(bs_skip, RESULT_ERR_INVALID_ARG); return setState(bs_skip, RESULT_ERR_INVALID_ARG);
} }
if (recvSymbol != sendSymbol) { if (recvSymbol != sendSymbol) {
@@ -960,10 +963,12 @@ result_t BusHandler::setState(BusState state, result_t result, bool firstRepetit
if (state == m_state) { if (state == m_state) {
return result; return result;
} }
if (result < RESULT_OK || (result != RESULT_OK && state == bs_skip)) { if ((result < RESULT_OK && !(result == RESULT_ERR_TIMEOUT && state == bs_skip && m_state == bs_ready))
|| (result != RESULT_OK && state == bs_skip && m_state != bs_ready)) {
logDebug(lf_bus, "%s during %s, switching to %s", getResultCode(result), getStateCode(m_state), logDebug(lf_bus, "%s during %s, switching to %s", getResultCode(result), getStateCode(m_state),
getStateCode(state)); getStateCode(state));
} else if (m_currentRequest != NULL || state == bs_sendCmd || state == bs_sendResAck || state == bs_sendSyn) { } else if (m_currentRequest != NULL || state == bs_sendCmd || state == bs_sendCmdCrc || state == bs_sendCmdAck
|| state == bs_sendRes || state == bs_sendResCrc || state == bs_sendResAck || state == bs_sendSyn) {
logDebug(lf_bus, "switching from %s to %s", getStateCode(m_state), getStateCode(state)); logDebug(lf_bus, "switching from %s to %s", getStateCode(m_state), getStateCode(state));
} }
if (state == bs_noSignal) { if (state == bs_noSignal) {