From 264a53dacfaf502654f80206c972153db3378ac6 Mon Sep 17 00:00:00 2001
From: Harald Barth <haba@kth.se>
Date: Sun, 2 Jun 2024 21:10:57 +0200
Subject: [PATCH 1/3] ESP32: Refuse IDF5

---
 DCCTimerESP.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/DCCTimerESP.cpp b/DCCTimerESP.cpp
index 93711aa..8927573 100644
--- a/DCCTimerESP.cpp
+++ b/DCCTimerESP.cpp
@@ -76,8 +76,13 @@ int DCCTimer::freeMemory() {
 #endif
 
 ////////////////////////////////////////////////////////////////////////
-
 #ifdef ARDUINO_ARCH_ESP32
+
+#include "esp_idf_version.h"
+#if ESP_IDF_VERSION_MAJOR > 4
+#error "DCC-EX does not support compiling with IDF version 5.0 or later. Downgrade your ESP32 library to a version that contains version 4 Arduino ESP32 library 3.0.0 is too new. Use 2.0.9 to 2.0.17"
+#endif
+
 #include "DIAG.h"
 #include <driver/adc.h>
 #include <soc/sens_reg.h>

From a26610bc7fecee556e3b46f0bffeca878a15f100 Mon Sep 17 00:00:00 2001
From: Harald Barth <haba@kth.se>
Date: Sun, 2 Jun 2024 21:44:25 +0200
Subject: [PATCH 2/3] ESP32: More version locking

---
 DCCTimerESP.cpp | 2 +-
 platformio.ini  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/DCCTimerESP.cpp b/DCCTimerESP.cpp
index 8927573..e57f6af 100644
--- a/DCCTimerESP.cpp
+++ b/DCCTimerESP.cpp
@@ -80,7 +80,7 @@ int DCCTimer::freeMemory() {
 
 #include "esp_idf_version.h"
 #if ESP_IDF_VERSION_MAJOR > 4
-#error "DCC-EX does not support compiling with IDF version 5.0 or later. Downgrade your ESP32 library to a version that contains version 4 Arduino ESP32 library 3.0.0 is too new. Use 2.0.9 to 2.0.17"
+#error "DCC-EX does not support compiling with IDF version 5.0 or later. Downgrade your ESP32 library to a version that contains IDE version 4. Arduino ESP32 library 3.0.0 is too new. Downgrade to one of 2.0.9 to 2.0.17"
 #endif
 
 #include "DIAG.h"
diff --git a/platformio.ini b/platformio.ini
index a03ff61..b39b136 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -164,7 +164,11 @@ monitor_echo = yes
 build_flags = -mcall-prologues
 
 [env:ESP32]
-platform = espressif32
+; Lock version to 6.7.0 as that is
+; Arduino v2.0.16 (based on IDF v4.4.7)
+; which is the latest version based
+; on IDF v4. We can not use IDF v5.
+platform = espressif32 @ 6.7.0
 board = esp32dev
 framework = arduino
 lib_deps = ${env.lib_deps}

From 5f65fd5944d6def87673a3d21881b4d21bfcac68 Mon Sep 17 00:00:00 2001
From: Harald Barth <haba@kth.se>
Date: Sun, 2 Jun 2024 21:45:43 +0200
Subject: [PATCH 3/3] tag with date

---
 GITHUB_SHA.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h
index 4807e45..6abb9b3 100644
--- a/GITHUB_SHA.h
+++ b/GITHUB_SHA.h
@@ -1 +1 @@
-#define GITHUB_SHA "devel-202405232026Z"
+#define GITHUB_SHA "devel-202406021945Z"