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

Fix timeout after CAN send.

Browse Source 
Signed-off-by: Martin Kolací <martin.kolaci@lmc.eu>
This commit is contained in:
Martin Kolací
2020-12-21 14:01:20 +01:00
parent 0bd5fd0f74
commit 5721a8aaef
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CommObd2Can.cpp
View File

@@ -78,7 +78,7 @@ void CommObd2Can::mainLoop() {
}
}
Serial.println(liveData->params.currentTime );
if (lastDataSent != 0 && liveData->params.currentTime + 2 > lastDataSent) {
if (lastDataSent != 0 && (unsigned long)(millis() - lastDataSent) > 500) {
Serial.print("CAN execution timeout. Continue with next command.");
liveData->canSendNextAtCommand = true;
return;
@@ -92,7 +92,6 @@ void CommObd2Can::executeCommand(String cmd) {
Serial.print("executeCommand ");
Serial.println(cmd);
lastDataSent = 0;
if (cmd.equals("") || cmd.startsWith("AT")) { // skip AT commands as not used by direct CAN connection
liveData->canSendNextAtCommand = true;
@@ -140,7 +139,7 @@ void CommObd2Can::sendPID(const uint16_t pid, const String& cmd) {
Serial.print(msgString);
}
Serial.println("");
lastDataSent = liveData->params.currentTime;
lastDataSent = millis();
}
/**