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

simplified

Browse Source
This commit is contained in:
john30
2016-01-02 13:07:57 +01:00
parent da40d514af
commit 4d461c9dff
1 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+4 -12
View File
@@ -570,8 +570,7 @@ result_t BusHandler::handleSymbol()
return setState(bs_skip, RESULT_ERR_ACK); return setState(bs_skip, RESULT_ERR_ACK);
case bs_sendCmd: case bs_sendCmd:
if (m_currentRequest != NULL && sending) { if (m_currentRequest != NULL && sending && recvSymbol == sendSymbol) {
if (recvSymbol == sendSymbol) {
// successfully sent // successfully sent
m_nextSendPos++; m_nextSendPos++;
if (m_nextSendPos >= m_currentRequest->m_master.size()) { if (m_nextSendPos >= m_currentRequest->m_master.size()) {
@@ -584,12 +583,10 @@ result_t BusHandler::handleSymbol()
} }
return RESULT_OK; return RESULT_OK;
} }
}
return setState(bs_skip, RESULT_ERR_INVALID_ARG); return setState(bs_skip, RESULT_ERR_INVALID_ARG);
case bs_sendResAck: case bs_sendResAck:
if (m_currentRequest != NULL && sending) { if (m_currentRequest != NULL && sending recvSymbol == sendSymbol) {
if (recvSymbol == sendSymbol) {
// successfully sent // successfully sent
if (!m_responseCrcValid) { if (!m_responseCrcValid) {
if (!m_repeat) { if (!m_repeat) {
@@ -601,7 +598,6 @@ result_t BusHandler::handleSymbol()
} }
return setState(bs_sendSyn, RESULT_OK); return setState(bs_sendSyn, RESULT_OK);
} }
}
return setState(bs_skip, RESULT_ERR_INVALID_ARG); return setState(bs_skip, RESULT_ERR_INVALID_ARG);
case bs_sendCmdAck: case bs_sendCmdAck:
@@ -646,8 +642,7 @@ result_t BusHandler::handleSymbol()
return setState(bs_skip, RESULT_ERR_INVALID_ARG); return setState(bs_skip, RESULT_ERR_INVALID_ARG);
case bs_sendRes: case bs_sendRes:
if (sending && m_answer) { if (sending && m_answer && recvSymbol == sendSymbol) {
if (recvSymbol == sendSymbol) {
// successfully sent // successfully sent
m_nextSendPos++; m_nextSendPos++;
if (m_nextSendPos >= m_response.size()) { if (m_nextSendPos >= m_response.size()) {
@@ -656,16 +651,13 @@ result_t BusHandler::handleSymbol()
} }
return RESULT_OK; return RESULT_OK;
} }
}
return setState(bs_skip, RESULT_ERR_INVALID_ARG); return setState(bs_skip, RESULT_ERR_INVALID_ARG);
case bs_sendSyn: case bs_sendSyn:
if (sending) { if (sending && recvSymbol == sendSymbol) {
if (recvSymbol == sendSymbol) {
// successfully sent // successfully sent
return setState(bs_skip, RESULT_OK); return setState(bs_skip, RESULT_OK);
} }
}
return setState(bs_skip, RESULT_ERR_INVALID_ARG); return setState(bs_skip, RESULT_ERR_INVALID_ARG);
} }