Merge remote-tracking branch 'origin/master' into enhanced_device

# Conflicts: # src/ebusd/bushandler.cpp
2018-09-15 14:31:28 +02:00
parent 13ee2a1fd7 065fd76dc1
commit 83708bf06e
1 changed files with 2 additions and 1 deletions
@@ -572,7 +572,8 @@ result_t BusHandler::handleSymbol() {
  // receive next symbol (optionally check reception of sent symbol)
  symbol_t recvSymbol;
  ArbitrationState arbitrationState = as_none;
-  result = m_device->recv(timeout+m_transferLatency, &recvSymbol, &arbitrationState);
+  bool isAutoSyn = !sending && m_generateSynInterval == SYN_TIMEOUT && (m_state == bs_noSignal || m_state == bs_skip);
+  result = m_device->recv(timeout+(isAutoSyn ? 0 : m_transferLatency), &recvSymbol, &arbitrationState);
  if (sending) {
    clockGettime(&recvTime);
  }