projects/evDash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: processing of merged data called twice when single frame received

Browse Source
This commit is contained in:
Ján Mátik
2020-12-28 16:58:48 +01:00
parent 6cc3c5dcf4
commit 85e99a156e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CommObd2Can.cpp
View File

@@ -80,7 +80,7 @@ void CommObd2Can::mainLoop() {
// if delay between commands is defined, check if this delay is not expired // if delay between commands is defined, check if this delay is not expired
if (liveData->delayBetweenCommandsMs != 0) { if (liveData->delayBetweenCommandsMs != 0) {
if (bResponseProcessed & (unsigned long)(millis() - lastDataSent) > liveData->delayBetweenCommandsMs) { if (bResponseProcessed && (unsigned long)(millis() - lastDataSent) > liveData->delayBetweenCommandsMs) {
bResponseProcessed = false; bResponseProcessed = false;
liveData->canSendNextAtCommand = true; liveData->canSendNextAtCommand = true;
return; return;
@@ -245,7 +245,6 @@ uint8_t CommObd2Can::receivePID() {
lastDataSent = millis(); lastDataSent = millis();
syslog->infoNolf(DEBUG_COMM, " CAN READ "); syslog->infoNolf(DEBUG_COMM, " CAN READ ");
CAN->readMsgBuf(&rxId, &rxLen, rxBuf); // Read data: len = data length, buf = data byte(s) CAN->readMsgBuf(&rxId, &rxLen, rxBuf); // Read data: len = data length, buf = data byte(s)
// mockupReceiveCanBuf(&rxId, &rxLen, rxBuf);
if ((rxId & 0x80000000) == 0x80000000) // Determine if ID is standard (11 bits) or extended (29 bits) if ((rxId & 0x80000000) == 0x80000000) // Determine if ID is standard (11 bits) or extended (29 bits)
sprintf(msgString, "Extended ID: 0x%.8lX DLC: %1d Data:", (rxId & 0x1FFFFFFF), rxLen); sprintf(msgString, "Extended ID: 0x%.8lX DLC: %1d Data:", (rxId & 0x1FFFFFFF), rxLen);
@@ -366,6 +365,8 @@ bool CommObd2Can::processFrameBytes() {
buffer2string(liveData->responseRowMerged, mergedData.data(), mergedData.size()); buffer2string(liveData->responseRowMerged, mergedData.data(), mergedData.size());
liveData->vResponseRowMerged.assign(mergedData.begin(), mergedData.end()); liveData->vResponseRowMerged.assign(mergedData.begin(), mergedData.end());
processMergedResponse(); processMergedResponse();
return true;
} }
break; break;