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

can

Browse Source
This commit is contained in:
Lubos Petrovic
2020-12-21 18:32:18 +01:00
parent b02394c4aa
commit d3b0f907fe
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CommObd2Can.cpp
View File

@@ -70,15 +70,14 @@ void CommObd2Can::mainLoop() {
if ((firstByte & 0xf0) == 0x10) { // First frame, request another if ((firstByte & 0xf0) == 0x10) { // First frame, request another
sendFlowControlFrame(); sendFlowControlFrame();
delay(10); delay(10);
for (uint8_t i = 0; i < 50; i++) { for (uint16_t i = 0; i < 1000; i++) {
receivePID(); receivePID();
if (rxRemaining <= 2) if (rxRemaining <= 2)
break; break;
delay(10); delay(1);
} }
delay(30);
} }
if (lastDataSent != 0 && (unsigned long)(millis() - lastDataSent) > 500) { if (lastDataSent != 0 && (unsigned long)(millis() - lastDataSent) > 100) {
Serial.print("CAN execution timeout. Continue with next command."); Serial.print("CAN execution timeout. Continue with next command.");
liveData->canSendNextAtCommand = true; liveData->canSendNextAtCommand = true;
return; return;
@@ -132,6 +131,7 @@ void CommObd2Can::sendPID(const uint16_t pid, const String& cmd) {
// uint8_t sndStat = CAN->sendMsgBuf(0x7e4, 1, 8, tmp); // 29 bit extended frame // uint8_t sndStat = CAN->sendMsgBuf(0x7e4, 1, 8, tmp); // 29 bit extended frame
if (sndStat == CAN_OK) { if (sndStat == CAN_OK) {
Serial.print("SENT "); Serial.print("SENT ");
lastDataSent = millis();
} else { } else {
Serial.print("Error sending PID "); Serial.print("Error sending PID ");
} }
@@ -141,7 +141,6 @@ void CommObd2Can::sendPID(const uint16_t pid, const String& cmd) {
Serial.print(msgString); Serial.print(msgString);
} }
Serial.println(""); Serial.println("");
lastDataSent = millis();
} }
/** /**
@@ -171,6 +170,7 @@ uint8_t CommObd2Can::receivePID() {
if (!digitalRead(pinCanInt)) // If CAN0_INT pin is low, read receive buffer if (!digitalRead(pinCanInt)) // If CAN0_INT pin is low, read receive buffer
{ {
lastDataSent = millis();
Serial.print(" CAN READ "); Serial.print(" 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)

4
evDash.ino
View File

@@ -1,7 +1,5 @@
/* /*
Project renamed from eNiroDashboard to evDash Project renamed from eNiroDashboard to evDash
!! Supported BLE4 adapter is Vgate ICar Pro BLE4 version
Serial console commands Serial console commands