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

fix for non-enhanced mode

Browse Source
This commit is contained in:
John
2021-01-10 13:25:44 +01:00
parent 326ff4bcde
commit 51eb3af351
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+4 -6
View File
@@ -438,6 +438,10 @@ result_t BusHandler::handleSymbol() {
case bs_skip: case bs_skip:
timeout = SYN_TIMEOUT; timeout = SYN_TIMEOUT;
case bs_ready:
if (m_currentRequest != nullptr) {
setState(bs_ready, RESULT_ERR_TIMEOUT); // just to be sure an old BusRequest is cleaned up
}
if (!m_device->isArbitrating() && m_currentRequest == nullptr && m_remainLockCount == 0) { if (!m_device->isArbitrating() && m_currentRequest == nullptr && m_remainLockCount == 0) {
BusRequest* startRequest = m_nextRequests.peek(); BusRequest* startRequest = m_nextRequests.peek();
if (startRequest == nullptr && m_pollInterval > 0) { // check for poll/scan if (startRequest == nullptr && m_pollInterval > 0) { // check for poll/scan
@@ -474,12 +478,6 @@ result_t BusHandler::handleSymbol() {
} }
break; break;
case bs_ready:
if (m_currentRequest != nullptr) {
setState(bs_ready, RESULT_ERR_TIMEOUT); // just to be sure an old BusRequest is cleaned up
}
break;
case bs_recvCmd: case bs_recvCmd:
case bs_recvCmdCrc: case bs_recvCmdCrc:
timeout = m_slaveRecvTimeout; timeout = m_slaveRecvTimeout;