From 3cb48f1f0878acf9d59dee48f72a0fecb88f6aee Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 22 Nov 2021 15:58:36 +0100
Subject: [PATCH] Fix ESP32 OneWire

Fix ESP32 OneWire to work with Core 2.x (#13666)
---
 .../OneWire.h                                 | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.h b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.h
index eb20f2b20..edb31d1eb 100644
--- a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.h
+++ b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.h
@@ -211,12 +211,16 @@ void directModeInput(IO_REG_TYPE pin)
             ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_gpio_desc[pin].pullup | rtc_gpio_desc[pin].pulldown);
         }
 #elif ESP_IDF_VERSION_MAJOR > 3  // ESP32-S2 needs IDF 4.2 or later
-        uint32_t rtc_reg(rtc_io_desc[pin].reg);
+        int rtcio_num = rtc_io_number_get((gpio_num_t)pin);
 
-        if ( rtc_reg ) // RTC pins PULL settings
-        {
-            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin].mux);
-            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin].pullup | rtc_io_desc[pin].pulldown);
+        if (rtcio_num >= 0) {
+            uint32_t rtc_reg(rtc_io_desc[rtcio_num].reg);
+
+            if ( rtc_reg ) // RTC pins PULL settings
+            {
+                ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[rtcio_num].mux);
+                ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[rtcio_num].pullup | rtc_io_desc[rtcio_num].pulldown);
+            }
         }
 #endif
 
@@ -253,12 +257,16 @@ void directModeOutput(IO_REG_TYPE pin)
             ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_gpio_desc[pin].pullup | rtc_gpio_desc[pin].pulldown);
         }
 #elif ESP_IDF_VERSION_MAJOR > 3  // ESP32-S2 needs IDF 4.2 or later
-        uint32_t rtc_reg(rtc_io_desc[pin].reg);
+        int rtcio_num = rtc_io_number_get((gpio_num_t)pin);
 
-        if ( rtc_reg ) // RTC pins PULL settings
-        {
-            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin].mux);
-            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin].pullup | rtc_io_desc[pin].pulldown);
+        if (rtcio_num >= 0) {
+            uint32_t rtc_reg(rtc_io_desc[rtcio_num].reg);
+
+            if ( rtc_reg ) // RTC pins PULL settings
+            {
+                ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[rtcio_num].mux);
+                ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[rtcio_num].pullup | rtc_io_desc[rtcio_num].pulldown);
+            }
         }
 #endif