From 038bb0e8ea9f1905b81c5034966742a83fa27ee1 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Mon, 17 Apr 2017 12:09:23 +0200
Subject: [PATCH] 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

---
 src/ebusd/bushandler.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp
index 0ad1ad7e..754fb551 100644
--- a/src/ebusd/bushandler.cpp
+++ b/src/ebusd/bushandler.cpp
@@ -468,10 +468,13 @@ result_t BusHandler::handleSymbol() {
 
   case bs_recvCmd:
   case bs_recvCmdCrc:
-  case bs_recvCmdAck:
     timeout = m_slaveRecvTimeout;
     break;
 
+  case bs_recvCmdAck:
+    timeout = m_slaveRecvTimeout+(m_currentRequest ? m_transferLatency:0);
+    break;
+
   case bs_recvRes:
   case bs_recvResCrc:
     if (m_response.size() > 0 || m_slaveRecvTimeout > SYN_TIMEOUT) {
@@ -521,7 +524,7 @@ result_t BusHandler::handleSymbol() {
     break;
 
   case bs_sendResCrc:
-    if (m_currentRequest != NULL) {
+    if (m_answer) {
       sendSymbol = m_crc;
       sending = true;
     }
@@ -893,7 +896,7 @@ result_t BusHandler::handleSymbol() {
     return RESULT_OK;
 
   case bs_sendResCrc:
-    if (!sending || m_currentRequest == NULL) {
+    if (!sending || !m_answer) {
       return setState(bs_skip, RESULT_ERR_INVALID_ARG);
     }
     if (recvSymbol != sendSymbol) {
@@ -960,10 +963,12 @@ result_t BusHandler::setState(BusState state, result_t result, bool firstRepetit
   if (state == m_state) {
     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),
         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));
   }
   if (state == bs_noSignal) {