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

check pb+sb for validity, simplify request notification on signal loss

Browse Source
This commit is contained in:
John
2023-11-11 09:33:36 +01:00
parent dd3721e7f4
commit a8bd30a68f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/protocol_direct.cpp
+6 -5
View File
@@ -467,6 +467,10 @@ result_t DirectProtocolHandler::handleSymbol() {
return setState(bs_recvCmd, RESULT_OK);
case bs_recvCmd:
if ((m_command.size() == 0 && !isMaster(recvSymbol))
|| (m_command.size() == 1 && !isValidAddress(recvSymbol))) {
return setState(bs_skip, RESULT_ERR_INVALID_ADDR);
}
m_command.push_back(recvSymbol);
if (m_command.isComplete()) { // all data received
return setState(bs_recvCmdCrc, RESULT_OK);
@@ -701,11 +705,8 @@ result_t DirectProtocolHandler::setState(BusState state, result_t result, bool f
if (state == bs_noSignal) { // notify all requests
m_response.clear(); // notify with empty response
while ((m_currentRequest = m_nextRequests.pop()) != nullptr) {
bool restart = m_currentRequest->notify(RESULT_ERR_NO_SIGNAL, m_response);
if (restart) { // should not occur with no signal
m_currentRequest->resetBusLostRetries();
m_nextRequests.push(m_currentRequest);
} else if (m_currentRequest->deleteOnFinish()) {
m_currentRequest->notify(RESULT_ERR_NO_SIGNAL, m_response);
if (m_currentRequest->deleteOnFinish()) {
delete m_currentRequest;
} else {
m_finishedRequests.push(m_currentRequest);