Updates for arduino-esp32 3.0.5

Author: codingABI

LICENSE

@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2023, codingABI
+Copyright (c) 2024, codingABI
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

README.md

@@ -3,7 +3,7 @@ The *id3esp32obd2* is an ESP32 based DIY OBD2 Bluetooth dongle and an Android ap
 
 ![Overview](assets/images/Overview.jpg)
 
-Watch the device in Version 1.0.0 on [YouTube](https://youtu.be/gbIHqaEMSuo)
+Watch the device in version 1.0.0 on [YouTube](https://youtu.be/gbIHqaEMSuo)
 
 The following diagnostics data values are supported at the moment:
 - SOC (BMS)
@@ -38,7 +38,7 @@ The following diagnostics data values are supported at the moment:
 - This is no a complete ISO-TP and/or UDS implementation. It is just enough to receive some data from a VW ID.3. I'm no CAN expert, just a beginner
 
 ## License and copyright
-This project is licensed under the terms of the 2-Clause BSD License [Copyright (c) 2023 codingABI](LICENSE). 
+This project is licensed under the terms of the 2-Clause BSD License [Copyright (c) 2024 codingABI](LICENSE). 
 
 ## Appendix
 ### Hardware
@@ -55,7 +55,7 @@ Power consumption: 0.6W (0.3W when Android device is not connected), 0W when pow
 ### Used Arduino development environment
 
 - Arduino IDE 2.3.4 or 1.8.19
-- arduino-esp32 2.0.17
+- arduino-esp32 3.0.5 (Version 2.0.x works with older version [id3esp32obd2 v2.0.0](https://github.com/codingABI/id3esp32obd2/releases/tag/v2.0.0)
 
 ### OBD2 and power supply
 The VW ID.3 has an ODB2 female connector below the steering wheel:

id3esp32obd2/UDS.ino

@@ -55,7 +55,7 @@ void showBuffer() {
 }
 
 // Show content of a CAN message
-void showMessage(can_message_t *message) {
+void showMessage(twai_message_t *message) {
   #define MAXSTRDATALENGTH 80
   char strData[MAXSTRDATALENGTH+1];
 
@@ -66,7 +66,7 @@ void showMessage(can_message_t *message) {
   Serial.print(" Length:");
   Serial.print(message->data_length_code);
 
-  if (!(message->flags & CAN_MSG_FLAG_RTR)) {
+  if (!(message->flags & TWAI_MSG_FLAG_RTR)) {
     Serial.print(" Data:");
     for (int i=0; i < message->data_length_code;i++) {
       snprintf(strData,MAXSTRDATALENGTH+1,"%02X",message->data[i]);
@@ -83,12 +83,12 @@ unsigned long swapIsoTpSourceTarget(unsigned long canID) {
 
 // Send a UDS request and write response to the receive buffer
 bool sendUDSRequest(unsigned long canID, byte serviceID, byte parameterIDHighByte, byte parameterIDLowByte) {
-  can_message_t txMessage, rxMessage, fcMessage;
+  twai_message_t txMessage, rxMessage, fcMessage;
   unsigned long lastSentMS;
   byte flags = 0;
   esp_err_t error;
 
-  if (canID > 2047) flags = CAN_MSG_FLAG_EXTD; // 29 bit ID needed?
+  if (canID > 2047) flags = TWAI_MSG_FLAG_EXTD; // 29 bit ID needed?
 
   // Clear receive buffer before requesting new data
   clearBuffer();
@@ -109,7 +109,7 @@ bool sendUDSRequest(unsigned long canID, byte serviceID, byte parameterIDHighByt
   Serial.print("Send    ");
   showMessage(&txMessage);  
   Serial.println();
-  error = can_transmit(&txMessage, pdMS_TO_TICKS(CAN_SEND_TIMEOUT));
+  error = twai_transmit(&txMessage, pdMS_TO_TICKS(TWAI_SEND_TIMEOUT));
   if (error != ESP_OK) {
     Serial.print("Send error ");
     Serial.println(esp_err_to_name(error));
@@ -119,12 +119,12 @@ bool sendUDSRequest(unsigned long canID, byte serviceID, byte parameterIDHighByt
 
   do { // Receive frames until correct response, timeout or failure
     long remainingTimeoutMS;
-    remainingTimeoutMS = CAN_RECEIVE_TIMEOUT-(millis()-lastSentMS);
+    remainingTimeoutMS = TWAI_RECEIVE_TIMEOUT-(millis()-lastSentMS);
     if (remainingTimeoutMS <= 0) {
       Serial.println("Timeout receiving message");
       return false; // Abort
     }
-    error = can_receive(&rxMessage, pdMS_TO_TICKS(remainingTimeoutMS));
+    error = twai_receive(&rxMessage, pdMS_TO_TICKS(remainingTimeoutMS));
     if (error != ESP_OK) {
       Serial.print("Receive error ");
       Serial.println(esp_err_to_name(error));
@@ -247,22 +247,22 @@ bool sendUDSRequest(unsigned long canID, byte serviceID, byte parameterIDHighByt
       Serial.print("Send    ");
       showMessage(&fcMessage);  
       Serial.println();
-      error = can_transmit(&fcMessage, pdMS_TO_TICKS(CAN_SEND_TIMEOUT));
+      error = twai_transmit(&fcMessage, pdMS_TO_TICKS(TWAI_SEND_TIMEOUT));
       if (error != ESP_OK) {
         Serial.print("Send error ");
         Serial.println(esp_err_to_name(error));
         return false; // Abort
       }
 
-      // First frame has 6 byte payload and consecutive frames 7 bytes 
+      // First frame has 6 bytes payload and the consecutive frames 7 bytes 
       int frames = (frameSize)/7;
       Serial.print("Expect ");
       Serial.print(frames);
       Serial.println(" frames");
 
       unsigned long originIdentifier = rxMessage.identifier;
       while (g_dataBufferLength < frameSize - 3) {
-        error = can_receive(&rxMessage, pdMS_TO_TICKS(CAN_RECEIVE_TIMEOUT));
+        error = twai_receive(&rxMessage, pdMS_TO_TICKS(TWAI_RECEIVE_TIMEOUT));
         if (error != ESP_OK) {
           Serial.print("Receive error ");
           Serial.println(esp_err_to_name(error));
@@ -292,6 +292,6 @@ bool sendUDSRequest(unsigned long canID, byte serviceID, byte parameterIDHighByt
       showBuffer();
       return true; // Receive message successfully parsed
     }
-  } while (millis()-lastSentMS < CAN_RECEIVE_TIMEOUT);
+  } while (millis()-lastSentMS < TWAI_RECEIVE_TIMEOUT);
   return false; // No matching receive message
 }

id3esp32obd2/id3esp32obd2.ino

@@ -29,7 +29,7 @@
  * - GPS longitude
  * 
  * License: 2-Clause BSD License
- * Copyright (c) 2023 codingABI
+ * Copyright (c) 2024 codingABI
  * For details see: License.txt
  * 
  * created by codingABI https://github.com/codingABI/id3esp32obd2
@@ -67,10 +67,11 @@
  * 20230626, Initial version
  * 20230712, Add support for "PTC heater current", "Outside temperature", "Inside temperature", "Cruising range", "Charging state", "CO2 content interior"
  * 20230719, Add support for "GPS time", "GPS height", "GPS latitude" and "GPS longitude", Sync ESP32 time with "GPS Time"
+ * 20241205, Update arduino-esp32 from 2.0.17 to 3.0.5 (IDF 5.1.4)
  */
 
 #include <driver/gpio.h>
-#include <driver/can.h>
+#include <driver/twai.h>
 #include "secrets.h"
 #include <BluetoothSerial.h>
 #if !defined(CONFIG_BT_ENABLED) || !defined(CONFIG_BLUEDROID_ENABLED)
@@ -83,8 +84,8 @@
 #define BTDEVICENAME "id3esp32obd2"
 
 // Some CAN/UDS/ISOTP definitions
-#define CAN_RECEIVE_TIMEOUT 1000 // 10000
-#define CAN_SEND_TIMEOUT 4000
+#define TWAI_RECEIVE_TIMEOUT 1000 // 10000
+#define TWAI_SEND_TIMEOUT 4000
 #define UDS_ReadDataByIdentifier_0x22 0x22
 #define UDS_DiagnosticSessionControl_0x10 0x10
 #define UDS_ExtendedDiagnosticSession_0x03 0x03
@@ -172,63 +173,48 @@ enum beepTypes { DEFAULTBEEP, SHORTBEEP, LONGBEEP, HIGHSHORTBEEP, LASER };
 void beep(int type=DEFAULTBEEP) {
   // User PWM to improve quality
   switch(type) {
-    case DEFAULTBEEP: { // 500 Hz for 200ms
-      ledcSetup(0, 500, 8);
-      ledcAttachPin(BUZZER_PIN, 0);
-      ledcWrite(0, 128);
+    case DEFAULTBEEP: // 500 Hz for 200ms
+      ledcAttach(BUZZER_PIN,500,8);
+      ledcWrite(BUZZER_PIN, 128);
       delay(200);
-      ledcWrite(0, 0);
-      ledcDetachPin(BUZZER_PIN);          
+      ledcWrite(BUZZER_PIN, 0);
+      ledcDetach(BUZZER_PIN);          
       break;
-    }
-    case SHORTBEEP: { // 1 kHz for 100ms
-      ledcSetup(0, 1000, 8);
-      ledcAttachPin(BUZZER_PIN, 0);
-      ledcWrite(0, 128);
+    case SHORTBEEP: // 1 kHz for 100ms
+      ledcAttach(BUZZER_PIN,1000,8);
+      ledcWrite(BUZZER_PIN, 128);
       delay(100);
-      ledcWrite(0, 0);
-      ledcDetachPin(BUZZER_PIN);          
+      ledcWrite(BUZZER_PIN, 0);
+      ledcDetach(BUZZER_PIN);          
       break;
-    }
-    case LONGBEEP: { // 250 Hz for 400ms
-      ledcSetup(0, 250, 8);
-      ledcAttachPin(BUZZER_PIN, 0);
-      ledcWrite(0, 128);
+    case LONGBEEP: // 250 Hz for 400ms
+      ledcAttach(BUZZER_PIN,250,8);
+      ledcWrite(BUZZER_PIN, 128);
       delay(400);
-      ledcWrite(0, 0);
-      ledcDetachPin(BUZZER_PIN);          
+      ledcWrite(BUZZER_PIN, 0);
+      ledcDetach(BUZZER_PIN);          
       break;
-    }
     case HIGHSHORTBEEP: { // High and short beep 
-      ledcSetup(0, 5000, 8);
-      ledcAttachPin(BUZZER_PIN, 0);
-      ledcWrite(0, 128);
+      ledcAttach(BUZZER_PIN,5000,8);
+      ledcWrite(BUZZER_PIN, 128);
       delay(100);
-      ledcWrite(0, 0);
-      ledcDetachPin(BUZZER_PIN);          
+      ledcWrite(BUZZER_PIN, 0);
+      ledcDetach(BUZZER_PIN);          
       break;
     }
     case LASER: { // Laser like sound
       int i = 5000; // Start frequency in Hz (goes down to 300 Hz)
       int j = 300; // Start duration in microseconds (goes up to 5000 microseconds)
-      ledcSetup(0, i, 8);
-      ledcAttachPin(BUZZER_PIN, 0);
-      ledcWrite(0, 0);
+      ledcAttach(BUZZER_PIN,i,8);
       while (i>300) {
         i -=50;
         j +=50;
-        ledcSetup(0, i, 8);
-        ledcWrite(0, 128);
-        delayMicroseconds(j);
-        ledcWrite(0,0);
-        delayMicroseconds(1000);
+        ledcWriteTone(BUZZER_PIN,i);
+        delayMicroseconds(j+1000);
       }
-      ledcWrite(0, 0);
-      ledcDetachPin(BUZZER_PIN);          
+      ledcDetach(BUZZER_PIN);
       break;
     }
-    default: {
-    }
   }
 }
 
@@ -320,16 +306,16 @@ void setup() {
   setCpuFrequencyMhz(80);
 
   // Init CAN
-  can_general_config_t g_config = CAN_GENERAL_CONFIG_DEFAULT(CTX_PIN, CRX_PIN, CAN_MODE_NORMAL);
-  can_timing_config_t t_config = CAN_TIMING_CONFIG_500KBITS();
-  can_filter_config_t f_config = CAN_FILTER_CONFIG_ACCEPT_ALL();
-  if (can_driver_install(&g_config, &t_config, &f_config) == ESP_OK) {
+  twai_general_config_t g_config = TWAI_GENERAL_CONFIG_DEFAULT(CTX_PIN, CRX_PIN, TWAI_MODE_NORMAL);
+  twai_timing_config_t t_config = TWAI_TIMING_CONFIG_500KBITS();
+  twai_filter_config_t f_config = TWAI_FILTER_CONFIG_ACCEPT_ALL();
+  if (twai_driver_install(&g_config, &t_config, &f_config) == ESP_OK) {
     Serial.println("CAN driver installed");
   } else {
     Serial.println("Failed to install CAN driver");
   }
 
-  if (can_start() == ESP_OK) {
+  if (twai_start() == ESP_OK) {
     Serial.println("CAN driver started");
   } else {
     Serial.println("Failed to start CAN driver");