can done

CarKiaEniro.cpp

@@ -42,6 +42,11 @@ void CarKiaEniro::activateCommandQueue() {
 
     // Loop from (KIA ENIRO)
 
+    // VMCU
+    "ATSH7E2",
+    "2101",     // speed, ...
+    "2102",     // aux, ...
+
     // ABS / ESP + AHB
     "ATSH7D1",
     "22C101",     // brake, park/drive mode
@@ -51,11 +56,6 @@ void CarKiaEniro::activateCommandQueue() {
     "22BC03",     // low beam
     "22BC06",     // brake light
 
-    // VMCU
-    "ATSH7E2",
-    "2101",     // speed, ...
-    "2102",     // aux, ...
-
     // BMS
     "ATSH7E4",
     "220101",   // power kw, ...
@@ -84,6 +84,7 @@ void CarKiaEniro::activateCommandQueue() {
   liveData->params.batModuleTempCount = 4;
   liveData->params.batteryTotalAvailableKWh = 64;
   // =(I18*0,615)*(1+(I18*0,0008)) soc to kwh niro ev 2020
+  // Calculates based on nick.n17 dashboard data
   if (liveData->settings.carType == CAR_KIA_ENIRO_2020_39 || liveData->settings.carType == CAR_HYUNDAI_KONA_2020_39) {
     liveData->params.batteryTotalAvailableKWh = 39.2;
   }
@@ -451,4 +452,3 @@ void CarKiaEniro::loadTestData() {
   liveData->params.soc10time[0] = liveData->params.soc10time[1] + 900;
 
 }
-

CommObd2Can.cpp

@@ -54,17 +54,18 @@ void CommObd2Can::mainLoop() {
 
   CommInterface::mainLoop();
 
-  // Receive
+  // Read data
-  /*    byte b = receivePID(0);
+  byte b = receivePID();
-    if (b == 0x10) {
+  if (b & 0xf0 == 0x10) { // First frame, request another
-    Serial.println("CONTINUE");
+    sendFlowControlFrame();
-    sendPID(0x01, 0x00);
     delay(10);
-    for (byte i = 0; i < 20; i++) {
+    for (byte i = 0; i < 50; i++) {
-      receivePID(0);
+      receivePID();
+      if (rxRemaining <= 0)
+        break;
       delay(10);
     }
-  */
+  }
 }
 
 /**
@@ -72,18 +73,20 @@ void CommObd2Can::mainLoop() {
 */
 void CommObd2Can::executeCommand(String cmd) {
 
+  Serial.print("executeCommand ");
+  Serial.println(cmd);
+
   if (cmd.startsWith("AT")) {
-   liveData->canSendNextAtCommand = true;
+    liveData->canSendNextAtCommand = true;
     return;
   }
 
   // pid
-  /*String atsh = liveData->currentAtshRequest;
+  liveData->responseRowMerged = "";
-  atsh = atsh.replace(" ", "");
+  liveData->currentAtshRequest.replace(" ", "");
-  atsh = atsh.substring(4); // remove ATSH
+  String atsh = "0" + liveData->currentAtshRequest.substring(4); // remove ATSH
-  String tmpCmd = cmd;
+  cmd.replace(" ", "");
-  tmpCmd = tmpCmd.replace(" ", "");
+  sendPID(liveData->hexToDec(atsh, 2, false), cmd);
-  sendPID(liveData->hexToDec(liveData->currentAtshRequest, 2, false), tmpCmd);*/
   //delay(delayTxRx);
 }
 
@@ -95,30 +98,32 @@ void CommObd2Can::sendPID(uint16_t pid, String cmd) {
   unsigned char tmp[8];
   String tmpStr;
 
-/*  tmp[0] = cmd.length() / 2;
+  tmp[0] = cmd.length() / 2;
   for (byte i = 1; i < 8; i++) {
     tmp[i] = 0x00;
   }
   for (byte i = 0; i < 7; i++) {
     tmpStr = cmd;
-    tmpStr = tmpStr.substring(i * 2, ((i + 1) * 2);
+    tmpStr = tmpStr.substring(i * 2, ((i + 1) * 2));
     if (tmpStr != "") {
-    tmp[i + 1] = liveData->hexToDec(tmpString, 1, false);
+      tmp[i + 1] = liveData->hexToDec(tmpStr, 1, false);
     }
   }
 
+  lastPid = pid;
   byte sndStat = CAN->sendMsgBuf(pid, 0, 8, tmp); // 11 bit
   //  byte sndStat = CAN->sendMsgBuf(0x7e4, 1, 8, tmp); // 29 bit extended frame
   if (sndStat == CAN_OK)  {
     Serial.print("SENT ");
-    for (byte i = 0; i < 8; i++) {
-      sprintf(msgString, " 0x%.2X", tmp[i]);
-      Serial.print(msgString);
-    }
-    Serial.println("");
   }   else {
-    Serial.print("Error Sending PID2 0x");
+    Serial.print("Error sending PID ");
-  }*/
+  }
+  Serial.print(pid);
+  for (byte i = 0; i < 8; i++) {
+    sprintf(msgString, " 0x%.2X", tmp[i]);
+    Serial.print(msgString);
+  }
+  Serial.println("");
 }
 
 /**
@@ -127,41 +132,41 @@ void CommObd2Can::sendPID(uint16_t pid, String cmd) {
 void CommObd2Can::sendFlowControlFrame() {
 
   unsigned char tmp[8];
-/*
+
   Serial.println("Flow control frame");
   tmp[0] = 0x30;
   for (byte i = 1; i < 8; i++) {
     tmp[i] = 0x00;
   }
 
-  byte sndStat = CAN->sendMsgBuf(pid, 0, 8, tmp); // 11 bit
+  byte sndStat = CAN->sendMsgBuf(lastPid, 0, 8, tmp); // 11 bit
-  //  byte sndStat = CAN->sendMsgBuf(0x7e4, 1, 8, tmp); // 29 bit extended frame
   if (sndStat == CAN_OK)  {
-    Serial.print("SENT ");
+    Serial.print("Flow control frame sent ");
-    for (byte i = 0; i < 8; i++) {
-      sprintf(msgString, " 0x%.2X", tmp[i]);
-      Serial.print(msgString);
-    }
-    Serial.println("");
   }   else {
-    Serial.print("Error Sending PID2 0x");
+    Serial.print("Error sending flow control frame ");
-  }*/
+  }
+  Serial.print(lastPid);
+  for (byte i = 0; i < 8; i++) {
+    sprintf(msgString, " 0x%.2X", tmp[i]);
+    Serial.print(msgString);
+  }
+  Serial.println("");
 }
 
 /**
- * Receive PID
+   Receive PID
- */
+*/
-/*byte CommObd2Can::receivePID() {
+byte CommObd2Can::receivePID() {
 
-  if (!digitalRead(CAN_INT))                        // If CAN0_INT pin is low, read receive buffer
+  if (!digitalRead(pinCanInt))                        // If CAN0_INT pin is low, read receive buffer
   {
     Serial.print(" CAN READ ");
-    CAN->readMsgBuf(&rxId, &len, rxBuf);      // Read data: len = data length, buf = data byte(s)
+    CAN->readMsgBuf(&rxId, &rxLen, rxBuf);      // Read data: len = data length, buf = data byte(s)
 
     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), len);
+      sprintf(msgString, "Extended ID: 0x%.8lX  DLC: %1d  Data:", (rxId & 0x1FFFFFFF), rxLen);
     else
-      sprintf(msgString, "Standard ID: 0x%.3lX       DLC: %1d  Data:", rxId, len);
+      sprintf(msgString, "Standard ID: 0x%.3lX       DLC: %1d  Data:", rxId, rxLen);
 
     Serial.print(msgString);
 
@@ -169,16 +174,75 @@ void CommObd2Can::sendFlowControlFrame() {
       sprintf(msgString, " REMOTE REQUEST FRAME");
       Serial.print(msgString);
     } else {
-      for (byte i = 0; i < len; i++) {
+      for (byte i = 0; i < rxLen; i++) {
         sprintf(msgString, " 0x%.2X", rxBuf[i]);
         Serial.print(msgString);
       }
     }
 
     Serial.println();
+    processFrame();
   } else {
-    Serial.println(" CAN NOT READ ");
+    //Serial.println(" CAN NOT READ ");
+    return 0xff;
   }
-  
+
   return rxBuf[0];
-}*/
+}
+
+/**
+   Process can frame
+   https://en.wikipedia.org/wiki/ISO_15765-2
+*/
+bool CommObd2Can::processFrame() {
+
+  byte frameType = (rxBuf[0] & 0xf0) >> 4;
+  byte start = 1; // Single and Consecutive starts with pos 1
+  byte index = 0; // 0 - f
+
+  liveData->responseRow = "";
+  switch (frameType) {
+    // Single frame
+    case 0:
+      rxRemaining = (rxBuf[1] & 0x0f);
+      break;
+    // First frame
+    case 1:
+      rxRemaining = ((rxBuf[0] & 0x0f) << 8) + rxBuf[1];
+      liveData->responseRow = "0:";
+      start = 2;
+      break;
+    // Consecutive frames
+    case 2:
+      index = (rxBuf[0] & 0x0f);
+      sprintf(msgString, "%.1X:", index);
+      liveData->responseRow = msgString; // convert 0..15 to ascii 0..F);
+      break;
+  }
+
+  Serial.print("> frametype:");
+  Serial.print(frameType);
+  Serial.print(", r: ");
+  Serial.print(rxRemaining);
+  Serial.print("   ");
+
+  for (byte i = start; i < rxLen; i++) {
+    sprintf(msgString, "%.2X", rxBuf[i]);
+    liveData->responseRow += msgString;
+    rxRemaining--;
+  }
+
+  parseResponse();
+
+  // Send command to board module (obd2 simulation)
+  if (rxRemaining <= 0) {
+    Serial.print("merged:");
+    Serial.println(liveData->responseRowMerged);
+    board->parseRowMerged();
+    liveData->responseRowMerged = "";
+    liveData->canSendNextAtCommand = true;
+    return false;
+  }
+
+  return true;
+}

CommObd2Can.h

@@ -11,9 +11,11 @@ class CommObd2Can : public CommInterface {
     byte pinCanCs = 12;
     MCP_CAN* CAN;
     long unsigned int rxId;
-    unsigned char len = 0;
+    unsigned char rxLen = 0;
-    unsigned char rxBuf[512];
+    unsigned char rxBuf[32];
+    int16_t rxRemaining; // Remaining bytes to complete message
     char msgString[128];                        // Array to store serial string
+    uint16_t lastPid;
   public:
     void connectDevice() override;
     void disconnectDevice() override;
@@ -23,9 +25,6 @@ class CommObd2Can : public CommInterface {
     //
     void sendPID(uint16_t pid, String cmd);
     void sendFlowControlFrame();
-    /* void startBleScan();
+    byte receivePID();
-      bool connectToServer(BLEAddress pAddress);
+    bool processFrame();
-      bool doNextAtCommand();
-      bool parseRow();
-      bool parseRowMerged(); */
 };