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-22 10:04:27 +01:00
parent 70ad6c5c01
commit a98b9b2b52
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CommObd2Can.cpp
View File

@@ -77,6 +77,7 @@ void CommObd2Can::mainLoop() {
delay(1); delay(1);
// apply timeout for next frames loop too // apply timeout for next frames loop too
if (lastDataSent != 0 && (unsigned long)(millis() - lastDataSent) > 100) { if (lastDataSent != 0 && (unsigned long)(millis() - lastDataSent) > 100) {
Serial.print("CAN execution timeout (multiframe message).");
break; break;
} }
} }
@@ -157,7 +158,7 @@ void CommObd2Can::sendPID(const uint16_t pid, const String& cmd) {
*/ */
void CommObd2Can::sendFlowControlFrame() { void CommObd2Can::sendFlowControlFrame() {
uint8_t txBuf[8] = { 0x30, 0, 0, 0, 0, 0, 0, 0 }; uint8_t txBuf[8] = { 0x30, requestFramesCount /*request count*/, 14 /*ms between frames*/ , 0, 0, 0, 0, 0 };
const uint8_t sndStat = CAN->sendMsgBuf(lastPid, 0, 8, txBuf); // 11 bit const uint8_t sndStat = CAN->sendMsgBuf(lastPid, 0, 8, txBuf); // 11 bit
if (sndStat == CAN_OK) { if (sndStat == CAN_OK) {
Serial.print("Flow control frame sent "); Serial.print("Flow control frame sent ");
@@ -225,10 +226,12 @@ bool CommObd2Can::processFrame() {
// Single frame // Single frame
case 0: case 0:
rxRemaining = (rxBuf[1] & 0x0f); rxRemaining = (rxBuf[1] & 0x0f);
requestFramesCount = 0;
break; break;
// First frame // First frame
case 1: case 1:
rxRemaining = ((rxBuf[0] & 0x0f) << 8) + rxBuf[1]; rxRemaining = ((rxBuf[0] & 0x0f) << 8) + rxBuf[1];
requestFramesCount = ceil((rxRemaining - 6) / 7.0);
liveData->responseRowMerged = ""; liveData->responseRowMerged = "";
for (uint16_t i = 0; i < rxRemaining - 1; i++) for (uint16_t i = 0; i < rxRemaining - 1; i++)
liveData->responseRowMerged += "00"; liveData->responseRowMerged += "00";

3
CommObd2Can.h
View File

@@ -15,7 +15,8 @@ class CommObd2Can : public CommInterface {
long unsigned int rxId; long unsigned int rxId;
unsigned char rxLen = 0; unsigned char rxLen = 0;
uint8_t rxBuf[32]; uint8_t rxBuf[32];
int16_t rxRemaining; // Remaining bytes to complete message int16_t rxRemaining; // Remaining bytes to complete message, signed is ok
uint8_t requestFramesCount;
char msgString[128]; // Array to store serial string char msgString[128]; // Array to store serial string
uint16_t lastPid; uint16_t lastPid;
unsigned long lastDataSent = 0; unsigned long lastDataSent = 0;