From 039fa0fc59af9e367ea8c4b8429466f297f7d7ce Mon Sep 17 00:00:00 2001
From: Lewis He <lewishe@outlook.com>
Date: Sun, 29 Oct 2023 01:41:51 +0800
Subject: [PATCH 1/2] Update api adapt esp core 3.0.0-alpha2 (#860)

---
 src/ArduinoHal.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/ArduinoHal.cpp b/src/ArduinoHal.cpp
index d585590b..f2ed4f8c 100644
--- a/src/ArduinoHal.cpp
+++ b/src/ArduinoHal.cpp
@@ -145,10 +145,16 @@ void inline ArduinoHal::tone(uint32_t pin, unsigned int frequency, unsigned long
     // ESP32 tone() emulation
     (void)duration;
     if(prev == -1) {
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,0,0)
       ledcAttachPin(pin, RADIOLIB_TONE_ESP32_CHANNEL);
+#endif
     }
     if(prev != frequency) {
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,0,0)
       ledcWriteTone(RADIOLIB_TONE_ESP32_CHANNEL, frequency);
+#else
+      ledcWriteTone(pin, frequency);
+#endif
     }
     prev = frequency;
   #elif defined(RADIOLIB_MBED_TONE_OVERRIDE)
@@ -178,8 +184,13 @@ void inline ArduinoHal::noTone(uint32_t pin) {
       return;
     }
     // ESP32 tone() emulation
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,0,0)
     ledcDetachPin(pin);
     ledcWrite(RADIOLIB_TONE_ESP32_CHANNEL, 0);
+#else
+    ledcDetach(pin);
+    ledcWrite(pin, 0);
+#endif
     prev = -1;
   #elif defined(RADIOLIB_MBED_TONE_OVERRIDE)
     if(pin == RADIOLIB_NC) {

From 912333c408b107623c46a75c0b2e56ceeb543f29 Mon Sep 17 00:00:00 2001
From: jgromes <jan.gromes@gmail.com>
Date: Sat, 28 Oct 2023 21:54:31 +0200
Subject: [PATCH 2/2] [HAL] Added check for defined ESP version macro (#860)

---
 src/ArduinoHal.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ArduinoHal.cpp b/src/ArduinoHal.cpp
index f2ed4f8c..322a6906 100644
--- a/src/ArduinoHal.cpp
+++ b/src/ArduinoHal.cpp
@@ -145,16 +145,16 @@ void inline ArduinoHal::tone(uint32_t pin, unsigned int frequency, unsigned long
     // ESP32 tone() emulation
     (void)duration;
     if(prev == -1) {
-#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,0,0)
+      #if !defined(ESP_IDF_VERSION) || (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,0,0))
       ledcAttachPin(pin, RADIOLIB_TONE_ESP32_CHANNEL);
-#endif
+      #endif
     }
     if(prev != frequency) {
-#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,0,0)
+      #if !defined(ESP_IDF_VERSION) || (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,0,0))
       ledcWriteTone(RADIOLIB_TONE_ESP32_CHANNEL, frequency);
-#else
+      #else
       ledcWriteTone(pin, frequency);
-#endif
+      #endif
     }
     prev = frequency;
   #elif defined(RADIOLIB_MBED_TONE_OVERRIDE)
@@ -184,13 +184,13 @@ void inline ArduinoHal::noTone(uint32_t pin) {
       return;
     }
     // ESP32 tone() emulation
-#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,0,0)
+    #if !defined(ESP_IDF_VERSION) || (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,0,0))
     ledcDetachPin(pin);
     ledcWrite(RADIOLIB_TONE_ESP32_CHANNEL, 0);
-#else
+    #else
     ledcDetach(pin);
     ledcWrite(pin, 0);
-#endif
+    #endif
     prev = -1;
   #elif defined(RADIOLIB_MBED_TONE_OVERRIDE)
     if(pin == RADIOLIB_NC) {