From 65fbe483f168762e6facc01fd2e1637222787be1 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 24 Aug 2023 22:42:25 -0300
Subject: [PATCH 01/18] fixes -1/255 as possible INTR GPIO

---
 cores/esp32/esp32-hal-gpio.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cores/esp32/esp32-hal-gpio.c b/cores/esp32/esp32-hal-gpio.c
index f0f99db9abf..49810e6e0a3 100644
--- a/cores/esp32/esp32-hal-gpio.c
+++ b/cores/esp32/esp32-hal-gpio.c
@@ -167,6 +167,9 @@ extern void __attachInterruptFunctionalArg(uint8_t pin, voidFuncPtrArg userFunc,
 {
     static bool interrupt_initialized = false;
 
+    // makes sure that pin -1 (255) will never work -- this follows Arduino standard
+    if (pin >= NUM_DIGITAL_PINS) return;
+
     if(!interrupt_initialized) {
     	esp_err_t err = gpio_install_isr_service((int)ARDUINO_ISR_FLAG);
     	interrupt_initialized = (err == ESP_OK) || (err == ESP_ERR_INVALID_STATE);

From cab3c0d0d6c6077c3ef48f61c2ea72dde1e3479f Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 24 Aug 2023 22:43:18 -0300
Subject: [PATCH 02/18] fixes GPIO defenitions for main SoC

---
 variants/esp32/pins_arduino.h   | 12 ++++++------
 variants/esp32c3/pins_arduino.h |  6 +++---
 variants/esp32s2/pins_arduino.h | 12 ++++++------
 variants/esp32s3/pins_arduino.h | 12 ++++++------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/variants/esp32/pins_arduino.h b/variants/esp32/pins_arduino.h
index 4ad96ccef51..dcd31ba7bb5 100644
--- a/variants/esp32/pins_arduino.h
+++ b/variants/esp32/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        40    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h
index ab28240d4b4..84d896a7907 100644
--- a/variants/esp32c3/pins_arduino.h
+++ b/variants/esp32c3/pins_arduino.h
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        22    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+8;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/esp32s2/pins_arduino.h b/variants/esp32s2/pins_arduino.h
index 4ab0f712042..b7ea76a849c 100644
--- a/variants/esp32s2/pins_arduino.h
+++ b/variants/esp32s2/pins_arduino.h
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        47    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+18; // GPIO pin for Saola-1 & DevKitM-1 = 18
 //static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+45; // GPIO pin for Kaluga = 45
@@ -15,9 +15,9 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+18; // GPIO pin for Saola-
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/esp32s3/pins_arduino.h b/variants/esp32s3/pins_arduino.h
index d746573aa94..55e7abaea7a 100644
--- a/variants/esp32s3/pins_arduino.h
+++ b/variants/esp32s3/pins_arduino.h
@@ -7,9 +7,9 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        49    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
 
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
@@ -20,9 +20,9 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;

From c47a8dc9b66ae8c559784cab1172b072d3e2e442 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 24 Aug 2023 22:55:06 -0300
Subject: [PATCH 03/18] fixes GPIO defs for main SoC

---
 variants/esp32/pins_arduino.h   | 6 +++---
 variants/esp32c3/pins_arduino.h | 6 +++---
 variants/esp32s2/pins_arduino.h | 6 +++---
 variants/esp32s3/pins_arduino.h | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/variants/esp32/pins_arduino.h b/variants/esp32/pins_arduino.h
index dcd31ba7bb5..1a1fbfd66e0 100644
--- a/variants/esp32/pins_arduino.h
+++ b/variants/esp32/pins_arduino.h
@@ -3,9 +3,9 @@
 
 #include <stdint.h>
 
-#define NUM_DIGITAL_PINS        40    // GPIO 0..39
-#define NUM_ANALOG_INPUTS       16    // ESP32 has 16 ADC pins
-#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h
index 84d896a7907..c9d7207d12e 100644
--- a/variants/esp32c3/pins_arduino.h
+++ b/variants/esp32c3/pins_arduino.h
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define NUM_DIGITAL_PINS        22    // GPIO 0..21 - not all are available
-#define NUM_ANALOG_INPUTS       6     // GPIO 0..5
-#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+8;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/esp32s2/pins_arduino.h b/variants/esp32s2/pins_arduino.h
index b7ea76a849c..22e22ab6a52 100644
--- a/variants/esp32s2/pins_arduino.h
+++ b/variants/esp32s2/pins_arduino.h
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define NUM_DIGITAL_PINS        47    // GPIO 0..46
-#define NUM_ANALOG_INPUTS       20    // GPIO 1..20
-#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+18; // GPIO pin for Saola-1 & DevKitM-1 = 18
 //static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+45; // GPIO pin for Kaluga = 45
diff --git a/variants/esp32s3/pins_arduino.h b/variants/esp32s3/pins_arduino.h
index 55e7abaea7a..4d29f00a4da 100644
--- a/variants/esp32s3/pins_arduino.h
+++ b/variants/esp32s3/pins_arduino.h
@@ -7,9 +7,9 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define NUM_DIGITAL_PINS        49    // GPIO 0..48
-#define NUM_ANALOG_INPUTS       20    // GPIO 1..20
-#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48

From fea2125c3e5a2c93e45f809ea24917aa6a302a9a Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 24 Aug 2023 23:04:41 -0300
Subject: [PATCH 04/18] uses NOT_AN_INTERRUPT within C3

---
 variants/esp32c3/pins_arduino.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h
index c9d7207d12e..a0e93dbe528 100644
--- a/variants/esp32c3/pins_arduino.h
+++ b/variants/esp32c3/pins_arduino.h
@@ -15,7 +15,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+8;
 #define RGB_BRIGHTNESS 64
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;

From 766533bb7e616de609c4d6423f6cbfa739cde2b0 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 31 Aug 2023 14:49:58 -0300
Subject: [PATCH 05/18] ESP32-S2 Variants

---
 .../adafruit_feather_esp32s2/pins_arduino.h   | 18 ++++++++++-------
 .../pins_arduino.h                            | 19 ++++++++++--------
 .../pins_arduino.h                            | 20 ++++++++++---------
 .../adafruit_funhouse_esp32s2/pins_arduino.h  | 12 +++++------
 .../adafruit_magtag29_esp32s2/pins_arduino.h  | 17 +++++++++-------
 .../adafruit_metro_esp32s2/pins_arduino.h     | 17 +++++++++-------
 variants/adafruit_qtpy_esp32s2/pins_arduino.h | 18 ++++++++++-------
 variants/atmegazero_esp32s2/pins_arduino.h    | 17 ++++++++++------
 variants/esp32s2/pins_arduino.h               |  4 ++--
 variants/esp32s2thing_plus/pins_arduino.h     | 12 +++++------
 variants/esp32s2usb/pins_arduino.h            | 12 +++++------
 .../franzininho_wifi_esp32s2/pins_arduino.h   | 15 ++++++++------
 .../pins_arduino.h                            | 15 ++++++++------
 variants/lolin_s2_mini/pins_arduino.h         | 12 +++++------
 variants/lolin_s2_pico/pins_arduino.h         | 12 +++++------
 variants/micro_s2/pins_arduino.h              | 16 +++++++++------
 variants/um_feathers2/pins_arduino.h          | 12 +++++------
 variants/um_feathers2neo/pins_arduino.h       | 15 ++++++++------
 variants/um_tinys2/pins_arduino.h             | 15 ++++++++------
 19 files changed, 159 insertions(+), 119 deletions(-)

diff --git a/variants/adafruit_feather_esp32s2/pins_arduino.h b/variants/adafruit_feather_esp32s2/pins_arduino.h
index 261377de89c..27bb85739df 100644
--- a/variants/adafruit_feather_esp32s2/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2/pins_arduino.h
@@ -11,17 +11,21 @@
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define LED_BUILTIN     13
+#define PIN_NEOPIXEL    33
+
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)   
+#define RGB_BRIGHTNESS 64
 
-#define PIN_NEOPIXEL        33
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      21    // power pin
 #define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
diff --git a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
index 6758b16a898..eb56e86c076 100644
--- a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
@@ -10,18 +10,21 @@
 #define USB_PRODUCT        "Feather ESP32-S2 Reverse TFT"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
-
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define LED_BUILTIN     13
+#define PIN_NEOPIXEL    33
+
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)   
+#define RGB_BRIGHTNESS 64
 
-#define PIN_NEOPIXEL        33
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      21    // power pin
 #define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
diff --git a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
index 8eaef02334d..6ae50f1e1eb 100644
--- a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
@@ -10,19 +10,21 @@
 #define USB_PRODUCT        "Feather ESP32-S2 TFT"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
-
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define LED_BUILTIN     13
+#define PIN_NEOPIXEL    33
+
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
 
-#define PIN_NEOPIXEL        33
-#define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      34    // power pin
 #define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
 
diff --git a/variants/adafruit_funhouse_esp32s2/pins_arduino.h b/variants/adafruit_funhouse_esp32s2/pins_arduino.h
index 6b4fa1ec5b3..92c3dae1883 100644
--- a/variants/adafruit_funhouse_esp32s2/pins_arduino.h
+++ b/variants/adafruit_funhouse_esp32s2/pins_arduino.h
@@ -11,13 +11,13 @@
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define LED_BUILTIN   37
 
diff --git a/variants/adafruit_magtag29_esp32s2/pins_arduino.h b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
index 610312d05fd..cf9bc1512aa 100644
--- a/variants/adafruit_magtag29_esp32s2/pins_arduino.h
+++ b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
@@ -11,17 +11,20 @@
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define LED_BUILTIN         13
-
 #define PIN_NEOPIXEL        1    // D1
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
+
 #define NEOPIXEL_NUM        4    // number of neopixels
 #define NEOPIXEL_POWER      21   // power pin
 #define NEOPIXEL_POWER_ON   LOW  // power pin state when on
diff --git a/variants/adafruit_metro_esp32s2/pins_arduino.h b/variants/adafruit_metro_esp32s2/pins_arduino.h
index 4c70e662f1d..711e8515010 100644
--- a/variants/adafruit_metro_esp32s2/pins_arduino.h
+++ b/variants/adafruit_metro_esp32s2/pins_arduino.h
@@ -10,17 +10,20 @@
 #define USB_PRODUCT        "Metro ESP32-S2"
 #define USB_SERIAL         ""   // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define LED_BUILTIN     42
-
 #define PIN_NEOPIXEL    45
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
+
 #define NEOPIXEL_NUM    1
 
 #define PIN_BUTTON1     0  // BOOT0 switch
diff --git a/variants/adafruit_qtpy_esp32s2/pins_arduino.h b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
index 4c9c1524732..a1706512b40 100644
--- a/variants/adafruit_qtpy_esp32s2/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
@@ -11,17 +11,21 @@
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
+
+#define PIN_NEOPIXEL        39
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
 
 //#define LED_BUILTIN     13
 
-#define PIN_NEOPIXEL        39
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      38    // power pin
 #define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
diff --git a/variants/atmegazero_esp32s2/pins_arduino.h b/variants/atmegazero_esp32s2/pins_arduino.h
index 44df45e0b18..95b934e1d95 100644
--- a/variants/atmegazero_esp32s2/pins_arduino.h
+++ b/variants/atmegazero_esp32s2/pins_arduino.h
@@ -9,15 +9,20 @@
 #define USB_PRODUCT "ATMZ-ESP32S2"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t NEOPIXEL = 40;
+
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (NEOPIXEL + SOC_GPIO_PIN_COUNT) 
+#define RGB_BRIGHTNESS 64
+
 static const uint8_t PD5 = 0;
 
 static const uint8_t TX = 43;
diff --git a/variants/esp32s2/pins_arduino.h b/variants/esp32s2/pins_arduino.h
index 22e22ab6a52..b8da1d994ca 100644
--- a/variants/esp32s2/pins_arduino.h
+++ b/variants/esp32s2/pins_arduino.h
@@ -8,8 +8,8 @@
 #define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+18; // GPIO pin for Saola-1 & DevKitM-1 = 18
-//static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+45; // GPIO pin for Kaluga = 45
+static const uint8_t LED_BUILTIN = (SOC_GPIO_PIN_COUNT+18); // GPIO pin for Saola-1 & DevKitM-1 = 18
+//static const uint8_t LED_BUILTIN = (SOC_GPIO_PIN_COUNT+45); // GPIO pin for Kaluga = 45
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 #define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
diff --git a/variants/esp32s2thing_plus/pins_arduino.h b/variants/esp32s2thing_plus/pins_arduino.h
index 219f357981e..1c388c9c68b 100644
--- a/variants/esp32s2thing_plus/pins_arduino.h
+++ b/variants/esp32s2thing_plus/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "ESP32-S2 Thing Plus"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/esp32s2usb/pins_arduino.h b/variants/esp32s2usb/pins_arduino.h
index c6d464b79b4..43093bd1eb6 100644
--- a/variants/esp32s2usb/pins_arduino.h
+++ b/variants/esp32s2usb/pins_arduino.h
@@ -20,13 +20,13 @@
 #define USB_FW_MSC_SERIAL_NUMBER 	0x00000000
 
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/franzininho_wifi_esp32s2/pins_arduino.h b/variants/franzininho_wifi_esp32s2/pins_arduino.h
index dd287f417d0..94f02319800 100644
--- a/variants/franzininho_wifi_esp32s2/pins_arduino.h
+++ b/variants/franzininho_wifi_esp32s2/pins_arduino.h
@@ -10,15 +10,18 @@
 #define USB_SERIAL 			"0"
 #define USB_WEBUSB_ENABLED	false
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t PIN_NEOPIXEL = 18;
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
index 58db2039d26..e0f4dfc1754 100644
--- a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
+++ b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
@@ -17,15 +17,18 @@
 #define USB_FW_MSC_VOLUME_NAME 		"S2-Firmware" 	//max 11 chars
 #define USB_FW_MSC_SERIAL_NUMBER 	0x00000000
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t PIN_NEOPIXEL = 18;
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/lolin_s2_mini/pins_arduino.h b/variants/lolin_s2_mini/pins_arduino.h
index 7b4596ef6a2..9e7d4a00f7d 100644
--- a/variants/lolin_s2_mini/pins_arduino.h
+++ b/variants/lolin_s2_mini/pins_arduino.h
@@ -18,13 +18,13 @@
 #define USB_FW_MSC_VOLUME_NAME 		"S2-Firmware" 	//max 11 chars
 #define USB_FW_MSC_SERIAL_NUMBER 	0x00000000
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 15;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/lolin_s2_pico/pins_arduino.h b/variants/lolin_s2_pico/pins_arduino.h
index 10f0a9e7987..120caf95f48 100644
--- a/variants/lolin_s2_pico/pins_arduino.h
+++ b/variants/lolin_s2_pico/pins_arduino.h
@@ -18,13 +18,13 @@
 #define USB_FW_MSC_VOLUME_NAME 		"S2-Firmware" 	//max 11 chars
 #define USB_FW_MSC_SERIAL_NUMBER 	0x00000000
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 10;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/micro_s2/pins_arduino.h b/variants/micro_s2/pins_arduino.h
index 389e51d9772..59dc8df48e6 100644
--- a/variants/micro_s2/pins_arduino.h
+++ b/variants/micro_s2/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "microS2"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -74,4 +74,8 @@ static const uint8_t LED_BUILTIN =  21;
 static const uint8_t PIXEL_BUILTIN = 33;
 static const uint8_t BUTTON_BUILTIN = 0;
 
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIXEL_BUILTIN + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/um_feathers2/pins_arduino.h b/variants/um_feathers2/pins_arduino.h
index 26ff851d66f..5b301af41f6 100644
--- a/variants/um_feathers2/pins_arduino.h
+++ b/variants/um_feathers2/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "FeatherS2"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/um_feathers2neo/pins_arduino.h b/variants/um_feathers2neo/pins_arduino.h
index 44609d463ab..773a2eeab42 100644
--- a/variants/um_feathers2neo/pins_arduino.h
+++ b/variants/um_feathers2neo/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "FeatherS2 Neo"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       11
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -63,6 +63,9 @@ static const uint8_t NEOPIXEL_MATRIX_PWR = 4;
 
 static const uint8_t NEOPIXEL_DATA = 40;
 static const uint8_t NEOPIXEL_PWR = 39;
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (NEOPIXEL_DATA + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
 
 static const uint8_t VBAT_SENSE = 2;
 static const uint8_t VBUS_SENSE = 34;
diff --git a/variants/um_tinys2/pins_arduino.h b/variants/um_tinys2/pins_arduino.h
index a493a3fd78b..86a87d8adaf 100644
--- a/variants/um_tinys2/pins_arduino.h
+++ b/variants/um_tinys2/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "TinyS2"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -74,5 +74,8 @@ static const uint8_t VBUS_SENSE = 21;
 
 static const uint8_t RGB_DATA = 1;
 static const uint8_t RGB_PWR = 2;
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
 
 #endif /* Pins_Arduino_h */

From 1a3d208478a2d7bfe75eac87dbb779d6043c3491 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 31 Aug 2023 15:43:34 -0300
Subject: [PATCH 06/18] ESP32-S2 LED_BUILTIN in Variants

---
 variants/adafruit_feather_esp32s2/pins_arduino.h      | 11 +++++++++--
 .../pins_arduino.h                                    | 11 +++++++----
 variants/adafruit_feather_esp32s2_tft/pins_arduino.h  | 11 +++++++----
 variants/adafruit_magtag29_esp32s2/pins_arduino.h     |  8 ++++++--
 variants/adafruit_qtpy_esp32s2/pins_arduino.h         |  5 ++++-
 variants/atmegazero_esp32s2/pins_arduino.h            |  7 +++++--
 variants/franzininho_wifi_esp32s2/pins_arduino.h      |  6 +++++-
 variants/franzininho_wifi_msc_esp32s2/pins_arduino.h  |  6 +++++-
 variants/um_feathers2neo/pins_arduino.h               |  4 ++++
 variants/um_tinys2/pins_arduino.h                     |  4 ++++
 10 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/variants/adafruit_feather_esp32s2/pins_arduino.h b/variants/adafruit_feather_esp32s2/pins_arduino.h
index 27bb85739df..ac0a57d02d7 100644
--- a/variants/adafruit_feather_esp32s2/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2/pins_arduino.h
@@ -19,8 +19,15 @@
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
-#define LED_BUILTIN     13
-#define PIN_NEOPIXEL    33
+// Neopixel
+#define PIN_NEOPIXEL 33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
 
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)   
diff --git a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
index eb56e86c076..4c0c13596a7 100644
--- a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
@@ -18,11 +18,14 @@
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
-#define LED_BUILTIN     13
-#define PIN_NEOPIXEL    33
-
+// Neopixel
+#define PIN_NEOPIXEL 33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
-#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)   
+#define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
 #define NEOPIXEL_NUM        1     // number of neopixels
diff --git a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
index 6ae50f1e1eb..c425463916f 100644
--- a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
@@ -18,11 +18,14 @@
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
-#define LED_BUILTIN     13
-#define PIN_NEOPIXEL    33
-
+// Neopixel
+#define PIN_NEOPIXEL 33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
-#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+#define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
 #define NEOPIXEL_POWER      34    // power pin
diff --git a/variants/adafruit_magtag29_esp32s2/pins_arduino.h b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
index cf9bc1512aa..9edb839353c 100644
--- a/variants/adafruit_magtag29_esp32s2/pins_arduino.h
+++ b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
@@ -19,10 +19,14 @@
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
-#define LED_BUILTIN         13
+// Neopixel
 #define PIN_NEOPIXEL        1    // D1
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT); // Only 1 NeoPixel will be affected
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
-#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)  
+#define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
 #define NEOPIXEL_NUM        4    // number of neopixels
diff --git a/variants/adafruit_qtpy_esp32s2/pins_arduino.h b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
index a1706512b40..8f77ae73f02 100644
--- a/variants/adafruit_qtpy_esp32s2/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
@@ -24,7 +24,10 @@
 #define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)  
 #define RGB_BRIGHTNESS 64
 
-//#define LED_BUILTIN     13
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      38    // power pin
diff --git a/variants/atmegazero_esp32s2/pins_arduino.h b/variants/atmegazero_esp32s2/pins_arduino.h
index 95b934e1d95..2fb745abca1 100644
--- a/variants/atmegazero_esp32s2/pins_arduino.h
+++ b/variants/atmegazero_esp32s2/pins_arduino.h
@@ -18,9 +18,12 @@
 #define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t NEOPIXEL = 40;
-
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
-#define RGB_BUILTIN (NEOPIXEL + SOC_GPIO_PIN_COUNT) 
+#define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
 static const uint8_t PD5 = 0;
diff --git a/variants/franzininho_wifi_esp32s2/pins_arduino.h b/variants/franzininho_wifi_esp32s2/pins_arduino.h
index 94f02319800..91a510b1b4a 100644
--- a/variants/franzininho_wifi_esp32s2/pins_arduino.h
+++ b/variants/franzininho_wifi_esp32s2/pins_arduino.h
@@ -19,8 +19,12 @@
 #define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t PIN_NEOPIXEL = 18;
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
-#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)  
+#define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
 static const uint8_t TX = 43;
diff --git a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
index e0f4dfc1754..556891b66f6 100644
--- a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
+++ b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
@@ -26,8 +26,12 @@
 #define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t PIN_NEOPIXEL = 18;
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
-#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)  
+#define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
 static const uint8_t TX = 43;
diff --git a/variants/um_feathers2neo/pins_arduino.h b/variants/um_feathers2neo/pins_arduino.h
index 773a2eeab42..84b4b4ccf0a 100644
--- a/variants/um_feathers2neo/pins_arduino.h
+++ b/variants/um_feathers2neo/pins_arduino.h
@@ -66,6 +66,10 @@ static const uint8_t NEOPIXEL_PWR = 39;
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN (NEOPIXEL_DATA + SOC_GPIO_PIN_COUNT)  
 #define RGB_BRIGHTNESS 64
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (NEOPIXEL_DATA + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t VBAT_SENSE = 2;
 static const uint8_t VBUS_SENSE = 34;
diff --git a/variants/um_tinys2/pins_arduino.h b/variants/um_tinys2/pins_arduino.h
index 86a87d8adaf..f0cd220bb67 100644
--- a/variants/um_tinys2/pins_arduino.h
+++ b/variants/um_tinys2/pins_arduino.h
@@ -77,5 +77,9 @@ static const uint8_t RGB_PWR = 2;
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT)  
 #define RGB_BRIGHTNESS 64
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (RGB_DATA + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 
 #endif /* Pins_Arduino_h */

From 852ebac1085f10821585081616a5c19fe802fa6c Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 31 Aug 2023 20:27:51 -0300
Subject: [PATCH 07/18] ESP32 Variants

---
 variants/ET-Board/pins_arduino.h              | 15 +++++-------
 variants/Edgebox-ESP-100/pins_arduino.h       | 12 +++++-----
 variants/Microduino-esp32/pins_arduino.h      | 15 ++++++------
 variants/S_ODI_Ultra_v1/pins_arduino.h        | 13 +++++-----
 .../adafruit_feather_esp32_v2/pins_arduino.h  | 24 ++++++++++---------
 .../adafruit_itsybitsy_esp32/pins_arduino.h   | 22 +++++++++--------
 variants/adafruit_qtpy_esp32/pins_arduino.h   | 19 ++++++++++-----
 variants/alksesp32/pins_arduino.h             | 13 +++++-----
 variants/atmegazero_esp32s2/pins_arduino.h    |  1 -
 variants/bpi-bit/pins_arduino.h               | 20 +++++++++++-----
 variants/ch_denky/pins_arduino.h              | 12 +++++-----
 variants/cnrs_aw2eth/pins_arduino.h           | 12 +++++-----
 variants/connaxio_espoir/pins_arduino.h       | 12 +++++-----
 variants/d-duino-32/pins_arduino.h            | 12 +++++-----
 variants/d1_mini32/pins_arduino.h             |  1 -
 variants/d1_uno32/pins_arduino.h              | 12 +++++-----
 variants/d32/d32_core.h                       | 12 +++++-----
 variants/d32/pins_arduino.h                   |  1 -
 variants/d32_pro/pins_arduino.h               |  1 -
 variants/deneyapkart/pins_arduino.h           | 13 +++++-----
 variants/deneyapkart1A/pins_arduino.h         | 15 ++++++------
 variants/doitESP32devkitV1/pins_arduino.h     | 13 +++++-----
 variants/doitESPduino32/pins_arduino.h        | 12 +++++-----
 variants/dpu_esp32/pins_arduino.h             | 12 +++++-----
 variants/esp32-devkit-lipo/pins_arduino.h     | 12 +++++-----
 variants/esp32-evb/pins_arduino.h             | 12 +++++-----
 variants/esp32-gateway/pins_arduino.h         | 13 +++++-----
 variants/esp32-poe-iso/pins_arduino.h         | 12 +++++-----
 variants/esp32-poe/pins_arduino.h             | 12 +++++-----
 .../pins_arduino.h                            | 12 +++++-----
 .../pins_arduino.h                            | 12 +++++-----
 .../esp32-trueverit-iot-driver/pins_arduino.h | 12 +++++-----
 variants/esp32/pins_arduino.h                 |  3 +++
 variants/esp320/pins_arduino.h                | 13 +++++-----
 variants/esp32da/pins_arduino.h               | 12 +++++-----
 variants/esp32micromod/pins_arduino.h         | 13 +++++-----
 variants/esp32thing/pins_arduino.h            | 13 +++++-----
 variants/esp32thing_plus/pins_arduino.h       | 13 +++++-----
 variants/esp32thing_plus_c/pins_arduino.h     | 15 ++++++------
 variants/esp32vn-iot-uno/pins_arduino.h       | 12 +++++-----
 variants/espea32/pins_arduino.h               | 13 +++++-----
 variants/espectro32/pins_arduino.h            | 13 +++++-----
 variants/espino32/pins_arduino.h              | 13 +++++-----
 variants/feather_esp32/pins_arduino.h         | 13 +++++-----
 variants/firebeetle32/pins_arduino.h          | 15 +++++-------
 variants/fm-devkit/pins_arduino.h             | 12 +++++-----
 variants/frog32/pins_arduino.h                | 12 +++++-----
 variants/gpy/pins_arduino.h                   | 20 +++++++++-------
 variants/healthypi4/pins_arduino.h            | 13 +++++-----
 variants/heltec_wifi_kit_32/pins_arduino.h    | 13 +++++-----
 variants/heltec_wifi_lora_32/pins_arduino.h   | 13 +++++-----
 .../heltec_wifi_lora_32_V2/pins_arduino.h     | 13 +++++-----
 .../heltec_wifi_lora_32_V3/pins_arduino.h     |  1 -
 variants/heltec_wireless_stick/pins_arduino.h | 13 +++++-----
 .../heltec_wireless_stick_lite/pins_arduino.h | 13 +++++-----
 variants/honeylemon/pins_arduino.h            | 13 +++++-----
 variants/hornbill32dev/pins_arduino.h         | 13 +++++-----
 variants/hornbill32minima/pins_arduino.h      | 12 +++++-----
 variants/imbrios-logsens-v1p1/pins_arduino.h  | 13 +++++-----
 variants/intorobot-fig/pins_arduino.h         | 13 +++++-----
 variants/lionbit/pins_arduino.h               | 12 +++++-----
 variants/lolin32-lite/pins_arduino.h          | 12 +++++-----
 variants/lolin32/pins_arduino.h               | 15 +++++-------
 variants/lopy/pins_arduino.h                  | 20 +++++++++-------
 variants/lopy4/pins_arduino.h                 | 20 +++++++++-------
 variants/m5stack_atom/pins_arduino.h          | 12 +++++-----
 variants/m5stack_core2/pins_arduino.h         | 12 +++++-----
 variants/m5stack_core_esp32/pins_arduino.h    | 12 +++++-----
 variants/m5stack_coreink/pins_arduino.h       | 12 +++++-----
 variants/m5stack_fire/pins_arduino.h          | 12 +++++-----
 variants/m5stack_stamp_pico/pins_arduino.h    | 13 +++++-----
 variants/m5stack_station/pins_arduino.h       | 12 +++++-----
 variants/m5stack_timer_cam/pins_arduino.h     | 12 +++++-----
 variants/m5stick_c/pins_arduino.h             | 12 +++++-----
 variants/magicbit/pins_arduino.h              | 12 +++++-----
 variants/metro_esp-32/pins_arduino.h          | 13 +++++-----
 variants/mgbot-iotik32a/pins_arduino.h        | 13 +++++-----
 variants/mgbot-iotik32b/pins_arduino.h        | 13 +++++-----
 variants/mhetesp32devkit/pins_arduino.h       | 13 +++++-----
 variants/mhetesp32minikit/pins_arduino.h      | 13 +++++-----
 variants/mpython/pins_arduino.h               | 12 +++++-----
 variants/nano32/pins_arduino.h                | 13 +++++-----
 variants/nina_w10/pins_arduino.h              | 12 +++++-----
 variants/node32s/pins_arduino.h               | 13 +++++-----
 variants/nodemcu-32s/pins_arduino.h           | 13 +++++-----
 variants/odroid_esp32/pins_arduino.h          | 13 +++++-----
 variants/onehorse32dev/pins_arduino.h         | 13 +++++-----
 variants/openkb/pins_arduino.h                | 13 +++++-----
 variants/oroca_edubot/pins_arduino.h          | 13 +++++-----
 variants/pico32/pins_arduino.h                | 12 +++++-----
 variants/piranha_esp-32/pins_arduino.h        | 13 +++++-----
 variants/pocket_32/pins_arduino.h             | 15 +++++-------
 variants/quantum/pins_arduino.h               | 12 +++++-----
 variants/roboheart_hercules/pins_arduino.h    | 13 +++++-----
 variants/sonoff_dualr3/pins_arduino.h         | 12 +++++-----
 .../pins_arduino.h                            | 17 +++++++------
 .../pins_arduino.h                            | 13 +++++-----
 variants/tbeam/pins_arduino.h                 | 13 +++++-----
 variants/ttgo-lora32-v1/pins_arduino.h        | 13 +++++-----
 variants/ttgo-lora32-v2/pins_arduino.h        | 13 +++++-----
 variants/ttgo-lora32-v21new/pins_arduino.h    | 15 ++++++------
 variants/ttgo-t1/pins_arduino.h               | 13 +++++-----
 variants/ttgo-t7-v13-mini32/pins_arduino.h    | 12 +++++-----
 variants/ttgo-t7-v14-mini32/pins_arduino.h    | 12 +++++-----
 variants/turta_iot_node/pins_arduino.h        | 13 +++++-----
 variants/twatch/pins_arduino.h                | 12 +++++-----
 .../uPesy_esp32_wroom_devkit/pins_arduino.h   | 13 +++++-----
 .../uPesy_esp32_wrover_devkit/pins_arduino.h  | 13 +++++-----
 variants/um_tinypico/pins_arduino.h           | 12 +++++-----
 variants/vintlabsdevkitv1/pins_arduino.h      | 14 +++++------
 variants/watchy/pins_arduino.h                | 12 +++++-----
 variants/wesp32/pins_arduino.h                | 12 +++++-----
 variants/widora-air/pins_arduino.h            | 13 +++++-----
 variants/wifiduino32/pins_arduino.h           | 13 +++++-----
 variants/wipy3/pins_arduino.h                 | 21 +++++++++-------
 variants/wt32-eth01/pins_arduino.h            | 12 +++++-----
 variants/xinabox/pins_arduino.h               | 13 +++++-----
 117 files changed, 730 insertions(+), 760 deletions(-)

diff --git a/variants/ET-Board/pins_arduino.h b/variants/ET-Board/pins_arduino.h
index 9dada4cb50d..b92b47f591e 100644
--- a/variants/ET-Board/pins_arduino.h
+++ b/variants/ET-Board/pins_arduino.h
@@ -3,19 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       7
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
-
 
 static const uint8_t TX = 34;
 static const uint8_t RX = 35;
diff --git a/variants/Edgebox-ESP-100/pins_arduino.h b/variants/Edgebox-ESP-100/pins_arduino.h
index ae212f44dea..39f84334891 100644
--- a/variants/Edgebox-ESP-100/pins_arduino.h
+++ b/variants/Edgebox-ESP-100/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 34
-#define NUM_DIGITAL_PINS        34
-#define NUM_ANALOG_INPUTS       2
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<2)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<34)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 //Programming and Debugging Port
 static const uint8_t TXD = 43;
diff --git a/variants/Microduino-esp32/pins_arduino.h b/variants/Microduino-esp32/pins_arduino.h
index 034bd6173b3..d042bf7e6f3 100644
--- a/variants/Microduino-esp32/pins_arduino.h
+++ b/variants/Microduino-esp32/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       12
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
-static const uint8_t LED_BUILTIN = -1;
+static const uint8_t LED_BUILTIN = (uint8_t)-1;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 #define MTDO 15
 #define MTDI 12
diff --git a/variants/S_ODI_Ultra_v1/pins_arduino.h b/variants/S_ODI_Ultra_v1/pins_arduino.h
index 51278ce94be..894d7f56690 100644
--- a/variants/S_ODI_Ultra_v1/pins_arduino.h
+++ b/variants/S_ODI_Ultra_v1/pins_arduino.h
@@ -3,18 +3,17 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 static const uint8_t LED_BUILTINB = 4;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define BUILTIN_LED2  LED_BUILTINB
 
 static const uint8_t TX = 1;
diff --git a/variants/adafruit_feather_esp32_v2/pins_arduino.h b/variants/adafruit_feather_esp32_v2/pins_arduino.h
index 71e32cc60e1..6d57dbcefa8 100644
--- a/variants/adafruit_feather_esp32_v2/pins_arduino.h
+++ b/variants/adafruit_feather_esp32_v2/pins_arduino.h
@@ -3,17 +3,22 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
-static const uint8_t LED_BUILTIN = 13;
+// Neopixel
+#define PIN_NEOPIXEL 0
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
 
 static const uint8_t TX = 8;
 static const uint8_t RX = 7;
@@ -50,9 +55,6 @@ static const uint8_t A13 = 35;
 // internal switch
 #define BUTTON 38
 
-// Neopixel
-#define PIN_NEOPIXEL 0
-
 // Neopixel & I2C power
 #define NEOPIXEL_I2C_POWER 2
 
diff --git a/variants/adafruit_itsybitsy_esp32/pins_arduino.h b/variants/adafruit_itsybitsy_esp32/pins_arduino.h
index d81c077c91d..8b5f3f4e6d3 100644
--- a/variants/adafruit_itsybitsy_esp32/pins_arduino.h
+++ b/variants/adafruit_itsybitsy_esp32/pins_arduino.h
@@ -3,20 +3,22 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
-
-static const uint8_t LED_BUILTIN = 13;
-#define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // Neopixel
 static const uint8_t PIN_NEOPIXEL = 0;
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
 static const uint8_t NEOPIXEL_POWER = 2;
 
 static const uint8_t TX = 20;
diff --git a/variants/adafruit_qtpy_esp32/pins_arduino.h b/variants/adafruit_qtpy_esp32/pins_arduino.h
index b22d0d5b780..29d8f8678f2 100644
--- a/variants/adafruit_qtpy_esp32/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32/pins_arduino.h
@@ -3,15 +3,22 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
+// Neopixel
 #define PIN_NEOPIXEL   5
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+#define LED_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
 #define NEOPIXEL_POWER 8
 
 static const uint8_t TX = 32;
diff --git a/variants/alksesp32/pins_arduino.h b/variants/alksesp32/pins_arduino.h
index a40501ab20d..d45ebe56ee1 100644
--- a/variants/alksesp32/pins_arduino.h
+++ b/variants/alksesp32/pins_arduino.h
@@ -3,19 +3,18 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 #define ALKSESP32 // tell library to not map pins again
 
 static const uint8_t LED_BUILTIN = 23;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/atmegazero_esp32s2/pins_arduino.h b/variants/atmegazero_esp32s2/pins_arduino.h
index 2fb745abca1..7df494f9b0a 100644
--- a/variants/atmegazero_esp32s2/pins_arduino.h
+++ b/variants/atmegazero_esp32s2/pins_arduino.h
@@ -21,7 +21,6 @@ static const uint8_t NEOPIXEL = 40;
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = (NEOPIXEL + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/bpi-bit/pins_arduino.h b/variants/bpi-bit/pins_arduino.h
index f1ef3003662..90c429597ee 100644
--- a/variants/bpi-bit/pins_arduino.h
+++ b/variants/bpi-bit/pins_arduino.h
@@ -3,21 +3,29 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS 40
-#define NUM_ANALOG_INPUTS 16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p) (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t BUZZER = 25;
 
 static const uint8_t BUTTON_A = 35;
 static const uint8_t BUTTON_B = 27;
 
+// NeoPixel Matrix 5 x 5
 static const uint8_t RGB_LED = 4;
 
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+#define LED_BUILTIN (RGB_LED + SOC_GPIO_PIN_COUNT) // Just a single LED in the Matrix
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
 static const uint8_t LIGHT_SENSOR1 = 36;
 static const uint8_t LIGHT_SENSOR2 = 39;
 
diff --git a/variants/ch_denky/pins_arduino.h b/variants/ch_denky/pins_arduino.h
index 23a786e0e53..d51fa926d51 100644
--- a/variants/ch_denky/pins_arduino.h
+++ b/variants/ch_denky/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/cnrs_aw2eth/pins_arduino.h b/variants/cnrs_aw2eth/pins_arduino.h
index 56db3aebe58..dcce7efca6e 100644
--- a/variants/cnrs_aw2eth/pins_arduino.h
+++ b/variants/cnrs_aw2eth/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/connaxio_espoir/pins_arduino.h b/variants/connaxio_espoir/pins_arduino.h
index ac5d025afd8..216347db7fd 100644
--- a/variants/connaxio_espoir/pins_arduino.h
+++ b/variants/connaxio_espoir/pins_arduino.h
@@ -8,13 +8,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 /* USB UART */
 static const uint8_t TX = 1;
diff --git a/variants/d-duino-32/pins_arduino.h b/variants/d-duino-32/pins_arduino.h
index 579cdfac77b..8b3663d7156 100644
--- a/variants/d-duino-32/pins_arduino.h
+++ b/variants/d-duino-32/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/d1_mini32/pins_arduino.h b/variants/d1_mini32/pins_arduino.h
index 69982798610..757adf14149 100644
--- a/variants/d1_mini32/pins_arduino.h
+++ b/variants/d1_mini32/pins_arduino.h
@@ -6,7 +6,6 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 static const uint8_t _VBAT = 35; // battery voltage
 
 #define PIN_WIRE_SDA SDA // backward compatibility
diff --git a/variants/d1_uno32/pins_arduino.h b/variants/d1_uno32/pins_arduino.h
index 8bf0a6d7fa3..388cf5422f6 100644
--- a/variants/d1_uno32/pins_arduino.h
+++ b/variants/d1_uno32/pins_arduino.h
@@ -6,13 +6,13 @@
 #include <stdint.h>
 
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/d32/d32_core.h b/variants/d32/d32_core.h
index 0416719f2cb..a1a986426ea 100644
--- a/variants/d32/d32_core.h
+++ b/variants/d32/d32_core.h
@@ -1,13 +1,13 @@
 #ifndef _D32_CORE_H_
 #define _D32_CORE_H_
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/d32/pins_arduino.h b/variants/d32/pins_arduino.h
index 810eeae6de2..065cef91ea8 100644
--- a/variants/d32/pins_arduino.h
+++ b/variants/d32/pins_arduino.h
@@ -6,7 +6,6 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 static const uint8_t _VBAT = 35; // battery voltage
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/d32_pro/pins_arduino.h b/variants/d32_pro/pins_arduino.h
index ce36f21bc08..97535b76566 100644
--- a/variants/d32_pro/pins_arduino.h
+++ b/variants/d32_pro/pins_arduino.h
@@ -6,7 +6,6 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 static const uint8_t _VBAT = 35; // battery voltage
 
 #define TF_CS   4  // TF (Micro SD Card) CS pin
diff --git a/variants/deneyapkart/pins_arduino.h b/variants/deneyapkart/pins_arduino.h
index 9b28273cc7d..8385cd15fe1 100644
--- a/variants/deneyapkart/pins_arduino.h
+++ b/variants/deneyapkart/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 4;
 #define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
 #define LEDB        LED_BUILTIN
 #define LEDR 3
 #define LEDG 1
diff --git a/variants/deneyapkart1A/pins_arduino.h b/variants/deneyapkart1A/pins_arduino.h
index a079608fe16..01d3d4cf017 100644
--- a/variants/deneyapkart1A/pins_arduino.h
+++ b/variants/deneyapkart1A/pins_arduino.h
@@ -4,17 +4,16 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13;
+static const uint8_t LED_BUILTIN = (SOC_GPIO_PIN_COUNT+13);
 #define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGBLED      LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/doitESP32devkitV1/pins_arduino.h b/variants/doitESP32devkitV1/pins_arduino.h
index 69e4138428f..f38b0ba8fe1 100644
--- a/variants/doitESP32devkitV1/pins_arduino.h
+++ b/variants/doitESP32devkitV1/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/doitESPduino32/pins_arduino.h b/variants/doitESPduino32/pins_arduino.h
index 991090a5fac..06a16b1e24a 100644
--- a/variants/doitESPduino32/pins_arduino.h
+++ b/variants/doitESPduino32/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/dpu_esp32/pins_arduino.h b/variants/dpu_esp32/pins_arduino.h
index ff6cb1e9ba4..09cc2d2d791 100644
--- a/variants/dpu_esp32/pins_arduino.h
+++ b/variants/dpu_esp32/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/esp32-devkit-lipo/pins_arduino.h b/variants/esp32-devkit-lipo/pins_arduino.h
index d784eb0297a..509bfc6025d 100644
--- a/variants/esp32-devkit-lipo/pins_arduino.h
+++ b/variants/esp32-devkit-lipo/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/esp32-evb/pins_arduino.h b/variants/esp32-evb/pins_arduino.h
index 327a5ba92e4..aaec69a80a5 100644
--- a/variants/esp32-evb/pins_arduino.h
+++ b/variants/esp32-evb/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 
 static const uint8_t KEY_BUILTIN = 34;
diff --git a/variants/esp32-gateway/pins_arduino.h b/variants/esp32-gateway/pins_arduino.h
index 5dd5d7e0fd9..fe2bb39467a 100644
--- a/variants/esp32-gateway/pins_arduino.h
+++ b/variants/esp32-gateway/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 #if	defined (ARDUINO_ESP32_GATEWAY_E) || defined (ARDUINO_ESP32_GATEWAY_F)
 #define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
@@ -18,7 +18,6 @@
 
 static const uint8_t LED_BUILTIN = 33;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 34;
 
diff --git a/variants/esp32-poe-iso/pins_arduino.h b/variants/esp32-poe-iso/pins_arduino.h
index 06a0dc15afd..9faf0cf6690 100644
--- a/variants/esp32-poe-iso/pins_arduino.h
+++ b/variants/esp32-poe-iso/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 #define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
 #define ETH_PHY_POWER 12
diff --git a/variants/esp32-poe/pins_arduino.h b/variants/esp32-poe/pins_arduino.h
index 06a0dc15afd..9faf0cf6690 100644
--- a/variants/esp32-poe/pins_arduino.h
+++ b/variants/esp32-poe/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 #define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
 #define ETH_PHY_POWER 12
diff --git a/variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h b/variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h
index aea4585f266..dd2897b100f 100644
--- a/variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h
+++ b/variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h
@@ -6,13 +6,13 @@
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED LED_BUILTIN // backward compatibility
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS 40
-#define NUM_ANALOG_INPUTS 16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p) (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 #define TX1 12
 #define RX1 13
diff --git a/variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h b/variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h
index b86654113b8..84f0f077085 100644
--- a/variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h
+++ b/variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h
@@ -6,13 +6,13 @@
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED LED_BUILTIN // backward compatibility
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS 40
-#define NUM_ANALOG_INPUTS 16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p) (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 #define TX1 12
 #define RX1 13
diff --git a/variants/esp32-trueverit-iot-driver/pins_arduino.h b/variants/esp32-trueverit-iot-driver/pins_arduino.h
index f6fa15fc4f2..7ab27275ece 100644
--- a/variants/esp32-trueverit-iot-driver/pins_arduino.h
+++ b/variants/esp32-trueverit-iot-driver/pins_arduino.h
@@ -6,13 +6,13 @@
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED LED_BUILTIN // backward compatibility
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS 40
-#define NUM_ANALOG_INPUTS 16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p) (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 #define TX1 12
 #define RX1 13
diff --git a/variants/esp32/pins_arduino.h b/variants/esp32/pins_arduino.h
index 1a1fbfd66e0..66cc85d64f6 100644
--- a/variants/esp32/pins_arduino.h
+++ b/variants/esp32/pins_arduino.h
@@ -11,6 +11,9 @@
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
+static const uint8_t LED_BUILTIN = (uint8_t) -1;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/esp320/pins_arduino.h b/variants/esp320/pins_arduino.h
index f62b6502c42..6864d0e4938 100644
--- a/variants/esp320/pins_arduino.h
+++ b/variants/esp320/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 11
-#define NUM_DIGITAL_PINS        12
-#define NUM_ANALOG_INPUTS       5
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/esp32da/pins_arduino.h b/variants/esp32da/pins_arduino.h
index 14c1e548615..60dec021d97 100644
--- a/variants/esp32da/pins_arduino.h
+++ b/variants/esp32da/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/esp32micromod/pins_arduino.h b/variants/esp32micromod/pins_arduino.h
index abf2735e4a2..37c88056622 100755
--- a/variants/esp32micromod/pins_arduino.h
+++ b/variants/esp32micromod/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
@@ -71,5 +71,6 @@ static const uint8_t DAC1 = 25;
 static const uint8_t DAC2 = 26;
 
 static const uint8_t LED_BUILTIN = 2;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/esp32thing/pins_arduino.h b/variants/esp32thing/pins_arduino.h
index 2ab5614033f..975af51baae 100644
--- a/variants/esp32thing/pins_arduino.h
+++ b/variants/esp32thing/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/esp32thing_plus/pins_arduino.h b/variants/esp32thing_plus/pins_arduino.h
index f1342b2c3c0..713ef8fff7b 100644
--- a/variants/esp32thing_plus/pins_arduino.h
+++ b/variants/esp32thing_plus/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 17;
 static const uint8_t RX = 16;
diff --git a/variants/esp32thing_plus_c/pins_arduino.h b/variants/esp32thing_plus_c/pins_arduino.h
index e91fb212a99..278694541cb 100644
--- a/variants/esp32thing_plus_c/pins_arduino.h
+++ b/variants/esp32thing_plus_c/pins_arduino.h
@@ -4,20 +4,19 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 static const uint8_t RGB_BUILTIN = SOC_GPIO_PIN_COUNT+2;
-#define RGB_BUILTIN RGB_BUILTIN
 #define RGB_BRIGHTNESS 64
 
 static const uint8_t TX = 17;
diff --git a/variants/esp32vn-iot-uno/pins_arduino.h b/variants/esp32vn-iot-uno/pins_arduino.h
index c6e9127e254..1b1c02816ae 100644
--- a/variants/esp32vn-iot-uno/pins_arduino.h
+++ b/variants/esp32vn-iot-uno/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h
index 37985c2b476..481f252f937 100644
--- a/variants/espea32/pins_arduino.h
+++ b/variants/espea32/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/espectro32/pins_arduino.h b/variants/espectro32/pins_arduino.h
index 0be1919c1d6..eecd4c9ee4c 100644
--- a/variants/espectro32/pins_arduino.h
+++ b/variants/espectro32/pins_arduino.h
@@ -7,17 +7,16 @@
 #define ESPECTRO32_VERSION 1
 #endif 
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 15;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/espino32/pins_arduino.h b/variants/espino32/pins_arduino.h
index 586f9725dc4..3bb865b7fac 100644
--- a/variants/espino32/pins_arduino.h
+++ b/variants/espino32/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        38
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t BUILTIN_KEY = 0;
 
diff --git a/variants/feather_esp32/pins_arduino.h b/variants/feather_esp32/pins_arduino.h
index 8b2b200ddcb..ee5ae7e91ee 100644
--- a/variants/feather_esp32/pins_arduino.h
+++ b/variants/feather_esp32/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 17;
 static const uint8_t RX = 16;
diff --git a/variants/firebeetle32/pins_arduino.h b/variants/firebeetle32/pins_arduino.h
index 15d54fe9a37..05cb633f21f 100644
--- a/variants/firebeetle32/pins_arduino.h
+++ b/variants/firebeetle32/pins_arduino.h
@@ -3,21 +3,18 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 typedef unsigned char uint8_t;
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
-
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/fm-devkit/pins_arduino.h b/variants/fm-devkit/pins_arduino.h
index 5c1054fafb5..9ad82d1136b 100644
--- a/variants/fm-devkit/pins_arduino.h
+++ b/variants/fm-devkit/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/frog32/pins_arduino.h b/variants/frog32/pins_arduino.h
index 4ad96ccef51..1a1fbfd66e0 100644
--- a/variants/frog32/pins_arduino.h
+++ b/variants/frog32/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/gpy/pins_arduino.h b/variants/gpy/pins_arduino.h
index aa41db48bf1..fded325effc 100644
--- a/variants/gpy/pins_arduino.h
+++ b/variants/gpy/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       18
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<40)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // Sequans Monarch LTE Cat M1/NB1 modem
 // NOTE: The Pycom pinout as well as spec sheet block diagram / pin details
@@ -22,9 +22,13 @@
 #define LTE_WAKE 27 // GPIO27 - Sequans modem wake-up interrupt
 #define LTE_BAUD 921600
 
-static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
+// Neopixel
+#define PIN_NEOPIXEL 0 // ->2812 RGB !!!
+static const uint8_t LED_BUILTIN = PIN_NEOPIXEL; 
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
 
 #define ANT_SELECT 21   // GPIO21 - WiFi external / internal antenna switch
 
diff --git a/variants/healthypi4/pins_arduino.h b/variants/healthypi4/pins_arduino.h
index b3eb897374a..946f51ef570 100644
--- a/variants/healthypi4/pins_arduino.h
+++ b/variants/healthypi4/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 15;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 17;
 
diff --git a/variants/heltec_wifi_kit_32/pins_arduino.h b/variants/heltec_wifi_kit_32/pins_arduino.h
index 9efa252d564..7348992f2b1 100644
--- a/variants/heltec_wifi_kit_32/pins_arduino.h
+++ b/variants/heltec_wifi_kit_32/pins_arduino.h
@@ -7,17 +7,16 @@
 #define DISPLAY_HEIGHT 64
 #define DISPLAY_WIDTH  128
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/heltec_wifi_lora_32/pins_arduino.h b/variants/heltec_wifi_lora_32/pins_arduino.h
index ee5a2affd46..8012aeb3a6e 100644
--- a/variants/heltec_wifi_lora_32/pins_arduino.h
+++ b/variants/heltec_wifi_lora_32/pins_arduino.h
@@ -7,17 +7,16 @@
 #define DISPLAY_HEIGHT 64
 #define DISPLAY_WIDTH  128
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/heltec_wifi_lora_32_V2/pins_arduino.h b/variants/heltec_wifi_lora_32_V2/pins_arduino.h
index 420c23c3ffa..ffb933e16ec 100644
--- a/variants/heltec_wifi_lora_32_V2/pins_arduino.h
+++ b/variants/heltec_wifi_lora_32_V2/pins_arduino.h
@@ -7,17 +7,16 @@
 #define DISPLAY_HEIGHT 64
 #define DISPLAY_WIDTH  128
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/heltec_wifi_lora_32_V3/pins_arduino.h b/variants/heltec_wifi_lora_32_V3/pins_arduino.h
index cbc50a0d117..67ff58e21ef 100644
--- a/variants/heltec_wifi_lora_32_V3/pins_arduino.h
+++ b/variants/heltec_wifi_lora_32_V3/pins_arduino.h
@@ -20,7 +20,6 @@
 // and change this setup for the chosen pin (for example 38)
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/heltec_wireless_stick/pins_arduino.h b/variants/heltec_wireless_stick/pins_arduino.h
index a1c4eec28c8..ce277f0fbc6 100644
--- a/variants/heltec_wireless_stick/pins_arduino.h
+++ b/variants/heltec_wireless_stick/pins_arduino.h
@@ -7,17 +7,16 @@
 #define DISPLAY_HEIGHT 32
 #define DISPLAY_WIDTH  64
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/heltec_wireless_stick_lite/pins_arduino.h b/variants/heltec_wireless_stick_lite/pins_arduino.h
index 981c66b2b74..c397a0a1899 100644
--- a/variants/heltec_wireless_stick_lite/pins_arduino.h
+++ b/variants/heltec_wireless_stick_lite/pins_arduino.h
@@ -7,17 +7,16 @@
 #define DISPLAY_HEIGHT 0
 #define DISPLAY_WIDTH  0
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/honeylemon/pins_arduino.h b/variants/honeylemon/pins_arduino.h
index 0156f5d3254..f39f28382f1 100644
--- a/variants/honeylemon/pins_arduino.h
+++ b/variants/honeylemon/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        38
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t BUILTIN_KEY = 0;
 
diff --git a/variants/hornbill32dev/pins_arduino.h b/variants/hornbill32dev/pins_arduino.h
index 48adf9d75a8..dfe02322efb 100644
--- a/variants/hornbill32dev/pins_arduino.h
+++ b/variants/hornbill32dev/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/hornbill32minima/pins_arduino.h b/variants/hornbill32minima/pins_arduino.h
index c8d65c77a01..42483f932e8 100644
--- a/variants/hornbill32minima/pins_arduino.h
+++ b/variants/hornbill32minima/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;  //taken out on pgm header
 static const uint8_t RX = 3;  //taken out on pgm header
diff --git a/variants/imbrios-logsens-v1p1/pins_arduino.h b/variants/imbrios-logsens-v1p1/pins_arduino.h
index 3c3f083e034..03600d506c8 100644
--- a/variants/imbrios-logsens-v1p1/pins_arduino.h
+++ b/variants/imbrios-logsens-v1p1/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        9
-#define NUM_ANALOG_INPUTS       7
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // Renaming few signals
 #define SPI_CLK	SCK			// IO14
@@ -23,7 +23,6 @@
 /* LED_BUILTIN is kept for compatibility reason; mapped to LED2 on the LogSens V1.1 Board */
 static const uint8_t LED_BUILTIN = 33;
 #define BUILTIN_LED  LED_BUILTIN 	// backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 /* UART0: Serial Port for Programming and Debugging on the LogSens V1.1 Board */
 static const uint8_t TX = 1;
diff --git a/variants/intorobot-fig/pins_arduino.h b/variants/intorobot-fig/pins_arduino.h
index 50cb9c83ce4..8886ef30d0d 100644
--- a/variants/intorobot-fig/pins_arduino.h
+++ b/variants/intorobot-fig/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        7
-#define NUM_ANALOG_INPUTS       10
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 4;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t RGB_R_BUILTIN = 27;
 static const uint8_t RGB_G_BUILTIN = 21;
diff --git a/variants/lionbit/pins_arduino.h b/variants/lionbit/pins_arduino.h
index b7f5825079a..a84a9eb996b 100644
--- a/variants/lionbit/pins_arduino.h
+++ b/variants/lionbit/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS 40
-#define NUM_ANALOG_INPUTS 16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p) (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 0; // GPIO0, ADC2_CH1, TOUCH1, RTC_GPIO11, CLK_OUT1,EMAC_TX_CLK
 static const uint8_t SWITCH_A = 2;    //  GPIO2, ADC2_CH2, TOUCH2, RTC_GPIO12, HSPIWP, HS2_DATA0,SD_DATA0
diff --git a/variants/lolin32-lite/pins_arduino.h b/variants/lolin32-lite/pins_arduino.h
index 883695dfcf1..264bec2ebb6 100755
--- a/variants/lolin32-lite/pins_arduino.h
+++ b/variants/lolin32-lite/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h
index f38be67cc58..a71fb7c1b56 100644
--- a/variants/lolin32/pins_arduino.h
+++ b/variants/lolin32/pins_arduino.h
@@ -3,19 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
-
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/lopy/pins_arduino.h b/variants/lopy/pins_arduino.h
index 235f209825a..62a6d8e39d3 100644
--- a/variants/lopy/pins_arduino.h
+++ b/variants/lopy/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       18
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<40)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // SPI LoRa Radio
 #define LORA_SCK 5      // GPIO5  - SX1276 SCK
@@ -22,9 +22,13 @@
 #define LORA_IO1 LORA_IRQ  // tied by diode to IO0
 #define LORA_IO2 LORA_IRQ  // tied by diode to IO0
 
-static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
+// Neopixel
+#define PIN_NEOPIXEL 0 // ->2812 RGB !!!
+static const uint8_t LED_BUILTIN = PIN_NEOPIXEL; 
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
 
 #define ANT_SELECT 16   // GPIO16 - External Antenna Switch
 
diff --git a/variants/lopy4/pins_arduino.h b/variants/lopy4/pins_arduino.h
index 723d3fa8c3c..b494b6838d1 100644
--- a/variants/lopy4/pins_arduino.h
+++ b/variants/lopy4/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       18
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<40)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // SPI LoRa Radio
 #define LORA_SCK 5      // GPIO5  - SX1276 SCK
@@ -22,9 +22,13 @@
 #define LORA_IO2 LORA_IRQ   // tied by diode to IO0
 #define LORA_RST NOT_A_PIN
 
-static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
+// Neopixel
+#define PIN_NEOPIXEL 0 // ->2812 RGB !!!
+static const uint8_t LED_BUILTIN = PIN_NEOPIXEL; 
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
 
 #define ANT_SELECT 21   // GPIO21 - External Antenna Switch
 
diff --git a/variants/m5stack_atom/pins_arduino.h b/variants/m5stack_atom/pins_arduino.h
index 645436bd7da..44246c53b14 100644
--- a/variants/m5stack_atom/pins_arduino.h
+++ b/variants/m5stack_atom/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/m5stack_core2/pins_arduino.h b/variants/m5stack_core2/pins_arduino.h
index 895c7c0de2a..f80536f9ec0 100644
--- a/variants/m5stack_core2/pins_arduino.h
+++ b/variants/m5stack_core2/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 #define TX2 14
 #define RX2 13
diff --git a/variants/m5stack_core_esp32/pins_arduino.h b/variants/m5stack_core_esp32/pins_arduino.h
index 8b86a0d6fdc..38a89cd97e4 100644
--- a/variants/m5stack_core_esp32/pins_arduino.h
+++ b/variants/m5stack_core_esp32/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/m5stack_coreink/pins_arduino.h b/variants/m5stack_coreink/pins_arduino.h
index 4ce9b122880..5838813e9b0 100644
--- a/variants/m5stack_coreink/pins_arduino.h
+++ b/variants/m5stack_coreink/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 #define TX2 14
 #define RX2 13
diff --git a/variants/m5stack_fire/pins_arduino.h b/variants/m5stack_fire/pins_arduino.h
index 8b86a0d6fdc..38a89cd97e4 100644
--- a/variants/m5stack_fire/pins_arduino.h
+++ b/variants/m5stack_fire/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/m5stack_stamp_pico/pins_arduino.h b/variants/m5stack_stamp_pico/pins_arduino.h
index d784362da76..4de0ac09c41 100644
--- a/variants/m5stack_stamp_pico/pins_arduino.h
+++ b/variants/m5stack_stamp_pico/pins_arduino.h
@@ -3,14 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/m5stack_station/pins_arduino.h b/variants/m5stack_station/pins_arduino.h
index 9ba182b90b5..21647ca954f 100644
--- a/variants/m5stack_station/pins_arduino.h
+++ b/variants/m5stack_station/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)   (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)        (p<34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/m5stack_timer_cam/pins_arduino.h b/variants/m5stack_timer_cam/pins_arduino.h
index 1f7f4b46aae..393ecc45205 100644
--- a/variants/m5stack_timer_cam/pins_arduino.h
+++ b/variants/m5stack_timer_cam/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/m5stick_c/pins_arduino.h b/variants/m5stick_c/pins_arduino.h
index e4d73f6a2e3..5b894c82e02 100644
--- a/variants/m5stick_c/pins_arduino.h
+++ b/variants/m5stick_c/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/magicbit/pins_arduino.h b/variants/magicbit/pins_arduino.h
index 6bf769942a7..2db4e0cadf0 100644
--- a/variants/magicbit/pins_arduino.h
+++ b/variants/magicbit/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/metro_esp-32/pins_arduino.h b/variants/metro_esp-32/pins_arduino.h
index 6675823c50e..b6431d8a160 100644
--- a/variants/metro_esp-32/pins_arduino.h
+++ b/variants/metro_esp-32/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/mgbot-iotik32a/pins_arduino.h b/variants/mgbot-iotik32a/pins_arduino.h
index 283e01b2b9b..7f2cce79bc6 100644
--- a/variants/mgbot-iotik32a/pins_arduino.h
+++ b/variants/mgbot-iotik32a/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 4;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/mgbot-iotik32b/pins_arduino.h b/variants/mgbot-iotik32b/pins_arduino.h
index 04dfe30c52f..d974d0d8522 100644
--- a/variants/mgbot-iotik32b/pins_arduino.h
+++ b/variants/mgbot-iotik32b/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 // IR receiver
 static const uint8_t IR = 27;
diff --git a/variants/mhetesp32devkit/pins_arduino.h b/variants/mhetesp32devkit/pins_arduino.h
index badd89bf58c..5c65c2e08c3 100644
--- a/variants/mhetesp32devkit/pins_arduino.h
+++ b/variants/mhetesp32devkit/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN 
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/mhetesp32minikit/pins_arduino.h b/variants/mhetesp32minikit/pins_arduino.h
index badd89bf58c..5c65c2e08c3 100644
--- a/variants/mhetesp32minikit/pins_arduino.h
+++ b/variants/mhetesp32minikit/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN 
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/mpython/pins_arduino.h b/variants/mpython/pins_arduino.h
index 301700d6355..99b3ebeff01 100644
--- a/variants/mpython/pins_arduino.h
+++ b/variants/mpython/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/nano32/pins_arduino.h b/variants/nano32/pins_arduino.h
index 586f9725dc4..3bb865b7fac 100644
--- a/variants/nano32/pins_arduino.h
+++ b/variants/nano32/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        38
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t BUILTIN_KEY = 0;
 
diff --git a/variants/nina_w10/pins_arduino.h b/variants/nina_w10/pins_arduino.h
index 00bd44c05b9..b09627ce126 100644
--- a/variants/nina_w10/pins_arduino.h
+++ b/variants/nina_w10/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_GREEN = 33;
 static const uint8_t LED_RED = 23;
diff --git a/variants/node32s/pins_arduino.h b/variants/node32s/pins_arduino.h
index b37eaed659c..8668cd4bbf7 100644
--- a/variants/node32s/pins_arduino.h
+++ b/variants/node32s/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/nodemcu-32s/pins_arduino.h b/variants/nodemcu-32s/pins_arduino.h
index b37eaed659c..8668cd4bbf7 100644
--- a/variants/nodemcu-32s/pins_arduino.h
+++ b/variants/nodemcu-32s/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/odroid_esp32/pins_arduino.h b/variants/odroid_esp32/pins_arduino.h
index 01a863ab236..d1531127847 100644
--- a/variants/odroid_esp32/pins_arduino.h
+++ b/variants/odroid_esp32/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/onehorse32dev/pins_arduino.h b/variants/onehorse32dev/pins_arduino.h
index e57615e3272..6fe86808b35 100644
--- a/variants/onehorse32dev/pins_arduino.h
+++ b/variants/onehorse32dev/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/openkb/pins_arduino.h b/variants/openkb/pins_arduino.h
index 4928bd49539..61c0e09d177 100644
--- a/variants/openkb/pins_arduino.h
+++ b/variants/openkb/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        38
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/oroca_edubot/pins_arduino.h b/variants/oroca_edubot/pins_arduino.h
index 1cfa1fb86fb..6db7514b84e 100644
--- a/variants/oroca_edubot/pins_arduino.h
+++ b/variants/oroca_edubot/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 17;
 static const uint8_t RX = 16;
diff --git a/variants/pico32/pins_arduino.h b/variants/pico32/pins_arduino.h
index 4ad96ccef51..1a1fbfd66e0 100644
--- a/variants/pico32/pins_arduino.h
+++ b/variants/pico32/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/piranha_esp-32/pins_arduino.h b/variants/piranha_esp-32/pins_arduino.h
index 4de761d9aa5..dc91ba36373 100644
--- a/variants/piranha_esp-32/pins_arduino.h
+++ b/variants/piranha_esp-32/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/pocket_32/pins_arduino.h b/variants/pocket_32/pins_arduino.h
index af926f45982..f9b1193a645 100644
--- a/variants/pocket_32/pins_arduino.h
+++ b/variants/pocket_32/pins_arduino.h
@@ -3,19 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
-
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/quantum/pins_arduino.h b/variants/quantum/pins_arduino.h
index 4ad96ccef51..1a1fbfd66e0 100644
--- a/variants/quantum/pins_arduino.h
+++ b/variants/quantum/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/roboheart_hercules/pins_arduino.h b/variants/roboheart_hercules/pins_arduino.h
index 17a5951773e..16e275f89f7 100644
--- a/variants/roboheart_hercules/pins_arduino.h
+++ b/variants/roboheart_hercules/pins_arduino.h
@@ -3,14 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // Motor driver pins 
 #define MOTOR_A_IN1 25  //  PHASE/IN1
diff --git a/variants/sonoff_dualr3/pins_arduino.h b/variants/sonoff_dualr3/pins_arduino.h
index 1b3fae2d8bb..500220777b4 100644
--- a/variants/sonoff_dualr3/pins_arduino.h
+++ b/variants/sonoff_dualr3/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/sparkfun_esp32_iot_redboard/pins_arduino.h b/variants/sparkfun_esp32_iot_redboard/pins_arduino.h
index b644d7baf95..a359112a15a 100644
--- a/variants/sparkfun_esp32_iot_redboard/pins_arduino.h
+++ b/variants/sparkfun_esp32_iot_redboard/pins_arduino.h
@@ -4,20 +4,19 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
-static const uint8_t RGB_BUILTIN = SOC_GPIO_PIN_COUNT+2;
-#define RGB_BUILTIN RGB_BUILTIN
+#define NEO_PIXEL 2 //WS2812 LED
+static const uint8_t RGB_BUILTIN = (SOC_GPIO_PIN_COUNT+NEO_PIXEL);
 #define RGB_BRIGHTNESS 64
 
 static const uint8_t TX = 1;
diff --git a/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h b/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h
index 5d0b845764d..c58c2d0932c 100755
--- a/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h
+++ b/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h
@@ -3,15 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const int LED_BUILTIN = 17;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/tbeam/pins_arduino.h b/variants/tbeam/pins_arduino.h
index fdec62d96d3..371fd903fec 100644
--- a/variants/tbeam/pins_arduino.h
+++ b/variants/tbeam/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // SPI LoRa Radio
 #define LORA_SCK 5      // GPIO5  - SX1276 SCK
@@ -26,7 +26,6 @@ static const uint8_t KEY_BUILTIN = 39;
 
 static const uint8_t LED_BUILTIN = 14;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/ttgo-lora32-v1/pins_arduino.h b/variants/ttgo-lora32-v1/pins_arduino.h
index 0faf524e233..258c367aa05 100644
--- a/variants/ttgo-lora32-v1/pins_arduino.h
+++ b/variants/ttgo-lora32-v1/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // I2C OLED Display works with SSD1306 driver
 #define OLED_SDA 4
@@ -26,7 +26,6 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/ttgo-lora32-v2/pins_arduino.h b/variants/ttgo-lora32-v2/pins_arduino.h
index 5cf49fdd4b7..5ad1e249ab1 100644
--- a/variants/ttgo-lora32-v2/pins_arduino.h
+++ b/variants/ttgo-lora32-v2/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // I2C OLED Display works with SSD1306 driver
 #define OLED_SDA    21
@@ -32,7 +32,6 @@
 
 static const uint8_t LED_BUILTIN =  22;
 #define BUILTIN_LED  LED_BUILTIN    // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN =  0;
 
diff --git a/variants/ttgo-lora32-v21new/pins_arduino.h b/variants/ttgo-lora32-v21new/pins_arduino.h
index cb4f917b8fc..2a510d180f8 100644
--- a/variants/ttgo-lora32-v21new/pins_arduino.h
+++ b/variants/ttgo-lora32-v21new/pins_arduino.h
@@ -9,13 +9,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // I2C OLED Display works with SSD1306 driver
 #define OLED_SDA    21
@@ -38,9 +38,8 @@
 #define SD_MOSI 15
 #define SD_CS   13
 
-static const uint8_t LED_BUILTIN = 25  ;
+static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN    // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN =  0;
 
diff --git a/variants/ttgo-t1/pins_arduino.h b/variants/ttgo-t1/pins_arduino.h
index 8adc5eaf57f..caa61c76499 100644
--- a/variants/ttgo-t1/pins_arduino.h
+++ b/variants/ttgo-t1/pins_arduino.h
@@ -3,20 +3,19 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
 static const uint8_t LED_BUILTIN = 22;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t SDA = 21;
 // Despite the many diagrams from TTGO showing SCL on pin 22, due to the on-board LED
diff --git a/variants/ttgo-t7-v13-mini32/pins_arduino.h b/variants/ttgo-t7-v13-mini32/pins_arduino.h
index 75057d726d5..3bd349192d8 100755
--- a/variants/ttgo-t7-v13-mini32/pins_arduino.h
+++ b/variants/ttgo-t7-v13-mini32/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/ttgo-t7-v14-mini32/pins_arduino.h b/variants/ttgo-t7-v14-mini32/pins_arduino.h
index b0ca79e64e4..9d487e43aef 100755
--- a/variants/ttgo-t7-v14-mini32/pins_arduino.h
+++ b/variants/ttgo-t7-v14-mini32/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/turta_iot_node/pins_arduino.h b/variants/turta_iot_node/pins_arduino.h
index f156ee2fb70..c2b81a4783f 100644
--- a/variants/turta_iot_node/pins_arduino.h
+++ b/variants/turta_iot_node/pins_arduino.h
@@ -3,18 +3,17 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 20
-#define NUM_DIGITAL_PINS        21
-#define NUM_ANALOG_INPUTS       9
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // LED
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 // UART
 static const uint8_t TX = 10;
diff --git a/variants/twatch/pins_arduino.h b/variants/twatch/pins_arduino.h
index b46288c7e76..75fbda9dff6 100644
--- a/variants/twatch/pins_arduino.h
+++ b/variants/twatch/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // touch screen
 #define TP_SDA              23
diff --git a/variants/uPesy_esp32_wroom_devkit/pins_arduino.h b/variants/uPesy_esp32_wroom_devkit/pins_arduino.h
index 69e4138428f..f38b0ba8fe1 100644
--- a/variants/uPesy_esp32_wroom_devkit/pins_arduino.h
+++ b/variants/uPesy_esp32_wroom_devkit/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/uPesy_esp32_wrover_devkit/pins_arduino.h b/variants/uPesy_esp32_wrover_devkit/pins_arduino.h
index 69e4138428f..f38b0ba8fe1 100644
--- a/variants/uPesy_esp32_wrover_devkit/pins_arduino.h
+++ b/variants/uPesy_esp32_wrover_devkit/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/um_tinypico/pins_arduino.h b/variants/um_tinypico/pins_arduino.h
index 134a5ce88d4..eb4227937f3 100644
--- a/variants/um_tinypico/pins_arduino.h
+++ b/variants/um_tinypico/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/vintlabsdevkitv1/pins_arduino.h b/variants/vintlabsdevkitv1/pins_arduino.h
index 6f0df757180..7ae12cf386a 100644
--- a/variants/vintlabsdevkitv1/pins_arduino.h
+++ b/variants/vintlabsdevkitv1/pins_arduino.h
@@ -3,20 +3,18 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
-static const uint8_t RX = 3;
 
 static const uint8_t SDA = 21;
 static const uint8_t SCL = 22;
diff --git a/variants/watchy/pins_arduino.h b/variants/watchy/pins_arduino.h
index 2c93c173429..66c75d350d2 100644
--- a/variants/watchy/pins_arduino.h
+++ b/variants/watchy/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/wesp32/pins_arduino.h b/variants/wesp32/pins_arduino.h
index 7dbfa439e06..c6d8c38fe28 100644
--- a/variants/wesp32/pins_arduino.h
+++ b/variants/wesp32/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 #define TX1   12
 #define RX1   13
diff --git a/variants/widora-air/pins_arduino.h b/variants/widora-air/pins_arduino.h
index 4cb0fa4da0d..58f147a9c9f 100644
--- a/variants/widora-air/pins_arduino.h
+++ b/variants/widora-air/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        7
-#define NUM_ANALOG_INPUTS       10
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 
 static const uint8_t KEY_BUILTIN = 0;
diff --git a/variants/wifiduino32/pins_arduino.h b/variants/wifiduino32/pins_arduino.h
index 841721d6d8d..79aff0107e3 100644
--- a/variants/wifiduino32/pins_arduino.h
+++ b/variants/wifiduino32/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h
index 87792e471b4..1d4046c59c5 100644
--- a/variants/wipy3/pins_arduino.h
+++ b/variants/wipy3/pins_arduino.h
@@ -3,17 +3,22 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       18
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
-static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
+// Neopixel
+#define PIN_NEOPIXEL 0 // ->2812 RGB !!!
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT) 
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
 
 #define ANT_SELECT 21   // GPIO21 - External Antenna Switch
 
diff --git a/variants/wt32-eth01/pins_arduino.h b/variants/wt32-eth01/pins_arduino.h
index 6cb2a6a5d7a..f11831eed21 100644
--- a/variants/wt32-eth01/pins_arduino.h
+++ b/variants/wt32-eth01/pins_arduino.h
@@ -9,13 +9,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS 40
-#define NUM_ANALOG_INPUTS 16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p) (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 // interface to Ethernet PHY (LAN8720A)
 #define ETH_PHY_ADDR 1
diff --git a/variants/xinabox/pins_arduino.h b/variants/xinabox/pins_arduino.h
index 52b3e4f12d8..a187006632f 100644
--- a/variants/xinabox/pins_arduino.h
+++ b/variants/xinabox/pins_arduino.h
@@ -3,17 +3,16 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 static const uint8_t LED_BUILTIN = 27;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;

From 18c6e922ea4945cb56e82466270fc508cf5073ae Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 31 Aug 2023 20:28:22 -0300
Subject: [PATCH 08/18] ESP32-S2 remains

---
 .../pins_arduino.h                            | 21 ++++++++++++-------
 variants/um_feathers2neo/pins_arduino.h       |  3 +--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
index c0e29e53a7a..f792a36f9cb 100644
--- a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
+++ b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
@@ -11,17 +11,22 @@
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
-#define LED_BUILTIN     13
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define PIN_NEOPIXEL        33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      21    // power pin
 #define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
diff --git a/variants/um_feathers2neo/pins_arduino.h b/variants/um_feathers2neo/pins_arduino.h
index 84b4b4ccf0a..65d8a2d8c81 100644
--- a/variants/um_feathers2neo/pins_arduino.h
+++ b/variants/um_feathers2neo/pins_arduino.h
@@ -67,9 +67,8 @@ static const uint8_t NEOPIXEL_PWR = 39;
 #define RGB_BUILTIN (NEOPIXEL_DATA + SOC_GPIO_PIN_COUNT)  
 #define RGB_BRIGHTNESS 64
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = (NEOPIXEL_DATA + SOC_GPIO_PIN_COUNT);
+static const uint8_t LED_BUILTIN = RGB_BUILTIN;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t VBAT_SENSE = 2;
 static const uint8_t VBUS_SENSE = 34;

From a623a77f97cca6c38456851d4333ff24bfbb5a4c Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 31 Aug 2023 20:45:15 -0300
Subject: [PATCH 09/18] remove redundances

---
 variants/Nebula_S3/pins_arduino.h                           | 1 -
 variants/XIAO_ESP32S3/pins_arduino.h                        | 1 -
 variants/adafruit_feather_esp32s2/pins_arduino.h            | 1 -
 variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h | 1 -
 variants/adafruit_feather_esp32s2_tft/pins_arduino.h        | 1 -
 variants/adafruit_magtag29_esp32s2/pins_arduino.h           | 1 -
 variants/adafruit_qtpy_esp32s2/pins_arduino.h               | 2 --
 variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h          | 1 -
 variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h       | 1 -
 variants/bpi_leaf_s3/pins_arduino.h                         | 1 -
 variants/crabik_slot_esp32_s3/pins_arduino.h                | 1 -
 variants/cytron_maker_feather_aiot_s3/pins_arduino.h        | 2 --
 variants/d1_uno32/pins_arduino.h                            | 1 -
 variants/deneyapkart1Av2/pins_arduino.h                     | 1 -
 variants/deneyapkartg/pins_arduino.h                        | 1 -
 variants/deneyapmini/pins_arduino.h                         | 1 -
 variants/deneyapminiv2/pins_arduino.h                       | 1 -
 variants/dfrobot_firebeetle2_esp32e/pins_arduino.h          | 3 ---
 variants/esp32c3/pins_arduino.h                             | 1 -
 variants/esp32s2/pins_arduino.h                             | 1 -
 variants/esp32s3/pins_arduino.h                             | 1 -
 variants/franzininho_wifi_esp32s2/pins_arduino.h            | 1 -
 variants/franzininho_wifi_msc_esp32s2/pins_arduino.h        | 1 -
 variants/heltec_wifi_kit_32_v3/pins_arduino.h               | 1 -
 variants/heltec_wireless_stick_lite_v3/pins_arduino.h       | 1 -
 variants/lolin_s3/pins_arduino.h                            | 1 -
 variants/lolin_s3_mini/pins_arduino.h                       | 1 -
 variants/lolin_s3_pro/pins_arduino.h                        | 1 -
 variants/m5stack_atoms3/pins_arduino.h                      | 1 -
 variants/m5stack_cores3/pins_arduino.h                      | 1 -
 variants/redpill_esp32s3/pins_arduino.h                     | 1 -
 variants/tamc_termod_s3/pins_arduino.h                      | 1 -
 variants/um_tinys2/pins_arduino.h                           | 1 -
 variants/wifiduino32s3/pins_arduino.h                       | 1 -
 variants/wifiduinov2/pins_arduino.h                         | 1 -
 35 files changed, 39 deletions(-)

diff --git a/variants/Nebula_S3/pins_arduino.h b/variants/Nebula_S3/pins_arduino.h
index 513aef8409e..51a2c02cb21 100644
--- a/variants/Nebula_S3/pins_arduino.h
+++ b/variants/Nebula_S3/pins_arduino.h
@@ -17,7 +17,6 @@
 
 static const uint8_t LED_BUILTIN = 45;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/XIAO_ESP32S3/pins_arduino.h b/variants/XIAO_ESP32S3/pins_arduino.h
index 975b5717097..e0ed69333d0 100644
--- a/variants/XIAO_ESP32S3/pins_arduino.h
+++ b/variants/XIAO_ESP32S3/pins_arduino.h
@@ -13,7 +13,6 @@
 
 static const uint8_t LED_BUILTIN = 21;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
diff --git a/variants/adafruit_feather_esp32s2/pins_arduino.h b/variants/adafruit_feather_esp32s2/pins_arduino.h
index ac0a57d02d7..c1032e7452f 100644
--- a/variants/adafruit_feather_esp32s2/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2/pins_arduino.h
@@ -24,7 +24,6 @@
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
index 4c0c13596a7..5107a17e14d 100644
--- a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
@@ -23,7 +23,6 @@
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
index c425463916f..708bacc4db8 100644
--- a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
@@ -23,7 +23,6 @@
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/adafruit_magtag29_esp32s2/pins_arduino.h b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
index 9edb839353c..f88834a4583 100644
--- a/variants/adafruit_magtag29_esp32s2/pins_arduino.h
+++ b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
@@ -24,7 +24,6 @@
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT); // Only 1 NeoPixel will be affected
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/adafruit_qtpy_esp32s2/pins_arduino.h b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
index 8f77ae73f02..e46d2ceb5fc 100644
--- a/variants/adafruit_qtpy_esp32s2/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
@@ -27,8 +27,6 @@
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      38    // power pin
 #define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
diff --git a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
index 789161da4ad..34dd7e8bc98 100644
--- a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
@@ -25,7 +25,6 @@
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN  LED_BUILTIN
 #define RGB_BUILTIN  LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
index 38305f67e36..a6d22de06a1 100644
--- a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
@@ -25,7 +25,6 @@
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN  LED_BUILTIN
 #define RGB_BUILTIN  LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/bpi_leaf_s3/pins_arduino.h b/variants/bpi_leaf_s3/pins_arduino.h
index 56876ce9c9d..7942010e9bf 100644
--- a/variants/bpi_leaf_s3/pins_arduino.h
+++ b/variants/bpi_leaf_s3/pins_arduino.h
@@ -19,7 +19,6 @@
 // and change this setup for the chosen pin (for example 38)
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 25
 
diff --git a/variants/crabik_slot_esp32_s3/pins_arduino.h b/variants/crabik_slot_esp32_s3/pins_arduino.h
index 31aa9ee79cb..23fc1a3ee3b 100644
--- a/variants/crabik_slot_esp32_s3/pins_arduino.h
+++ b/variants/crabik_slot_esp32_s3/pins_arduino.h
@@ -19,7 +19,6 @@
 
 static const uint8_t LED_BUILTIN = 21;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t S1  = 1;
 static const uint8_t S2  = 12;
diff --git a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
index bd3e9c278c9..cfaef210cae 100644
--- a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
+++ b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
@@ -24,9 +24,7 @@ static const uint8_t LED_BUILTIN = 2;                           // Status LED.
 static const uint8_t RGB_BUILTIN = SOC_GPIO_PIN_COUNT + 46;     // RGB LED.
 
 #define BUILTIN_LED     LED_BUILTIN                             // Backward compatibility
-#define LED_BUILTIN     LED_BUILTIN
 #define LED             LED_BUILTIN
-#define RGB_BUILTIN     RGB_BUILTIN
 #define RGB             RGB_BUILTIN
 #define NEOPIXEL        RGB_BUILTIN
 #define RGB_BRIGHTNESS  65
diff --git a/variants/d1_uno32/pins_arduino.h b/variants/d1_uno32/pins_arduino.h
index 388cf5422f6..72181c675af 100644
--- a/variants/d1_uno32/pins_arduino.h
+++ b/variants/d1_uno32/pins_arduino.h
@@ -34,7 +34,6 @@ static const uint8_t A5 = 39;
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 #define PIN_WIRE_SDA SDA // backward compatibility
 #define PIN_WIRE_SCL SCL // backward compatibility
diff --git a/variants/deneyapkart1Av2/pins_arduino.h b/variants/deneyapkart1Av2/pins_arduino.h
index 24928d48422..40477595272 100644
--- a/variants/deneyapkart1Av2/pins_arduino.h
+++ b/variants/deneyapkart1Av2/pins_arduino.h
@@ -20,7 +20,6 @@
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGBLED      LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/deneyapkartg/pins_arduino.h b/variants/deneyapkartg/pins_arduino.h
index f73f172876d..fab199fee35 100644
--- a/variants/deneyapkartg/pins_arduino.h
+++ b/variants/deneyapkartg/pins_arduino.h
@@ -20,7 +20,6 @@
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+10;
 #define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGBLED      LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/deneyapmini/pins_arduino.h b/variants/deneyapmini/pins_arduino.h
index 439bbb552af..78fc3183468 100644
--- a/variants/deneyapmini/pins_arduino.h
+++ b/variants/deneyapmini/pins_arduino.h
@@ -19,7 +19,6 @@
 
 static const uint8_t LED_BUILTIN = 35;
 #define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
 #define LEDB        LED_BUILTIN
 #define LEDR 34
 #define LEDG 33
diff --git a/variants/deneyapminiv2/pins_arduino.h b/variants/deneyapminiv2/pins_arduino.h
index 0c62545455d..d36e6841b27 100644
--- a/variants/deneyapminiv2/pins_arduino.h
+++ b/variants/deneyapminiv2/pins_arduino.h
@@ -20,7 +20,6 @@
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+33;
 #define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGBLED      LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h b/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
index 2e74381453a..23f5984bc2a 100644
--- a/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
+++ b/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
@@ -15,9 +15,6 @@ typedef unsigned char uint8_t;
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
-
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h
index a0e93dbe528..c4d0318b6d7 100644
--- a/variants/esp32c3/pins_arduino.h
+++ b/variants/esp32c3/pins_arduino.h
@@ -10,7 +10,6 @@
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+8;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/esp32s2/pins_arduino.h b/variants/esp32s2/pins_arduino.h
index b8da1d994ca..8ab6b6ea0c1 100644
--- a/variants/esp32s2/pins_arduino.h
+++ b/variants/esp32s2/pins_arduino.h
@@ -11,7 +11,6 @@
 static const uint8_t LED_BUILTIN = (SOC_GPIO_PIN_COUNT+18); // GPIO pin for Saola-1 & DevKitM-1 = 18
 //static const uint8_t LED_BUILTIN = (SOC_GPIO_PIN_COUNT+45); // GPIO pin for Kaluga = 45
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/esp32s3/pins_arduino.h b/variants/esp32s3/pins_arduino.h
index 4d29f00a4da..e8fb1cf0bdb 100644
--- a/variants/esp32s3/pins_arduino.h
+++ b/variants/esp32s3/pins_arduino.h
@@ -16,7 +16,6 @@
 // and change this setup for the chosen pin (for example 38)
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/franzininho_wifi_esp32s2/pins_arduino.h b/variants/franzininho_wifi_esp32s2/pins_arduino.h
index 91a510b1b4a..192a2ff9412 100644
--- a/variants/franzininho_wifi_esp32s2/pins_arduino.h
+++ b/variants/franzininho_wifi_esp32s2/pins_arduino.h
@@ -22,7 +22,6 @@ static const uint8_t PIN_NEOPIXEL = 18;
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
index 556891b66f6..02431cce559 100644
--- a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
+++ b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
@@ -29,7 +29,6 @@ static const uint8_t PIN_NEOPIXEL = 18;
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/heltec_wifi_kit_32_v3/pins_arduino.h b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
index 6e889604dd8..0a795057c9d 100644
--- a/variants/heltec_wifi_kit_32_v3/pins_arduino.h
+++ b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
@@ -17,7 +17,6 @@
 
 static const uint8_t LED_BUILTIN = 35;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/heltec_wireless_stick_lite_v3/pins_arduino.h b/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
index 174b9e7f2d5..77496a05213 100644
--- a/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
+++ b/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
@@ -17,7 +17,6 @@
 
 static const uint8_t LED_BUILTIN = 35;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/lolin_s3/pins_arduino.h b/variants/lolin_s3/pins_arduino.h
index 46a168c6b7e..953ead5f5a7 100644
--- a/variants/lolin_s3/pins_arduino.h
+++ b/variants/lolin_s3/pins_arduino.h
@@ -13,7 +13,6 @@
 
 static const uint8_t LED_BUILTIN = 38;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/lolin_s3_mini/pins_arduino.h b/variants/lolin_s3_mini/pins_arduino.h
index 8a5e6ca866c..221c22b4eb7 100644
--- a/variants/lolin_s3_mini/pins_arduino.h
+++ b/variants/lolin_s3_mini/pins_arduino.h
@@ -13,7 +13,6 @@
 
 static const uint8_t LED_BUILTIN = 47;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/lolin_s3_pro/pins_arduino.h b/variants/lolin_s3_pro/pins_arduino.h
index a70e31b74d8..8ee957b504d 100644
--- a/variants/lolin_s3_pro/pins_arduino.h
+++ b/variants/lolin_s3_pro/pins_arduino.h
@@ -13,7 +13,6 @@
 
 static const uint8_t LED_BUILTIN = 38;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/m5stack_atoms3/pins_arduino.h b/variants/m5stack_atoms3/pins_arduino.h
index 8af4ef2e53d..64e4a172887 100644
--- a/variants/m5stack_atoms3/pins_arduino.h
+++ b/variants/m5stack_atoms3/pins_arduino.h
@@ -16,7 +16,6 @@
 // and change this setup for the chosen pin (for example 38)
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 48;
 #define BUILTIN_LED    LED_BUILTIN  // backward compatibility
-#define LED_BUILTIN    LED_BUILTIN
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/m5stack_cores3/pins_arduino.h b/variants/m5stack_cores3/pins_arduino.h
index c8c979abe69..6a8c8e15d05 100644
--- a/variants/m5stack_cores3/pins_arduino.h
+++ b/variants/m5stack_cores3/pins_arduino.h
@@ -16,7 +16,6 @@
 // and change this setup for the chosen pin (for example 38)
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 48;
 #define BUILTIN_LED    LED_BUILTIN  // backward compatibility
-#define LED_BUILTIN    LED_BUILTIN
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/redpill_esp32s3/pins_arduino.h b/variants/redpill_esp32s3/pins_arduino.h
index 0b58bd2415e..ebd264ed1bd 100644
--- a/variants/redpill_esp32s3/pins_arduino.h
+++ b/variants/redpill_esp32s3/pins_arduino.h
@@ -16,7 +16,6 @@
 
 static const uint8_t LED_BUILTIN = 3;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/tamc_termod_s3/pins_arduino.h b/variants/tamc_termod_s3/pins_arduino.h
index ca86f85469f..45ce3ecb112 100644
--- a/variants/tamc_termod_s3/pins_arduino.h
+++ b/variants/tamc_termod_s3/pins_arduino.h
@@ -16,7 +16,6 @@
 // and change this setup for the chosen pin (for example 38)
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/um_tinys2/pins_arduino.h b/variants/um_tinys2/pins_arduino.h
index f0cd220bb67..0793b740be5 100644
--- a/variants/um_tinys2/pins_arduino.h
+++ b/variants/um_tinys2/pins_arduino.h
@@ -80,6 +80,5 @@ static const uint8_t RGB_PWR = 2;
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = (RGB_DATA + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/wifiduino32s3/pins_arduino.h b/variants/wifiduino32s3/pins_arduino.h
index 9115256472b..2067ddedfc6 100644
--- a/variants/wifiduino32s3/pins_arduino.h
+++ b/variants/wifiduino32s3/pins_arduino.h
@@ -16,7 +16,6 @@
 // and change this setup for the chosen pin (for example 38)
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define BOARD_HAS_NEOPIXEL
 #define LED_BRIGHTNESS 64
 
diff --git a/variants/wifiduinov2/pins_arduino.h b/variants/wifiduinov2/pins_arduino.h
index 4eb83a7c3ae..6a08eaa8e88 100644
--- a/variants/wifiduinov2/pins_arduino.h
+++ b/variants/wifiduinov2/pins_arduino.h
@@ -10,7 +10,6 @@
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
 #define BOARD_HAS_NEOPIXEL
 #define LED_BRIGHTNESS 64
 

From 8bca645d5851e5937188f042d8b3063ba269b3bb Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 31 Aug 2023 21:56:51 -0300
Subject: [PATCH 10/18] S3 Variants + 1 lost S2

---
 variants/Bee_Data_Logger/pins_arduino.h       | 19 ++++++++++-----
 variants/Bee_Motion/pins_arduino.h            | 12 +++++-----
 variants/Bee_Motion_S3/pins_arduino.h         | 19 ++++++++++-----
 variants/Bee_S3/pins_arduino.h                | 20 +++++++++++-----
 variants/Nebula_S3/pins_arduino.h             | 13 +++++-----
 variants/XIAO_ESP32S3/pins_arduino.h          | 14 +++++------
 .../adafruit_feather_esp32s3/pins_arduino.h   | 21 +++++++++-------
 .../pins_arduino.h                            | 21 +++++++++-------
 .../pins_arduino.h                            | 21 +++++++++-------
 .../pins_arduino.h                            | 21 +++++++++-------
 .../pins_arduino.h                            | 19 +++++++++------
 .../adafruit_qtpy_esp32s3_n4r2/pins_arduino.h | 24 ++++++++++---------
 .../pins_arduino.h                            | 24 ++++++++++---------
 variants/bpi_leaf_s3/pins_arduino.h           | 19 ++++++++-------
 variants/crabik_slot_esp32_s3/pins_arduino.h  | 12 +++++-----
 .../pins_arduino.h                            | 12 +++++-----
 variants/deneyapkart1Av2/pins_arduino.h       | 12 +++++-----
 variants/deneyapmini/pins_arduino.h           | 12 +++++-----
 variants/deneyapminiv2/pins_arduino.h         | 12 +++++-----
 .../dfrobot_firebeetle2_esp32e/pins_arduino.h | 12 +++++-----
 .../pins_arduino.h                            | 12 +++++-----
 variants/dfrobot_romeo_esp32s3/pins_arduino.h | 12 +++++-----
 variants/esp32s2/pins_arduino.h               |  6 +++--
 variants/esp32s3/pins_arduino.h               | 13 ++++++----
 variants/esp32s3box/pins_arduino.h            | 12 +++++-----
 variants/esp32s3camlcd/pins_arduino.h         | 12 +++++-----
 variants/esp32s3usbotg/pins_arduino.h         | 12 +++++-----
 variants/heltec_wifi_kit_32_v3/pins_arduino.h | 19 +++++++++------
 .../heltec_wifi_lora_32_V3/pins_arduino.h     | 21 +++++++---------
 .../pins_arduino.h                            | 12 +++++-----
 variants/lilygo_t_display_s3/pins_arduino.h   | 12 +++++-----
 variants/lolin_s3/pins_arduino.h              | 13 +++++-----
 variants/lolin_s3_mini/pins_arduino.h         | 13 +++++-----
 variants/lolin_s3_pro/pins_arduino.h          | 13 +++++-----
 variants/m5stack_atoms3/pins_arduino.h        | 22 +++++++----------
 variants/m5stack_cores3/pins_arduino.h        | 15 ++++++------
 variants/m5stack_stamp_s3/pins_arduino.h      | 15 ++++++------
 variants/nora_w10/pins_arduino.h              | 12 +++++-----
 variants/redpill_esp32s3/pins_arduino.h       | 12 +++++-----
 variants/tamc_termod_s3/pins_arduino.h        | 14 +++++------
 variants/um_feathers3/pins_arduino.h          | 20 ++++++++++------
 variants/um_pros3/pins_arduino.h              | 19 ++++++++++-----
 variants/um_rmp/pins_arduino.h                | 20 ++++++++++------
 variants/um_tinys3/pins_arduino.h             | 18 +++++++++-----
 variants/unphone8/pins_arduino.h              | 12 +++++-----
 variants/unphone9/pins_arduino.h              | 12 +++++-----
 variants/wifiduino32s3/pins_arduino.h         | 14 +++++------
 47 files changed, 400 insertions(+), 326 deletions(-)

diff --git a/variants/Bee_Data_Logger/pins_arduino.h b/variants/Bee_Data_Logger/pins_arduino.h
index b49fd08d030..d3f08ee640c 100644
--- a/variants/Bee_Data_Logger/pins_arduino.h
+++ b/variants/Bee_Data_Logger/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "Bee Data Logger"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        13
-#define NUM_ANALOG_INPUTS       7
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -74,5 +74,12 @@ static const uint8_t LDO2 = 34;
 static const uint8_t RGB_DATA = 40;
 static const uint8_t RGB_PWR = 34;
 
+#define PIN_NEOPIXEL RGB_DATA
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/Bee_Motion/pins_arduino.h b/variants/Bee_Motion/pins_arduino.h
index 18cc71f24f5..fea2177810b 100644
--- a/variants/Bee_Motion/pins_arduino.h
+++ b/variants/Bee_Motion/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "Bee Motion S3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        21
-#define NUM_ANALOG_INPUTS       12
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/Bee_Motion_S3/pins_arduino.h b/variants/Bee_Motion_S3/pins_arduino.h
index 19025426c65..07a329fdb35 100644
--- a/variants/Bee_Motion_S3/pins_arduino.h
+++ b/variants/Bee_Motion_S3/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "Bee Motion S3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        27
-#define NUM_ANALOG_INPUTS       11
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -81,5 +81,12 @@ static const uint8_t LDO2 = 34;
 static const uint8_t RGB_DATA = 40;
 static const uint8_t RGB_PWR = 34;
 
+#define PIN_NEOPIXEL RGB_DATA
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/Bee_S3/pins_arduino.h b/variants/Bee_S3/pins_arduino.h
index b095fb8fd7f..97b03928be0 100644
--- a/variants/Bee_S3/pins_arduino.h
+++ b/variants/Bee_S3/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "BeeS3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 45
-#define NUM_DIGITAL_PINS        15
-#define NUM_ANALOG_INPUTS       8
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -73,4 +73,12 @@ static const uint8_t VBAT_VOLTAGE = 1;
 static const uint8_t RGB_DATA = 48;
 static const uint8_t RGB_PWR = 34;
 
+#define PIN_NEOPIXEL RGB_DATA
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/Nebula_S3/pins_arduino.h b/variants/Nebula_S3/pins_arduino.h
index 51a2c02cb21..8bd20e1402b 100644
--- a/variants/Nebula_S3/pins_arduino.h
+++ b/variants/Nebula_S3/pins_arduino.h
@@ -6,14 +6,13 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 20
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       6
-
-#define analogInputToDigitalPin(p)  (((p)<6)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<20)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 20)
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 45;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/XIAO_ESP32S3/pins_arduino.h b/variants/XIAO_ESP32S3/pins_arduino.h
index e0ed69333d0..e7a8e94c426 100644
--- a/variants/XIAO_ESP32S3/pins_arduino.h
+++ b/variants/XIAO_ESP32S3/pins_arduino.h
@@ -7,17 +7,17 @@
 #define USB_VID 0x2886
 #define USB_PID 0x0056
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 21;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
-#define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/adafruit_feather_esp32s3/pins_arduino.h b/variants/adafruit_feather_esp32s3/pins_arduino.h
index 16ae97b640f..8558a6181cd 100644
--- a/variants/adafruit_feather_esp32s3/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3/pins_arduino.h
@@ -9,17 +9,22 @@
 #define USB_PRODUCT        "Feather ESP32-S3"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
-#define LED_BUILTIN         13
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define PIN_NEOPIXEL        33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      21    // power pin
 #define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
diff --git a/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h
index 58a23a17f7c..1525c609004 100644
--- a/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h
@@ -9,17 +9,22 @@
 #define USB_PRODUCT        "Feather ESP32-S3 No PSRAM"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
-#define LED_BUILTIN         13
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define PIN_NEOPIXEL        33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      21    // power pin
 #define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
diff --git a/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h
index 594940f5710..832ccf20e70 100644
--- a/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h
@@ -11,17 +11,22 @@
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
-#define LED_BUILTIN     13
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define PIN_NEOPIXEL        33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      21    // power pin
 #define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
diff --git a/variants/adafruit_feather_esp32s3_tft/pins_arduino.h b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h
index d1a9dc5ff81..371dae74074 100644
--- a/variants/adafruit_feather_esp32s3_tft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h
@@ -11,17 +11,22 @@
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
-#define LED_BUILTIN     13
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define PIN_NEOPIXEL        33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      34    // power pin
 #define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
diff --git a/variants/adafruit_matrixportal_esp32s3/pins_arduino.h b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h
index c239edcd9fa..dfb5da32400 100644
--- a/variants/adafruit_matrixportal_esp32s3/pins_arduino.h
+++ b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h
@@ -9,17 +9,22 @@
 #define USB_PRODUCT        "MatrixPortal ESP32-S3"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<EXTERNAL_NUM_INTERRUPTS)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
-#define LED_BUILTIN         13
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define PIN_NEOPIXEL        33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
 #define NEOPIXEL_NUM        1
 
 static const uint8_t TX = 18;
diff --git a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
index 34dd7e8bc98..618d9586fcc 100644
--- a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
@@ -10,24 +10,26 @@
 #define USB_PRODUCT        "QT Py ESP32-S3 (4MB Flash 2MB PSRAM)"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define PIN_NEOPIXEL        39
-#define NEOPIXEL_NUM        1     // number of neopixels
-#define NEOPIXEL_POWER      38    // power pin
-#define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
-
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define RGB_BUILTIN  LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
+#define NEOPIXEL_NUM        1     // number of neopixels
+#define NEOPIXEL_POWER      38    // power pin
+#define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
+
 static const uint8_t TX = 5;
 static const uint8_t RX = 16;
 #define TX1 TX
diff --git a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
index a6d22de06a1..7b57dd4b6d4 100644
--- a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
@@ -10,24 +10,26 @@
 #define USB_PRODUCT        "QT Py ESP32-S3 No PSRAM"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define PIN_NEOPIXEL        39
-#define NEOPIXEL_NUM        1     // number of neopixels
-#define NEOPIXEL_POWER      38    // power pin
-#define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
-
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define RGB_BUILTIN  LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
+#define NEOPIXEL_NUM        1     // number of neopixels
+#define NEOPIXEL_POWER      38    // power pin
+#define NEOPIXEL_POWER_ON   HIGH  // power pin state when on
+
 static const uint8_t TX = 5;
 static const uint8_t RX = 16;
 #define TX1 TX
diff --git a/variants/bpi_leaf_s3/pins_arduino.h b/variants/bpi_leaf_s3/pins_arduino.h
index 7942010e9bf..7c0dae6e4dc 100644
--- a/variants/bpi_leaf_s3/pins_arduino.h
+++ b/variants/bpi_leaf_s3/pins_arduino.h
@@ -10,22 +10,25 @@
 #define USB_PRODUCT "BPI-Leaf-S3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
 // and change this setup for the chosen pin (for example 38)
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
+#define PIN_NEOPIXEL 48
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 25
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/crabik_slot_esp32_s3/pins_arduino.h b/variants/crabik_slot_esp32_s3/pins_arduino.h
index 23fc1a3ee3b..6e057503f69 100644
--- a/variants/crabik_slot_esp32_s3/pins_arduino.h
+++ b/variants/crabik_slot_esp32_s3/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "Slot ESP32-S3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 21;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
index cfaef210cae..e43e760dc07 100644
--- a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
+++ b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
@@ -10,13 +10,13 @@
 #define USB_PRODUCT        "Maker Feather AIoT S3"
 #define USB_SERIAL         ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       12
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 
 
diff --git a/variants/deneyapkart1Av2/pins_arduino.h b/variants/deneyapkart1Av2/pins_arduino.h
index 40477595272..78b2ec36d2e 100644
--- a/variants/deneyapkart1Av2/pins_arduino.h
+++ b/variants/deneyapkart1Av2/pins_arduino.h
@@ -10,13 +10,13 @@
 #define USB_PRODUCT        "DENEYAP KART 1A v2"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS	46
-#define NUM_DIGITAL_PINS	48
-#define NUM_ANALOG_INPUTS	20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BUILTIN_LED LED_BUILTIN
diff --git a/variants/deneyapmini/pins_arduino.h b/variants/deneyapmini/pins_arduino.h
index 78fc3183468..0e4e106f819 100644
--- a/variants/deneyapmini/pins_arduino.h
+++ b/variants/deneyapmini/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT        "DENEYAP MINI"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 35;
 #define BUILTIN_LED LED_BUILTIN
diff --git a/variants/deneyapminiv2/pins_arduino.h b/variants/deneyapminiv2/pins_arduino.h
index d36e6841b27..b630d13deb3 100644
--- a/variants/deneyapminiv2/pins_arduino.h
+++ b/variants/deneyapminiv2/pins_arduino.h
@@ -10,13 +10,13 @@
 #define USB_PRODUCT        "DENEYAP MINI v2"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+33;
 #define BUILTIN_LED LED_BUILTIN
diff --git a/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h b/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
index 23f5984bc2a..3bac1e0b070 100644
--- a/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
+++ b/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
+#define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < 34)  // PWM only for GPIO0..33 - NOT GPIO 34,35,36 and 39
 
 typedef unsigned char uint8_t;
 
diff --git a/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h b/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h
index 91e164478b2..33306f5e56d 100644
--- a/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h
+++ b/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT        "FireBeetle 2 ESP32-S3"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 
 static const uint8_t TX = 43;
diff --git a/variants/dfrobot_romeo_esp32s3/pins_arduino.h b/variants/dfrobot_romeo_esp32s3/pins_arduino.h
index 1c16f6e9f65..a07d7cc8029 100644
--- a/variants/dfrobot_romeo_esp32s3/pins_arduino.h
+++ b/variants/dfrobot_romeo_esp32s3/pins_arduino.h
@@ -5,13 +5,13 @@
 
 
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 
 static const uint8_t TX = 43;
diff --git a/variants/esp32s2/pins_arduino.h b/variants/esp32s2/pins_arduino.h
index 8ab6b6ea0c1..2aa9efdbab9 100644
--- a/variants/esp32s2/pins_arduino.h
+++ b/variants/esp32s2/pins_arduino.h
@@ -8,9 +8,11 @@
 #define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-static const uint8_t LED_BUILTIN = (SOC_GPIO_PIN_COUNT+18); // GPIO pin for Saola-1 & DevKitM-1 = 18
-//static const uint8_t LED_BUILTIN = (SOC_GPIO_PIN_COUNT+45); // GPIO pin for Kaluga = 45
+#define PIN_NEOPIXEL 18 // GPIO pin for Saola-1 & DevKitM-1 = 18 & GPIO pin for Kaluga = 45
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/esp32s3/pins_arduino.h b/variants/esp32s3/pins_arduino.h
index e8fb1cf0bdb..7eb4487d84d 100644
--- a/variants/esp32s3/pins_arduino.h
+++ b/variants/esp32s3/pins_arduino.h
@@ -11,18 +11,21 @@
 #define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
+
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
 // and change this setup for the chosen pin (for example 38)
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
+#define PIN_NEOPIXEL        48
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
-#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/esp32s3box/pins_arduino.h b/variants/esp32s3box/pins_arduino.h
index 3ed655d1d3f..e78c793a915 100644
--- a/variants/esp32s3box/pins_arduino.h
+++ b/variants/esp32s3box/pins_arduino.h
@@ -6,13 +6,13 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/esp32s3camlcd/pins_arduino.h b/variants/esp32s3camlcd/pins_arduino.h
index 308644ff52e..0cd35ea4ffc 100644
--- a/variants/esp32s3camlcd/pins_arduino.h
+++ b/variants/esp32s3camlcd/pins_arduino.h
@@ -6,13 +6,13 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/esp32s3usbotg/pins_arduino.h b/variants/esp32s3usbotg/pins_arduino.h
index 94edeeca74c..5b4ae539649 100644
--- a/variants/esp32s3usbotg/pins_arduino.h
+++ b/variants/esp32s3usbotg/pins_arduino.h
@@ -6,13 +6,13 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/heltec_wifi_kit_32_v3/pins_arduino.h b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
index 0a795057c9d..c21fad9201c 100644
--- a/variants/heltec_wifi_kit_32_v3/pins_arduino.h
+++ b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
@@ -7,16 +7,21 @@
 #define DISPLAY_HEIGHT 64
 #define DISPLAY_WIDTH  128
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
-static const uint8_t LED_BUILTIN = 35;
+#define PIN_NEOPIXEL        35
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/heltec_wifi_lora_32_V3/pins_arduino.h b/variants/heltec_wifi_lora_32_V3/pins_arduino.h
index 67ff58e21ef..a5a565390b1 100644
--- a/variants/heltec_wifi_lora_32_V3/pins_arduino.h
+++ b/variants/heltec_wifi_lora_32_V3/pins_arduino.h
@@ -11,21 +11,16 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-// Some boards have too low voltage on this pin (board design bug)
-// Use different pin with 3V and connect with 48
-// and change this setup for the chosen pin (for example 38)
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
-#define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define RGB_BUILTIN LED_BUILTIN
-#define RGB_BRIGHTNESS 64
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+static const uint8_t LED_BUILTIN = 35;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/heltec_wireless_stick_lite_v3/pins_arduino.h b/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
index 77496a05213..678770b2a15 100644
--- a/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
+++ b/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
@@ -7,13 +7,13 @@
 #define DISPLAY_HEIGHT 0
 #define DISPLAY_WIDTH  0
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       15
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 35;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/lilygo_t_display_s3/pins_arduino.h b/variants/lilygo_t_display_s3/pins_arduino.h
index 099bdad5876..41730ff4817 100644
--- a/variants/lilygo_t_display_s3/pins_arduino.h
+++ b/variants/lilygo_t_display_s3/pins_arduino.h
@@ -7,13 +7,13 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t BUTTON_1 = 0;
 static const uint8_t BUTTON_2 = 14;
diff --git a/variants/lolin_s3/pins_arduino.h b/variants/lolin_s3/pins_arduino.h
index 953ead5f5a7..571d27822a8 100644
--- a/variants/lolin_s3/pins_arduino.h
+++ b/variants/lolin_s3/pins_arduino.h
@@ -6,20 +6,19 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       18
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 38;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/lolin_s3_mini/pins_arduino.h b/variants/lolin_s3_mini/pins_arduino.h
index 221c22b4eb7..8a355fafbeb 100644
--- a/variants/lolin_s3_mini/pins_arduino.h
+++ b/variants/lolin_s3_mini/pins_arduino.h
@@ -6,20 +6,19 @@
 #define USB_VID 0x303a
 #define USB_PID 0x8167
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       18
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 47;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/lolin_s3_pro/pins_arduino.h b/variants/lolin_s3_pro/pins_arduino.h
index 8ee957b504d..7d3f23e1a42 100644
--- a/variants/lolin_s3_pro/pins_arduino.h
+++ b/variants/lolin_s3_pro/pins_arduino.h
@@ -6,20 +6,19 @@
 #define USB_VID 0x303a
 #define USB_PID 0x8161
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       18
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 38;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/m5stack_atoms3/pins_arduino.h b/variants/m5stack_atoms3/pins_arduino.h
index 64e4a172887..5b2453f1181 100644
--- a/variants/m5stack_atoms3/pins_arduino.h
+++ b/variants/m5stack_atoms3/pins_arduino.h
@@ -7,23 +7,19 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
-
-// Some boards have too low voltage on this pin (board design bug)
-// Use different pin with 3V and connect with 48
-// and change this setup for the chosen pin (for example 38)
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 48;
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
+
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 35;
 #define BUILTIN_LED    LED_BUILTIN  // backward compatibility
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p) \
-    (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
-#define digitalPinHasPWM(p)      (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/m5stack_cores3/pins_arduino.h b/variants/m5stack_cores3/pins_arduino.h
index 6a8c8e15d05..9d85777f5bb 100644
--- a/variants/m5stack_cores3/pins_arduino.h
+++ b/variants/m5stack_cores3/pins_arduino.h
@@ -7,9 +7,13 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
@@ -19,11 +23,6 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 48;
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p) \
-    (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
-#define digitalPinHasPWM(p)      (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/m5stack_stamp_s3/pins_arduino.h b/variants/m5stack_stamp_s3/pins_arduino.h
index ff8076d01c1..2935a0ffb1e 100644
--- a/variants/m5stack_stamp_s3/pins_arduino.h
+++ b/variants/m5stack_stamp_s3/pins_arduino.h
@@ -7,14 +7,13 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 23
-#define NUM_DIGITAL_PINS        46
-#define NUM_ANALOG_INPUTS       15
-
-#define analogInputToDigitalPin(p) \
-    (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
-#define digitalPinHasPWM(p)      (p < 46)
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/nora_w10/pins_arduino.h b/variants/nora_w10/pins_arduino.h
index ccf4556dcfc..e12d2ea4856 100644
--- a/variants/nora_w10/pins_arduino.h
+++ b/variants/nora_w10/pins_arduino.h
@@ -7,13 +7,13 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 // The pin assignments in this file are based on u-blox EVK-NORA-W1, a Arduino compatible board.
 // For your own module design you can freely chose the pins available on the module module pins
diff --git a/variants/redpill_esp32s3/pins_arduino.h b/variants/redpill_esp32s3/pins_arduino.h
index ebd264ed1bd..7d731cd9afb 100644
--- a/variants/redpill_esp32s3/pins_arduino.h
+++ b/variants/redpill_esp32s3/pins_arduino.h
@@ -6,13 +6,13 @@
 #define USB_VID 0x303A
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t LED_BUILTIN = 3;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/tamc_termod_s3/pins_arduino.h b/variants/tamc_termod_s3/pins_arduino.h
index 45ce3ecb112..cc50fabfd08 100644
--- a/variants/tamc_termod_s3/pins_arduino.h
+++ b/variants/tamc_termod_s3/pins_arduino.h
@@ -7,9 +7,13 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
@@ -19,10 +23,6 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/um_feathers3/pins_arduino.h b/variants/um_feathers3/pins_arduino.h
index 9b60548d08f..a364539756c 100644
--- a/variants/um_feathers3/pins_arduino.h
+++ b/variants/um_feathers3/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "FeatherS3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        21
-#define NUM_ANALOG_INPUTS       13
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -62,7 +62,13 @@ static const uint8_t VBUS_SENSE = 34;
 static const uint8_t RGB_DATA = 40;
 static const uint8_t RGB_PWR = 39;
 static const uint8_t LDO2 = 39;
-static const uint8_t LED_BUILTIN = 13;
 static const uint8_t LED = 13;
 
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = RGB_BUILTIN;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/um_pros3/pins_arduino.h b/variants/um_pros3/pins_arduino.h
index d46a772d0cb..eb6cf3a7c6c 100644
--- a/variants/um_pros3/pins_arduino.h
+++ b/variants/um_pros3/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "ProS3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        27
-#define NUM_ANALOG_INPUTS       14
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -65,4 +65,11 @@ static const uint8_t RGB_DATA = 18;
 static const uint8_t RGB_PWR = 17;
 static const uint8_t LDO2 = 17;
 
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = RGB_BUILTIN;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/um_rmp/pins_arduino.h b/variants/um_rmp/pins_arduino.h
index bf79ad86176..b68edd9d4f4 100644
--- a/variants/um_rmp/pins_arduino.h
+++ b/variants/um_rmp/pins_arduino.h
@@ -6,16 +6,16 @@
 #define USB_VID 0x303A
 #define USB_PID 0x8001
 #define USB_MANUFACTURER "Unexpected Maker"
-#define USB_PRODUCT "RM Pro"
+#define USB_PRODUCT "RM Pro"   // ESP32-S2
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..46
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -75,4 +75,10 @@ static const uint8_t VBUS_SENSE = 21;
 static const uint8_t RGB_DATA = 1;
 static const uint8_t RGB_PWR = 2;
 
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = RGB_BUILTIN;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 #endif /* Pins_Arduino_h */
diff --git a/variants/um_tinys3/pins_arduino.h b/variants/um_tinys3/pins_arduino.h
index ca2b4ba4873..3347d0213aa 100644
--- a/variants/um_tinys3/pins_arduino.h
+++ b/variants/um_tinys3/pins_arduino.h
@@ -9,13 +9,13 @@
 #define USB_PRODUCT "TinyS3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       9
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -56,4 +56,10 @@ static const uint8_t VBUS_SENSE = 33;
 static const uint8_t RGB_DATA = 18;
 static const uint8_t RGB_PWR = 17;
 
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT)  
+#define RGB_BRIGHTNESS 64
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = RGB_BUILTIN;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 #endif /* Pins_Arduino_h */
diff --git a/variants/unphone8/pins_arduino.h b/variants/unphone8/pins_arduino.h
index f6270e7224b..deebec834f4 100644
--- a/variants/unphone8/pins_arduino.h
+++ b/variants/unphone8/pins_arduino.h
@@ -6,13 +6,13 @@
 #define USB_VID            0x16D0
 #define USB_PID            0x1178
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define LED_BUILTIN         13
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/unphone9/pins_arduino.h b/variants/unphone9/pins_arduino.h
index d16ec924358..bfe8d167440 100644
--- a/variants/unphone9/pins_arduino.h
+++ b/variants/unphone9/pins_arduino.h
@@ -6,13 +6,13 @@
 #define USB_VID            0x16D0
 #define USB_PID            0x1178
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 #define LED_BUILTIN         13
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
diff --git a/variants/wifiduino32s3/pins_arduino.h b/variants/wifiduino32s3/pins_arduino.h
index 2067ddedfc6..34d589881f3 100644
--- a/variants/wifiduino32s3/pins_arduino.h
+++ b/variants/wifiduino32s3/pins_arduino.h
@@ -7,9 +7,13 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
@@ -19,10 +23,6 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BOARD_HAS_NEOPIXEL
 #define LED_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 static const uint8_t TX = 45;
 static const uint8_t RX = 44;
 

From 4e623359c0c556081f14001d0819c28cebc810c2 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 31 Aug 2023 22:20:01 -0300
Subject: [PATCH 11/18] ESP32-C3 Variants

---
 variants/AirM2M_CORE_ESP32C3/pins_arduino.h      |  8 ++++----
 variants/Bee_Motion_Mini/pins_arduino.h          | 12 ++++++------
 variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h |  8 ++++----
 variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h |  8 ++++----
 variants/XIAO_ESP32C3/pins_arduino.h             |  8 ++++----
 variants/adafruit_qtpy_esp32c3/pins_arduino.h    | 14 ++++++++++----
 variants/deneyapkartg/pins_arduino.h             |  8 ++++----
 variants/dfrobot_beetle_esp32c3/pins_arduino.h   |  9 +++++----
 variants/esp32c3/pins_arduino.h                  | 13 ++++++++-----
 variants/esp_c3_m1_i_kit/pins_arduino.h          |  8 ++++----
 variants/lolin_c3_mini/pins_arduino.h            |  8 ++++----
 variants/ttgo-t-oi-plus/pins_arduino.h           |  8 ++++----
 variants/wifiduinov2/pins_arduino.h              | 13 ++++---------
 13 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/variants/AirM2M_CORE_ESP32C3/pins_arduino.h b/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
index 4af6c1d87cd..b04f7a820d8 100644
--- a/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
+++ b/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
@@ -3,12 +3,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t LED_BUILTIN     = 12;
diff --git a/variants/Bee_Motion_Mini/pins_arduino.h b/variants/Bee_Motion_Mini/pins_arduino.h
index e3f43decb4a..96aad9cf03a 100644
--- a/variants/Bee_Motion_Mini/pins_arduino.h
+++ b/variants/Bee_Motion_Mini/pins_arduino.h
@@ -4,13 +4,13 @@
 #include <stdint.h>
 
 
-#define EXTERNAL_NUM_INTERRUPTS 4
-#define NUM_DIGITAL_PINS        4
-#define NUM_ANALOG_INPUTS       2
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-#define analogInputToDigitalPin(p)  (((p)<6)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<22)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 22)
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
diff --git a/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h b/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
index 4e3c771578b..d43bd354431 100644
--- a/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
+++ b/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
@@ -3,12 +3,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;
diff --git a/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h b/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
index 4e3c771578b..d43bd354431 100644
--- a/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
+++ b/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
@@ -3,12 +3,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;
diff --git a/variants/XIAO_ESP32C3/pins_arduino.h b/variants/XIAO_ESP32C3/pins_arduino.h
index 420ed499dc8..b01964ee4a0 100644
--- a/variants/XIAO_ESP32C3/pins_arduino.h
+++ b/variants/XIAO_ESP32C3/pins_arduino.h
@@ -3,12 +3,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;
diff --git a/variants/adafruit_qtpy_esp32c3/pins_arduino.h b/variants/adafruit_qtpy_esp32c3/pins_arduino.h
index 6c93bfd5820..a5aee582674 100644
--- a/variants/adafruit_qtpy_esp32c3/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32c3/pins_arduino.h
@@ -3,16 +3,22 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 #define BUTTON 9
 #define PIN_NEOPIXEL 2
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
 
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
diff --git a/variants/deneyapkartg/pins_arduino.h b/variants/deneyapkartg/pins_arduino.h
index fab199fee35..7d4259fcf23 100644
--- a/variants/deneyapkartg/pins_arduino.h
+++ b/variants/deneyapkartg/pins_arduino.h
@@ -10,12 +10,12 @@
 #define USB_PRODUCT        "DENEYAP KART G"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+10;
diff --git a/variants/dfrobot_beetle_esp32c3/pins_arduino.h b/variants/dfrobot_beetle_esp32c3/pins_arduino.h
index 735f894281f..c164c0753be 100644
--- a/variants/dfrobot_beetle_esp32c3/pins_arduino.h
+++ b/variants/dfrobot_beetle_esp32c3/pins_arduino.h
@@ -10,15 +10,16 @@
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t LED_BUILTIN = 10;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h
index c4d0318b6d7..ebf0332f4f5 100644
--- a/variants/esp32c3/pins_arduino.h
+++ b/variants/esp32c3/pins_arduino.h
@@ -8,15 +8,18 @@
 #define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+8;
-#define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define RGB_BUILTIN LED_BUILTIN
-#define RGB_BRIGHTNESS 64
-
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
+#define PIN_NEOPIXEL        8
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
 
diff --git a/variants/esp_c3_m1_i_kit/pins_arduino.h b/variants/esp_c3_m1_i_kit/pins_arduino.h
index 0a1a0fe9fe8..d1dae135c90 100644
--- a/variants/esp_c3_m1_i_kit/pins_arduino.h
+++ b/variants/esp_c3_m1_i_kit/pins_arduino.h
@@ -8,12 +8,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 // User LEDs are also connected to USB D- and D+
diff --git a/variants/lolin_c3_mini/pins_arduino.h b/variants/lolin_c3_mini/pins_arduino.h
index 59889448572..14c3a8d8747 100644
--- a/variants/lolin_c3_mini/pins_arduino.h
+++ b/variants/lolin_c3_mini/pins_arduino.h
@@ -3,12 +3,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t LED_BUILTIN = 7;
diff --git a/variants/ttgo-t-oi-plus/pins_arduino.h b/variants/ttgo-t-oi-plus/pins_arduino.h
index 16cac90bdaf..55a0fbb2618 100644
--- a/variants/ttgo-t-oi-plus/pins_arduino.h
+++ b/variants/ttgo-t-oi-plus/pins_arduino.h
@@ -3,12 +3,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 12
-#define NUM_DIGITAL_PINS        12
-#define NUM_ANALOG_INPUTS       3
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t LED_BUILTIN = 3;
diff --git a/variants/wifiduinov2/pins_arduino.h b/variants/wifiduinov2/pins_arduino.h
index 6a08eaa8e88..5207bdd4bdf 100644
--- a/variants/wifiduinov2/pins_arduino.h
+++ b/variants/wifiduinov2/pins_arduino.h
@@ -4,17 +4,12 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
-
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13;
-#define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define BOARD_HAS_NEOPIXEL
-#define LED_BRIGHTNESS 64
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
+#define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;

From bb19ec74567bebaeb3184913f277261c965bb4bb Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Sun, 3 Sep 2023 15:54:36 -0300
Subject: [PATCH 12/18] fixes include soc_caps and type

---
 variants/AirM2M_CORE_ESP32C3/pins_arduino.h                   | 3 ++-
 variants/Bee_Data_Logger/pins_arduino.h                       | 1 +
 variants/Bee_Motion/pins_arduino.h                            | 1 +
 variants/Bee_Motion_Mini/pins_arduino.h                       | 4 ++--
 variants/Bee_Motion_S3/pins_arduino.h                         | 1 +
 variants/Bee_S3/pins_arduino.h                                | 1 +
 variants/ET-Board/pins_arduino.h                              | 1 +
 variants/Edgebox-ESP-100/pins_arduino.h                       | 1 +
 variants/Microduino-esp32/pins_arduino.h                      | 1 +
 variants/Nebula_S3/pins_arduino.h                             | 1 +
 variants/S_ODI_Ultra_v1/pins_arduino.h                        | 1 +
 variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h              | 3 ++-
 variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h              | 3 ++-
 variants/XIAO_ESP32C3/pins_arduino.h                          | 3 ++-
 variants/adafruit_feather_esp32_v2/pins_arduino.h             | 1 +
 variants/adafruit_feather_esp32s2/pins_arduino.h              | 2 +-
 variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h   | 2 +-
 variants/adafruit_feather_esp32s2_tft/pins_arduino.h          | 2 +-
 variants/adafruit_feather_esp32s3/pins_arduino.h              | 1 +
 variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h      | 1 +
 variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h   | 2 +-
 variants/adafruit_feather_esp32s3_tft/pins_arduino.h          | 2 +-
 variants/adafruit_funhouse_esp32s2/pins_arduino.h             | 2 +-
 variants/adafruit_itsybitsy_esp32/pins_arduino.h              | 1 +
 variants/adafruit_magtag29_esp32s2/pins_arduino.h             | 2 +-
 variants/adafruit_matrixportal_esp32s3/pins_arduino.h         | 1 +
 variants/adafruit_metro_esp32s2/pins_arduino.h                | 2 +-
 variants/adafruit_metro_esp32s3/pins_arduino.h                | 1 +
 variants/adafruit_qtpy_esp32/pins_arduino.h                   | 1 +
 variants/adafruit_qtpy_esp32c3/pins_arduino.h                 | 3 ++-
 variants/adafruit_qtpy_esp32s2/pins_arduino.h                 | 2 +-
 variants/alksesp32/pins_arduino.h                             | 1 +
 variants/atmegazero_esp32s2/pins_arduino.h                    | 1 +
 variants/bpi-bit/pins_arduino.h                               | 1 +
 variants/ch_denky/pins_arduino.h                              | 1 +
 variants/cnrs_aw2eth/pins_arduino.h                           | 1 +
 variants/connaxio_espoir/pins_arduino.h                       | 1 +
 variants/crabik_slot_esp32_s3/pins_arduino.h                  | 1 +
 variants/d-duino-32/pins_arduino.h                            | 1 +
 variants/d1_uno32/pins_arduino.h                              | 2 +-
 variants/d32/d32_core.h                                       | 2 ++
 variants/deneyapkart/pins_arduino.h                           | 1 +
 variants/deneyapkartg/pins_arduino.h                          | 2 +-
 variants/deneyapmini/pins_arduino.h                           | 1 +
 .../department_of_alchemy_minimain_esp32s2/pins_arduino.h     | 2 +-
 variants/dfrobot_beetle_esp32c3/pins_arduino.h                | 3 ++-
 variants/dfrobot_firebeetle2_esp32e/pins_arduino.h            | 1 +
 variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h           | 1 +
 variants/dfrobot_romeo_esp32s3/pins_arduino.h                 | 3 +--
 variants/doitESP32devkitV1/pins_arduino.h                     | 1 +
 variants/doitESPduino32/pins_arduino.h                        | 1 +
 variants/dpu_esp32/pins_arduino.h                             | 1 +
 variants/esp32-devkit-lipo/pins_arduino.h                     | 1 +
 variants/esp32-evb/pins_arduino.h                             | 1 +
 variants/esp32-gateway/pins_arduino.h                         | 1 +
 variants/esp32-poe-iso/pins_arduino.h                         | 1 +
 variants/esp32-poe/pins_arduino.h                             | 1 +
 variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h       | 1 +
 variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h      | 1 +
 variants/esp32-trueverit-iot-driver/pins_arduino.h            | 1 +
 variants/esp32/pins_arduino.h                                 | 1 +
 variants/esp320/pins_arduino.h                                | 1 +
 variants/esp32c3/pins_arduino.h                               | 2 +-
 variants/esp32da/pins_arduino.h                               | 1 +
 variants/esp32micromod/pins_arduino.h                         | 1 +
 variants/esp32s2thing_plus/pins_arduino.h                     | 1 +
 variants/esp32s2usb/pins_arduino.h                            | 1 +
 variants/esp32s3box/pins_arduino.h                            | 1 +
 variants/esp32s3camlcd/pins_arduino.h                         | 1 +
 variants/esp32s3usbotg/pins_arduino.h                         | 1 +
 variants/esp32thing/pins_arduino.h                            | 1 +
 variants/esp32thing_plus/pins_arduino.h                       | 1 +
 variants/esp32vn-iot-uno/pins_arduino.h                       | 1 +
 variants/esp_c3_m1_i_kit/pins_arduino.h                       | 3 ++-
 variants/espea32/pins_arduino.h                               | 1 +
 variants/espectro32/pins_arduino.h                            | 1 +
 variants/espino32/pins_arduino.h                              | 1 +
 variants/feather_esp32/pins_arduino.h                         | 1 +
 variants/firebeetle32/pins_arduino.h                          | 1 +
 variants/fm-devkit/pins_arduino.h                             | 1 +
 variants/franzininho_wifi_esp32s2/pins_arduino.h              | 1 +
 variants/franzininho_wifi_msc_esp32s2/pins_arduino.h          | 1 +
 variants/frog32/pins_arduino.h                                | 1 +
 variants/gpy/pins_arduino.h                                   | 1 +
 variants/healthypi4/pins_arduino.h                            | 1 +
 variants/heltec_wifi_kit_32/pins_arduino.h                    | 1 +
 variants/heltec_wifi_kit_32_v3/pins_arduino.h                 | 3 ++-
 variants/heltec_wifi_lora_32/pins_arduino.h                   | 1 +
 variants/heltec_wifi_lora_32_V2/pins_arduino.h                | 1 +
 variants/heltec_wireless_stick/pins_arduino.h                 | 1 +
 variants/heltec_wireless_stick_lite/pins_arduino.h            | 1 +
 variants/heltec_wireless_stick_lite_v3/pins_arduino.h         | 1 +
 variants/honeylemon/pins_arduino.h                            | 1 +
 variants/hornbill32dev/pins_arduino.h                         | 1 +
 variants/hornbill32minima/pins_arduino.h                      | 1 +
 variants/imbrios-logsens-v1p1/pins_arduino.h                  | 1 +
 variants/intorobot-fig/pins_arduino.h                         | 1 +
 variants/lilygo_t_display/pins_arduino.h                      | 1 +
 variants/lionbit/pins_arduino.h                               | 1 +
 variants/lionbits3/pins_arduino.h                             | 1 +
 variants/lolin32-lite/pins_arduino.h                          | 1 +
 variants/lolin32/pins_arduino.h                               | 1 +
 variants/lolin_c3_mini/pins_arduino.h                         | 3 ++-
 variants/lolin_s2_mini/pins_arduino.h                         | 1 +
 variants/lolin_s2_pico/pins_arduino.h                         | 1 +
 variants/lolin_s3/pins_arduino.h                              | 1 +
 variants/lolin_s3_mini/pins_arduino.h                         | 1 +
 variants/lolin_s3_pro/pins_arduino.h                          | 1 +
 variants/lopy/pins_arduino.h                                  | 1 +
 variants/lopy4/pins_arduino.h                                 | 1 +
 variants/m5stack_atom/pins_arduino.h                          | 1 +
 variants/m5stack_core2/pins_arduino.h                         | 1 +
 variants/m5stack_core_esp32/pins_arduino.h                    | 1 +
 variants/m5stack_coreink/pins_arduino.h                       | 1 +
 variants/m5stack_fire/pins_arduino.h                          | 1 +
 variants/m5stack_stamp_pico/pins_arduino.h                    | 1 +
 variants/m5stack_station/pins_arduino.h                       | 1 +
 variants/m5stack_timer_cam/pins_arduino.h                     | 1 +
 variants/m5stick_c/pins_arduino.h                             | 1 +
 variants/magicbit/pins_arduino.h                              | 1 +
 variants/metro_esp-32/pins_arduino.h                          | 1 +
 variants/mgbot-iotik32a/pins_arduino.h                        | 1 +
 variants/mgbot-iotik32b/pins_arduino.h                        | 1 +
 variants/mhetesp32devkit/pins_arduino.h                       | 1 +
 variants/mhetesp32minikit/pins_arduino.h                      | 1 +
 variants/micro_s2/pins_arduino.h                              | 1 +
 variants/mpython/pins_arduino.h                               | 1 +
 variants/nano32/pins_arduino.h                                | 1 +
 variants/nina_w10/pins_arduino.h                              | 1 +
 variants/node32s/pins_arduino.h                               | 1 +
 variants/nodemcu-32s/pins_arduino.h                           | 1 +
 variants/odroid_esp32/pins_arduino.h                          | 1 +
 variants/onehorse32dev/pins_arduino.h                         | 1 +
 variants/openkb/pins_arduino.h                                | 1 +
 variants/oroca_edubot/pins_arduino.h                          | 1 +
 variants/pico32/pins_arduino.h                                | 1 +
 variants/piranha_esp-32/pins_arduino.h                        | 1 +
 variants/pocket_32/pins_arduino.h                             | 1 +
 variants/quantum/pins_arduino.h                               | 1 +
 variants/redpill_esp32s3/pins_arduino.h                       | 1 +
 variants/roboheart_hercules/pins_arduino.h                    | 1 +
 variants/sonoff_dualr3/pins_arduino.h                         | 1 +
 variants/sparkfun_lora_gateway_1-channel/pins_arduino.h       | 1 +
 variants/tbeam/pins_arduino.h                                 | 1 +
 variants/ttgo-lora32-v1/pins_arduino.h                        | 1 +
 variants/ttgo-lora32-v2/pins_arduino.h                        | 1 +
 variants/ttgo-lora32-v21new/pins_arduino.h                    | 1 +
 variants/ttgo-t-oi-plus/pins_arduino.h                        | 3 ++-
 variants/ttgo-t1/pins_arduino.h                               | 1 +
 variants/ttgo-t7-v13-mini32/pins_arduino.h                    | 1 +
 variants/ttgo-t7-v14-mini32/pins_arduino.h                    | 1 +
 variants/turta_iot_node/pins_arduino.h                        | 1 +
 variants/twatch/pins_arduino.h                                | 1 +
 variants/uPesy_esp32_wroom_devkit/pins_arduino.h              | 1 +
 variants/uPesy_esp32_wrover_devkit/pins_arduino.h             | 1 +
 variants/um_feathers2/pins_arduino.h                          | 1 +
 variants/um_feathers2neo/pins_arduino.h                       | 1 +
 variants/um_feathers3/pins_arduino.h                          | 1 +
 variants/um_nanos3/pins_arduino.h                             | 1 +
 variants/um_pros3/pins_arduino.h                              | 1 +
 variants/um_rmp/pins_arduino.h                                | 1 +
 variants/um_tinypico/pins_arduino.h                           | 1 +
 variants/um_tinys2/pins_arduino.h                             | 1 +
 variants/um_tinys3/pins_arduino.h                             | 1 +
 variants/unphone8/pins_arduino.h                              | 1 +
 variants/unphone9/pins_arduino.h                              | 1 +
 variants/vintlabsdevkitv1/pins_arduino.h                      | 1 +
 variants/watchy/pins_arduino.h                                | 1 +
 variants/wesp32/pins_arduino.h                                | 1 +
 variants/widora-air/pins_arduino.h                            | 1 +
 variants/wifiduino32/pins_arduino.h                           | 1 +
 variants/wifiduinov2/pins_arduino.h                           | 2 +-
 variants/wipy3/pins_arduino.h                                 | 1 +
 variants/xinabox/pins_arduino.h                               | 1 +
 174 files changed, 186 insertions(+), 28 deletions(-)

diff --git a/variants/AirM2M_CORE_ESP32C3/pins_arduino.h b/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
index b04f7a820d8..c6c3210beb9 100644
--- a/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
+++ b/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
@@ -2,13 +2,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
 #define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t LED_BUILTIN     = 12;
diff --git a/variants/Bee_Data_Logger/pins_arduino.h b/variants/Bee_Data_Logger/pins_arduino.h
index d3f08ee640c..7073a1fb5eb 100644
--- a/variants/Bee_Data_Logger/pins_arduino.h
+++ b/variants/Bee_Data_Logger/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x815C
diff --git a/variants/Bee_Motion/pins_arduino.h b/variants/Bee_Motion/pins_arduino.h
index fea2177810b..1afe19445b7 100644
--- a/variants/Bee_Motion/pins_arduino.h
+++ b/variants/Bee_Motion/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x810D
diff --git a/variants/Bee_Motion_Mini/pins_arduino.h b/variants/Bee_Motion_Mini/pins_arduino.h
index 96aad9cf03a..77c67866a16 100644
--- a/variants/Bee_Motion_Mini/pins_arduino.h
+++ b/variants/Bee_Motion_Mini/pins_arduino.h
@@ -2,14 +2,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
 #define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;
diff --git a/variants/Bee_Motion_S3/pins_arduino.h b/variants/Bee_Motion_S3/pins_arduino.h
index 07a329fdb35..70c91ee0600 100644
--- a/variants/Bee_Motion_S3/pins_arduino.h
+++ b/variants/Bee_Motion_S3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x8113
diff --git a/variants/Bee_S3/pins_arduino.h b/variants/Bee_S3/pins_arduino.h
index 97b03928be0..56431ef0fba 100644
--- a/variants/Bee_S3/pins_arduino.h
+++ b/variants/Bee_S3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x8110
diff --git a/variants/ET-Board/pins_arduino.h b/variants/ET-Board/pins_arduino.h
index b92b47f591e..a19b64b2fcf 100644
--- a/variants/ET-Board/pins_arduino.h
+++ b/variants/ET-Board/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/Edgebox-ESP-100/pins_arduino.h b/variants/Edgebox-ESP-100/pins_arduino.h
index 39f84334891..f3a7c7e59f5 100644
--- a/variants/Edgebox-ESP-100/pins_arduino.h
+++ b/variants/Edgebox-ESP-100/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/Microduino-esp32/pins_arduino.h b/variants/Microduino-esp32/pins_arduino.h
index d042bf7e6f3..636602bac72 100644
--- a/variants/Microduino-esp32/pins_arduino.h
+++ b/variants/Microduino-esp32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/Nebula_S3/pins_arduino.h b/variants/Nebula_S3/pins_arduino.h
index 8bd20e1402b..52324eb9650 100644
--- a/variants/Nebula_S3/pins_arduino.h
+++ b/variants/Nebula_S3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
diff --git a/variants/S_ODI_Ultra_v1/pins_arduino.h b/variants/S_ODI_Ultra_v1/pins_arduino.h
index 894d7f56690..dcac1668a23 100644
--- a/variants/S_ODI_Ultra_v1/pins_arduino.h
+++ b/variants/S_ODI_Ultra_v1/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h b/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
index d43bd354431..e4b4ec5c8ae 100644
--- a/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
+++ b/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
@@ -2,13 +2,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
 #define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;
diff --git a/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h b/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
index d43bd354431..e4b4ec5c8ae 100644
--- a/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
+++ b/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
@@ -2,13 +2,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
 #define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;
diff --git a/variants/XIAO_ESP32C3/pins_arduino.h b/variants/XIAO_ESP32C3/pins_arduino.h
index b01964ee4a0..60eb38c6dac 100644
--- a/variants/XIAO_ESP32C3/pins_arduino.h
+++ b/variants/XIAO_ESP32C3/pins_arduino.h
@@ -2,13 +2,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
 #define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;
diff --git a/variants/adafruit_feather_esp32_v2/pins_arduino.h b/variants/adafruit_feather_esp32_v2/pins_arduino.h
index 6d57dbcefa8..42c6ece027e 100644
--- a/variants/adafruit_feather_esp32_v2/pins_arduino.h
+++ b/variants/adafruit_feather_esp32_v2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/adafruit_feather_esp32s2/pins_arduino.h b/variants/adafruit_feather_esp32s2/pins_arduino.h
index c1032e7452f..e601b50666d 100644
--- a/variants/adafruit_feather_esp32s2/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2/pins_arduino.h
@@ -2,7 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x80EB
diff --git a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
index 5107a17e14d..9eac71472b9 100644
--- a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
@@ -2,7 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x80ED
diff --git a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
index 708bacc4db8..c04818ae40e 100644
--- a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
@@ -2,7 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x810F
diff --git a/variants/adafruit_feather_esp32s3/pins_arduino.h b/variants/adafruit_feather_esp32s3/pins_arduino.h
index 8558a6181cd..4df79351cf8 100644
--- a/variants/adafruit_feather_esp32s3/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x811B
diff --git a/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h
index 1525c609004..c4a0c5fad7a 100644
--- a/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x8113
diff --git a/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h
index 832ccf20e70..e62009f42bc 100644
--- a/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h
@@ -2,7 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x8123
diff --git a/variants/adafruit_feather_esp32s3_tft/pins_arduino.h b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h
index 371dae74074..b2886f51d38 100644
--- a/variants/adafruit_feather_esp32s3_tft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h
@@ -2,7 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x811D
diff --git a/variants/adafruit_funhouse_esp32s2/pins_arduino.h b/variants/adafruit_funhouse_esp32s2/pins_arduino.h
index 92c3dae1883..c86cc929843 100644
--- a/variants/adafruit_funhouse_esp32s2/pins_arduino.h
+++ b/variants/adafruit_funhouse_esp32s2/pins_arduino.h
@@ -2,7 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x80F9
diff --git a/variants/adafruit_itsybitsy_esp32/pins_arduino.h b/variants/adafruit_itsybitsy_esp32/pins_arduino.h
index 8b5f3f4e6d3..db8b0acefc4 100644
--- a/variants/adafruit_itsybitsy_esp32/pins_arduino.h
+++ b/variants/adafruit_itsybitsy_esp32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/adafruit_magtag29_esp32s2/pins_arduino.h b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
index f88834a4583..8ea250401d0 100644
--- a/variants/adafruit_magtag29_esp32s2/pins_arduino.h
+++ b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
@@ -2,7 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x80E5
diff --git a/variants/adafruit_matrixportal_esp32s3/pins_arduino.h b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h
index 379c8fc9aa5..49ba6fea7c6 100644
--- a/variants/adafruit_matrixportal_esp32s3/pins_arduino.h
+++ b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x8125
diff --git a/variants/adafruit_metro_esp32s2/pins_arduino.h b/variants/adafruit_metro_esp32s2/pins_arduino.h
index 711e8515010..3ac6fd6f688 100644
--- a/variants/adafruit_metro_esp32s2/pins_arduino.h
+++ b/variants/adafruit_metro_esp32s2/pins_arduino.h
@@ -2,7 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x80DF
diff --git a/variants/adafruit_metro_esp32s3/pins_arduino.h b/variants/adafruit_metro_esp32s3/pins_arduino.h
index d00e279f6be..3d51af60fc6 100644
--- a/variants/adafruit_metro_esp32s3/pins_arduino.h
+++ b/variants/adafruit_metro_esp32s3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x8145
diff --git a/variants/adafruit_qtpy_esp32/pins_arduino.h b/variants/adafruit_qtpy_esp32/pins_arduino.h
index 29d8f8678f2..ce480e0830a 100644
--- a/variants/adafruit_qtpy_esp32/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/adafruit_qtpy_esp32c3/pins_arduino.h b/variants/adafruit_qtpy_esp32c3/pins_arduino.h
index a5aee582674..2778ad6d3d5 100644
--- a/variants/adafruit_qtpy_esp32c3/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32c3/pins_arduino.h
@@ -2,13 +2,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
 #define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 #define BUTTON 9
diff --git a/variants/adafruit_qtpy_esp32s2/pins_arduino.h b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
index e46d2ceb5fc..c6aeafe30df 100644
--- a/variants/adafruit_qtpy_esp32s2/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
@@ -2,7 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x239A
 #define USB_PID            0x8111
diff --git a/variants/alksesp32/pins_arduino.h b/variants/alksesp32/pins_arduino.h
index d45ebe56ee1..340d51b0d15 100644
--- a/variants/alksesp32/pins_arduino.h
+++ b/variants/alksesp32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/atmegazero_esp32s2/pins_arduino.h b/variants/atmegazero_esp32s2/pins_arduino.h
index 7df494f9b0a..e2a56f91d90 100644
--- a/variants/atmegazero_esp32s2/pins_arduino.h
+++ b/variants/atmegazero_esp32s2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x239A
 #define USB_PID 0x800A
diff --git a/variants/bpi-bit/pins_arduino.h b/variants/bpi-bit/pins_arduino.h
index 90c429597ee..95aeb603323 100644
--- a/variants/bpi-bit/pins_arduino.h
+++ b/variants/bpi-bit/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/ch_denky/pins_arduino.h b/variants/ch_denky/pins_arduino.h
index d51fa926d51..7231868654b 100644
--- a/variants/ch_denky/pins_arduino.h
+++ b/variants/ch_denky/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/cnrs_aw2eth/pins_arduino.h b/variants/cnrs_aw2eth/pins_arduino.h
index dcce7efca6e..8266c5222b2 100644
--- a/variants/cnrs_aw2eth/pins_arduino.h
+++ b/variants/cnrs_aw2eth/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/connaxio_espoir/pins_arduino.h b/variants/connaxio_espoir/pins_arduino.h
index 216347db7fd..ec0698f0bd3 100644
--- a/variants/connaxio_espoir/pins_arduino.h
+++ b/variants/connaxio_espoir/pins_arduino.h
@@ -7,6 +7,7 @@
  */
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/crabik_slot_esp32_s3/pins_arduino.h b/variants/crabik_slot_esp32_s3/pins_arduino.h
index 6e057503f69..2f50983d09a 100644
--- a/variants/crabik_slot_esp32_s3/pins_arduino.h
+++ b/variants/crabik_slot_esp32_s3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x814D // for user apps (https://github.com/espressif/usb-pids/pull/77)
diff --git a/variants/d-duino-32/pins_arduino.h b/variants/d-duino-32/pins_arduino.h
index 8b3663d7156..f9e1f4becf7 100644
--- a/variants/d-duino-32/pins_arduino.h
+++ b/variants/d-duino-32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/d1_uno32/pins_arduino.h b/variants/d1_uno32/pins_arduino.h
index 72181c675af..430a536df69 100644
--- a/variants/d1_uno32/pins_arduino.h
+++ b/variants/d1_uno32/pins_arduino.h
@@ -4,7 +4,7 @@
 // Board Pinmap: https://www.botnroll.com/en/esp/3639-wemos-d1-r32-w-esp32-uno-r3-pinout.html
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/d32/d32_core.h b/variants/d32/d32_core.h
index a1a986426ea..40a46aef925 100644
--- a/variants/d32/d32_core.h
+++ b/variants/d32/d32_core.h
@@ -1,6 +1,8 @@
 #ifndef _D32_CORE_H_
 #define _D32_CORE_H_
 
+#include "soc/soc_caps.h"
+
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
diff --git a/variants/deneyapkart/pins_arduino.h b/variants/deneyapkart/pins_arduino.h
index 8385cd15fe1..b7eedaa14bf 100644
--- a/variants/deneyapkart/pins_arduino.h
+++ b/variants/deneyapkart/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/deneyapkartg/pins_arduino.h b/variants/deneyapkartg/pins_arduino.h
index 7d4259fcf23..4fb6f5b95ba 100644
--- a/variants/deneyapkartg/pins_arduino.h
+++ b/variants/deneyapkartg/pins_arduino.h
@@ -15,7 +15,7 @@
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+10;
diff --git a/variants/deneyapmini/pins_arduino.h b/variants/deneyapmini/pins_arduino.h
index 0e4e106f819..131ae98612d 100644
--- a/variants/deneyapmini/pins_arduino.h
+++ b/variants/deneyapmini/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x303A
 #define USB_PID            0x8141
diff --git a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
index f792a36f9cb..d89a6090eb3 100644
--- a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
+++ b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
@@ -2,7 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x303a
 #define USB_PID            0x80FF
diff --git a/variants/dfrobot_beetle_esp32c3/pins_arduino.h b/variants/dfrobot_beetle_esp32c3/pins_arduino.h
index c164c0753be..24323829961 100644
--- a/variants/dfrobot_beetle_esp32c3/pins_arduino.h
+++ b/variants/dfrobot_beetle_esp32c3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x3343
 #define USB_PID            0x8364
@@ -15,7 +16,7 @@
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t LED_BUILTIN = 10;
diff --git a/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h b/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
index 3bac1e0b070..45ec5d6f054 100644
--- a/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
+++ b/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h b/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h
index 33306f5e56d..73386ee3c06 100644
--- a/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h
+++ b/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x3343
 #define USB_PID 0x83CF
diff --git a/variants/dfrobot_romeo_esp32s3/pins_arduino.h b/variants/dfrobot_romeo_esp32s3/pins_arduino.h
index a07d7cc8029..9fe3c9e6a0c 100644
--- a/variants/dfrobot_romeo_esp32s3/pins_arduino.h
+++ b/variants/dfrobot_romeo_esp32s3/pins_arduino.h
@@ -2,8 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
-
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
 #define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
diff --git a/variants/doitESP32devkitV1/pins_arduino.h b/variants/doitESP32devkitV1/pins_arduino.h
index f38b0ba8fe1..3f351181ed6 100644
--- a/variants/doitESP32devkitV1/pins_arduino.h
+++ b/variants/doitESP32devkitV1/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/doitESPduino32/pins_arduino.h b/variants/doitESPduino32/pins_arduino.h
index 06a16b1e24a..7d7227af2d6 100644
--- a/variants/doitESPduino32/pins_arduino.h
+++ b/variants/doitESPduino32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/dpu_esp32/pins_arduino.h b/variants/dpu_esp32/pins_arduino.h
index 09cc2d2d791..05e9e29245b 100644
--- a/variants/dpu_esp32/pins_arduino.h
+++ b/variants/dpu_esp32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32-devkit-lipo/pins_arduino.h b/variants/esp32-devkit-lipo/pins_arduino.h
index 509bfc6025d..1a7acb88108 100644
--- a/variants/esp32-devkit-lipo/pins_arduino.h
+++ b/variants/esp32-devkit-lipo/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32-evb/pins_arduino.h b/variants/esp32-evb/pins_arduino.h
index aaec69a80a5..d4db7118ab0 100644
--- a/variants/esp32-evb/pins_arduino.h
+++ b/variants/esp32-evb/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32-gateway/pins_arduino.h b/variants/esp32-gateway/pins_arduino.h
index fe2bb39467a..403b3bf204a 100644
--- a/variants/esp32-gateway/pins_arduino.h
+++ b/variants/esp32-gateway/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32-poe-iso/pins_arduino.h b/variants/esp32-poe-iso/pins_arduino.h
index 9faf0cf6690..ccbd2bb5f14 100644
--- a/variants/esp32-poe-iso/pins_arduino.h
+++ b/variants/esp32-poe-iso/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32-poe/pins_arduino.h b/variants/esp32-poe/pins_arduino.h
index 9faf0cf6690..ccbd2bb5f14 100644
--- a/variants/esp32-poe/pins_arduino.h
+++ b/variants/esp32-poe/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h b/variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h
index dd2897b100f..bc0021a3006 100644
--- a/variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h
+++ b/variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED LED_BUILTIN // backward compatibility
diff --git a/variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h b/variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h
index 84f0f077085..8564b353e87 100644
--- a/variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h
+++ b/variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED LED_BUILTIN // backward compatibility
diff --git a/variants/esp32-trueverit-iot-driver/pins_arduino.h b/variants/esp32-trueverit-iot-driver/pins_arduino.h
index 7ab27275ece..4a789f7df94 100644
--- a/variants/esp32-trueverit-iot-driver/pins_arduino.h
+++ b/variants/esp32-trueverit-iot-driver/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED LED_BUILTIN // backward compatibility
diff --git a/variants/esp32/pins_arduino.h b/variants/esp32/pins_arduino.h
index 66cc85d64f6..00f13af903b 100644
--- a/variants/esp32/pins_arduino.h
+++ b/variants/esp32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp320/pins_arduino.h b/variants/esp320/pins_arduino.h
index 6864d0e4938..e52761de164 100644
--- a/variants/esp320/pins_arduino.h
+++ b/variants/esp320/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h
index ebf0332f4f5..696d69800ce 100644
--- a/variants/esp32c3/pins_arduino.h
+++ b/variants/esp32c3/pins_arduino.h
@@ -9,7 +9,7 @@
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 #define PIN_NEOPIXEL        8
diff --git a/variants/esp32da/pins_arduino.h b/variants/esp32da/pins_arduino.h
index 60dec021d97..8d3c4dbc7b3 100644
--- a/variants/esp32da/pins_arduino.h
+++ b/variants/esp32da/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32micromod/pins_arduino.h b/variants/esp32micromod/pins_arduino.h
index 37c88056622..d4f534553e2 100755
--- a/variants/esp32micromod/pins_arduino.h
+++ b/variants/esp32micromod/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32s2thing_plus/pins_arduino.h b/variants/esp32s2thing_plus/pins_arduino.h
index 1c388c9c68b..9a5b8df7917 100644
--- a/variants/esp32s2thing_plus/pins_arduino.h
+++ b/variants/esp32s2thing_plus/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x1B4F
 #define USB_PID 0x0027
diff --git a/variants/esp32s2usb/pins_arduino.h b/variants/esp32s2usb/pins_arduino.h
index 43093bd1eb6..802e9c196f1 100644
--- a/variants/esp32s2usb/pins_arduino.h
+++ b/variants/esp32s2usb/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 // Default USB Settings
 #define USB_VID 			0x303A
diff --git a/variants/esp32s3box/pins_arduino.h b/variants/esp32s3box/pins_arduino.h
index e78c793a915..41fb39449f3 100644
--- a/variants/esp32s3box/pins_arduino.h
+++ b/variants/esp32s3box/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
diff --git a/variants/esp32s3camlcd/pins_arduino.h b/variants/esp32s3camlcd/pins_arduino.h
index 0cd35ea4ffc..f3c1b423cae 100644
--- a/variants/esp32s3camlcd/pins_arduino.h
+++ b/variants/esp32s3camlcd/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
diff --git a/variants/esp32s3usbotg/pins_arduino.h b/variants/esp32s3usbotg/pins_arduino.h
index 5b4ae539649..f1364190c22 100644
--- a/variants/esp32s3usbotg/pins_arduino.h
+++ b/variants/esp32s3usbotg/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
diff --git a/variants/esp32thing/pins_arduino.h b/variants/esp32thing/pins_arduino.h
index 975af51baae..bb038561285 100644
--- a/variants/esp32thing/pins_arduino.h
+++ b/variants/esp32thing/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32thing_plus/pins_arduino.h b/variants/esp32thing_plus/pins_arduino.h
index 713ef8fff7b..a0bd2b07cb8 100644
--- a/variants/esp32thing_plus/pins_arduino.h
+++ b/variants/esp32thing_plus/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp32vn-iot-uno/pins_arduino.h b/variants/esp32vn-iot-uno/pins_arduino.h
index 1b1c02816ae..4e2d2e2050f 100644
--- a/variants/esp32vn-iot-uno/pins_arduino.h
+++ b/variants/esp32vn-iot-uno/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/esp_c3_m1_i_kit/pins_arduino.h b/variants/esp_c3_m1_i_kit/pins_arduino.h
index d1dae135c90..7d5cfcf8ec3 100644
--- a/variants/esp_c3_m1_i_kit/pins_arduino.h
+++ b/variants/esp_c3_m1_i_kit/pins_arduino.h
@@ -7,13 +7,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
 #define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 // User LEDs are also connected to USB D- and D+
diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h
index 481f252f937..1b5e8aac0eb 100644
--- a/variants/espea32/pins_arduino.h
+++ b/variants/espea32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/espectro32/pins_arduino.h b/variants/espectro32/pins_arduino.h
index eecd4c9ee4c..03540f8db1d 100644
--- a/variants/espectro32/pins_arduino.h
+++ b/variants/espectro32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #ifndef ESPECTRO32_VERSION
 #define ESPECTRO32_VERSION 1
diff --git a/variants/espino32/pins_arduino.h b/variants/espino32/pins_arduino.h
index 3bb865b7fac..53fd5c7255d 100644
--- a/variants/espino32/pins_arduino.h
+++ b/variants/espino32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/feather_esp32/pins_arduino.h b/variants/feather_esp32/pins_arduino.h
index ee5ae7e91ee..80e88bc9800 100644
--- a/variants/feather_esp32/pins_arduino.h
+++ b/variants/feather_esp32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/firebeetle32/pins_arduino.h b/variants/firebeetle32/pins_arduino.h
index 05cb633f21f..f613bd1567e 100644
--- a/variants/firebeetle32/pins_arduino.h
+++ b/variants/firebeetle32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/fm-devkit/pins_arduino.h b/variants/fm-devkit/pins_arduino.h
index 9ad82d1136b..d9c17cbf317 100644
--- a/variants/fm-devkit/pins_arduino.h
+++ b/variants/fm-devkit/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/franzininho_wifi_esp32s2/pins_arduino.h b/variants/franzininho_wifi_esp32s2/pins_arduino.h
index 192a2ff9412..65ec411da6c 100644
--- a/variants/franzininho_wifi_esp32s2/pins_arduino.h
+++ b/variants/franzininho_wifi_esp32s2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID             0x303A
 #define USB_PID             0x80A9
diff --git a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
index 02431cce559..d36ad2680a0 100644
--- a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
+++ b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID             0x303A
 #define USB_PID             0x80A9
diff --git a/variants/frog32/pins_arduino.h b/variants/frog32/pins_arduino.h
index 1a1fbfd66e0..4082f2cf31d 100644
--- a/variants/frog32/pins_arduino.h
+++ b/variants/frog32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/gpy/pins_arduino.h b/variants/gpy/pins_arduino.h
index fded325effc..54ce8cf6147 100644
--- a/variants/gpy/pins_arduino.h
+++ b/variants/gpy/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/healthypi4/pins_arduino.h b/variants/healthypi4/pins_arduino.h
index 946f51ef570..9cbb6335ecb 100644
--- a/variants/healthypi4/pins_arduino.h
+++ b/variants/healthypi4/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/heltec_wifi_kit_32/pins_arduino.h b/variants/heltec_wifi_kit_32/pins_arduino.h
index 7348992f2b1..18f86fa48a0 100644
--- a/variants/heltec_wifi_kit_32/pins_arduino.h
+++ b/variants/heltec_wifi_kit_32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define WIFI_Kit_32	true
 #define DISPLAY_HEIGHT 64
diff --git a/variants/heltec_wifi_kit_32_v3/pins_arduino.h b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
index c21fad9201c..7f9b1202e4a 100644
--- a/variants/heltec_wifi_kit_32_v3/pins_arduino.h
+++ b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
@@ -2,8 +2,9 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
+#include "soc/soc_caps.h"
 #define WIFI_Kit_32_V3	true
+
 #define DISPLAY_HEIGHT 64
 #define DISPLAY_WIDTH  128
 
diff --git a/variants/heltec_wifi_lora_32/pins_arduino.h b/variants/heltec_wifi_lora_32/pins_arduino.h
index 8012aeb3a6e..a1f7be0f1b4 100644
--- a/variants/heltec_wifi_lora_32/pins_arduino.h
+++ b/variants/heltec_wifi_lora_32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define WIFI_LoRa_32 true
 #define DISPLAY_HEIGHT 64
diff --git a/variants/heltec_wifi_lora_32_V2/pins_arduino.h b/variants/heltec_wifi_lora_32_V2/pins_arduino.h
index ffb933e16ec..6e6530a9e7d 100644
--- a/variants/heltec_wifi_lora_32_V2/pins_arduino.h
+++ b/variants/heltec_wifi_lora_32_V2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define WIFI_LoRa_32_V2 true
 #define DISPLAY_HEIGHT 64
diff --git a/variants/heltec_wireless_stick/pins_arduino.h b/variants/heltec_wireless_stick/pins_arduino.h
index ce277f0fbc6..074107d1c82 100644
--- a/variants/heltec_wireless_stick/pins_arduino.h
+++ b/variants/heltec_wireless_stick/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define Wireless_Stick true
 #define DISPLAY_HEIGHT 32
diff --git a/variants/heltec_wireless_stick_lite/pins_arduino.h b/variants/heltec_wireless_stick_lite/pins_arduino.h
index c397a0a1899..f42b5e938be 100644
--- a/variants/heltec_wireless_stick_lite/pins_arduino.h
+++ b/variants/heltec_wireless_stick_lite/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define Wireless_Stick_Lite true
 #define DISPLAY_HEIGHT 0
diff --git a/variants/heltec_wireless_stick_lite_v3/pins_arduino.h b/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
index 678770b2a15..f394ab8aabf 100644
--- a/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
+++ b/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define Wireless_Stick_Lite_V3 true
 #define DISPLAY_HEIGHT 0
diff --git a/variants/honeylemon/pins_arduino.h b/variants/honeylemon/pins_arduino.h
index f39f28382f1..ecb518ea5d3 100644
--- a/variants/honeylemon/pins_arduino.h
+++ b/variants/honeylemon/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/hornbill32dev/pins_arduino.h b/variants/hornbill32dev/pins_arduino.h
index dfe02322efb..a513626acf0 100644
--- a/variants/hornbill32dev/pins_arduino.h
+++ b/variants/hornbill32dev/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/hornbill32minima/pins_arduino.h b/variants/hornbill32minima/pins_arduino.h
index 42483f932e8..06bf6817c2d 100644
--- a/variants/hornbill32minima/pins_arduino.h
+++ b/variants/hornbill32minima/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/imbrios-logsens-v1p1/pins_arduino.h b/variants/imbrios-logsens-v1p1/pins_arduino.h
index 03600d506c8..2c1fc024b8b 100644
--- a/variants/imbrios-logsens-v1p1/pins_arduino.h
+++ b/variants/imbrios-logsens-v1p1/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/intorobot-fig/pins_arduino.h b/variants/intorobot-fig/pins_arduino.h
index 8886ef30d0d..a5d3a8c1571 100644
--- a/variants/intorobot-fig/pins_arduino.h
+++ b/variants/intorobot-fig/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/lilygo_t_display/pins_arduino.h b/variants/lilygo_t_display/pins_arduino.h
index a168546a9ad..446062ee1a8 100644
--- a/variants/lilygo_t_display/pins_arduino.h
+++ b/variants/lilygo_t_display/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x1A86
 #define USB_PID 0x55D4
diff --git a/variants/lionbit/pins_arduino.h b/variants/lionbit/pins_arduino.h
index a84a9eb996b..c18458b003d 100644
--- a/variants/lionbit/pins_arduino.h
+++ b/variants/lionbit/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/lionbits3/pins_arduino.h b/variants/lionbits3/pins_arduino.h
index dfb08f93e34..354fb75201e 100644
--- a/variants/lionbits3/pins_arduino.h
+++ b/variants/lionbits3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
 #define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
diff --git a/variants/lolin32-lite/pins_arduino.h b/variants/lolin32-lite/pins_arduino.h
index 264bec2ebb6..65e28df953b 100755
--- a/variants/lolin32-lite/pins_arduino.h
+++ b/variants/lolin32-lite/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h
index a71fb7c1b56..b1173b9c1bb 100644
--- a/variants/lolin32/pins_arduino.h
+++ b/variants/lolin32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/lolin_c3_mini/pins_arduino.h b/variants/lolin_c3_mini/pins_arduino.h
index 14c3a8d8747..db89b810ed4 100644
--- a/variants/lolin_c3_mini/pins_arduino.h
+++ b/variants/lolin_c3_mini/pins_arduino.h
@@ -2,13 +2,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
 #define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t LED_BUILTIN = 7;
diff --git a/variants/lolin_s2_mini/pins_arduino.h b/variants/lolin_s2_mini/pins_arduino.h
index 9e7d4a00f7d..46881b85745 100644
--- a/variants/lolin_s2_mini/pins_arduino.h
+++ b/variants/lolin_s2_mini/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 // Default USB Settings
 #define USB_VID 			0x303a
diff --git a/variants/lolin_s2_pico/pins_arduino.h b/variants/lolin_s2_pico/pins_arduino.h
index 120caf95f48..1f60a7f2161 100644
--- a/variants/lolin_s2_pico/pins_arduino.h
+++ b/variants/lolin_s2_pico/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 // Default USB Settings
 #define USB_VID 			0x303a
diff --git a/variants/lolin_s3/pins_arduino.h b/variants/lolin_s3/pins_arduino.h
index 571d27822a8..a7fc2618a13 100644
--- a/variants/lolin_s3/pins_arduino.h
+++ b/variants/lolin_s3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
diff --git a/variants/lolin_s3_mini/pins_arduino.h b/variants/lolin_s3_mini/pins_arduino.h
index 8a355fafbeb..c6ad0130b65 100644
--- a/variants/lolin_s3_mini/pins_arduino.h
+++ b/variants/lolin_s3_mini/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x8167
diff --git a/variants/lolin_s3_pro/pins_arduino.h b/variants/lolin_s3_pro/pins_arduino.h
index 7d3f23e1a42..b37a826acde 100644
--- a/variants/lolin_s3_pro/pins_arduino.h
+++ b/variants/lolin_s3_pro/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x8161
diff --git a/variants/lopy/pins_arduino.h b/variants/lopy/pins_arduino.h
index 62a6d8e39d3..b001c10afc3 100644
--- a/variants/lopy/pins_arduino.h
+++ b/variants/lopy/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/lopy4/pins_arduino.h b/variants/lopy4/pins_arduino.h
index b494b6838d1..3d4a8ff5aed 100644
--- a/variants/lopy4/pins_arduino.h
+++ b/variants/lopy4/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/m5stack_atom/pins_arduino.h b/variants/m5stack_atom/pins_arduino.h
index 44246c53b14..b60618f01be 100644
--- a/variants/m5stack_atom/pins_arduino.h
+++ b/variants/m5stack_atom/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/m5stack_core2/pins_arduino.h b/variants/m5stack_core2/pins_arduino.h
index f80536f9ec0..68f87c593e4 100644
--- a/variants/m5stack_core2/pins_arduino.h
+++ b/variants/m5stack_core2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/m5stack_core_esp32/pins_arduino.h b/variants/m5stack_core_esp32/pins_arduino.h
index 38a89cd97e4..b148d4912ac 100644
--- a/variants/m5stack_core_esp32/pins_arduino.h
+++ b/variants/m5stack_core_esp32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/m5stack_coreink/pins_arduino.h b/variants/m5stack_coreink/pins_arduino.h
index 5838813e9b0..3c0bb33ec04 100644
--- a/variants/m5stack_coreink/pins_arduino.h
+++ b/variants/m5stack_coreink/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/m5stack_fire/pins_arduino.h b/variants/m5stack_fire/pins_arduino.h
index 38a89cd97e4..b148d4912ac 100644
--- a/variants/m5stack_fire/pins_arduino.h
+++ b/variants/m5stack_fire/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/m5stack_stamp_pico/pins_arduino.h b/variants/m5stack_stamp_pico/pins_arduino.h
index 4de0ac09c41..f1218341ca9 100644
--- a/variants/m5stack_stamp_pico/pins_arduino.h
+++ b/variants/m5stack_stamp_pico/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/m5stack_station/pins_arduino.h b/variants/m5stack_station/pins_arduino.h
index 21647ca954f..118ef02076b 100644
--- a/variants/m5stack_station/pins_arduino.h
+++ b/variants/m5stack_station/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/m5stack_timer_cam/pins_arduino.h b/variants/m5stack_timer_cam/pins_arduino.h
index 393ecc45205..d30e816ea8c 100644
--- a/variants/m5stack_timer_cam/pins_arduino.h
+++ b/variants/m5stack_timer_cam/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/m5stick_c/pins_arduino.h b/variants/m5stick_c/pins_arduino.h
index 5b894c82e02..d30648221ff 100644
--- a/variants/m5stick_c/pins_arduino.h
+++ b/variants/m5stick_c/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/magicbit/pins_arduino.h b/variants/magicbit/pins_arduino.h
index 2db4e0cadf0..76eaf32eb9d 100644
--- a/variants/magicbit/pins_arduino.h
+++ b/variants/magicbit/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/metro_esp-32/pins_arduino.h b/variants/metro_esp-32/pins_arduino.h
index b6431d8a160..4f9e92ef8bc 100644
--- a/variants/metro_esp-32/pins_arduino.h
+++ b/variants/metro_esp-32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/mgbot-iotik32a/pins_arduino.h b/variants/mgbot-iotik32a/pins_arduino.h
index 7f2cce79bc6..2936ca07236 100644
--- a/variants/mgbot-iotik32a/pins_arduino.h
+++ b/variants/mgbot-iotik32a/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/mgbot-iotik32b/pins_arduino.h b/variants/mgbot-iotik32b/pins_arduino.h
index d974d0d8522..2736c034cb0 100644
--- a/variants/mgbot-iotik32b/pins_arduino.h
+++ b/variants/mgbot-iotik32b/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/mhetesp32devkit/pins_arduino.h b/variants/mhetesp32devkit/pins_arduino.h
index 5c65c2e08c3..ed7555d9ab7 100644
--- a/variants/mhetesp32devkit/pins_arduino.h
+++ b/variants/mhetesp32devkit/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/mhetesp32minikit/pins_arduino.h b/variants/mhetesp32minikit/pins_arduino.h
index 5c65c2e08c3..ed7555d9ab7 100644
--- a/variants/mhetesp32minikit/pins_arduino.h
+++ b/variants/mhetesp32minikit/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/micro_s2/pins_arduino.h b/variants/micro_s2/pins_arduino.h
index 59dc8df48e6..92fc0a259f4 100644
--- a/variants/micro_s2/pins_arduino.h
+++ b/variants/micro_s2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x239A
 #define USB_PID 0x80C5
diff --git a/variants/mpython/pins_arduino.h b/variants/mpython/pins_arduino.h
index 99b3ebeff01..6ff4b8e8dcc 100644
--- a/variants/mpython/pins_arduino.h
+++ b/variants/mpython/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/nano32/pins_arduino.h b/variants/nano32/pins_arduino.h
index 3bb865b7fac..53fd5c7255d 100644
--- a/variants/nano32/pins_arduino.h
+++ b/variants/nano32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/nina_w10/pins_arduino.h b/variants/nina_w10/pins_arduino.h
index b09627ce126..f93dac6f53a 100644
--- a/variants/nina_w10/pins_arduino.h
+++ b/variants/nina_w10/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/node32s/pins_arduino.h b/variants/node32s/pins_arduino.h
index 8668cd4bbf7..ff0a827e4e7 100644
--- a/variants/node32s/pins_arduino.h
+++ b/variants/node32s/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/nodemcu-32s/pins_arduino.h b/variants/nodemcu-32s/pins_arduino.h
index 8668cd4bbf7..ff0a827e4e7 100644
--- a/variants/nodemcu-32s/pins_arduino.h
+++ b/variants/nodemcu-32s/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/odroid_esp32/pins_arduino.h b/variants/odroid_esp32/pins_arduino.h
index d1531127847..8f30e46b6d4 100644
--- a/variants/odroid_esp32/pins_arduino.h
+++ b/variants/odroid_esp32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/onehorse32dev/pins_arduino.h b/variants/onehorse32dev/pins_arduino.h
index 6fe86808b35..8d18b09ff05 100644
--- a/variants/onehorse32dev/pins_arduino.h
+++ b/variants/onehorse32dev/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/openkb/pins_arduino.h b/variants/openkb/pins_arduino.h
index 61c0e09d177..618c48269a9 100644
--- a/variants/openkb/pins_arduino.h
+++ b/variants/openkb/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/oroca_edubot/pins_arduino.h b/variants/oroca_edubot/pins_arduino.h
index 6db7514b84e..3b37f733982 100644
--- a/variants/oroca_edubot/pins_arduino.h
+++ b/variants/oroca_edubot/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/pico32/pins_arduino.h b/variants/pico32/pins_arduino.h
index 1a1fbfd66e0..4082f2cf31d 100644
--- a/variants/pico32/pins_arduino.h
+++ b/variants/pico32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/piranha_esp-32/pins_arduino.h b/variants/piranha_esp-32/pins_arduino.h
index dc91ba36373..ad2881f8cad 100644
--- a/variants/piranha_esp-32/pins_arduino.h
+++ b/variants/piranha_esp-32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/pocket_32/pins_arduino.h b/variants/pocket_32/pins_arduino.h
index f9b1193a645..e4bdf32507c 100644
--- a/variants/pocket_32/pins_arduino.h
+++ b/variants/pocket_32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/quantum/pins_arduino.h b/variants/quantum/pins_arduino.h
index 1a1fbfd66e0..4082f2cf31d 100644
--- a/variants/quantum/pins_arduino.h
+++ b/variants/quantum/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/redpill_esp32s3/pins_arduino.h b/variants/redpill_esp32s3/pins_arduino.h
index 7d731cd9afb..5962382c7ba 100644
--- a/variants/redpill_esp32s3/pins_arduino.h
+++ b/variants/redpill_esp32s3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x1001
diff --git a/variants/roboheart_hercules/pins_arduino.h b/variants/roboheart_hercules/pins_arduino.h
index 16e275f89f7..de0264b0e4e 100644
--- a/variants/roboheart_hercules/pins_arduino.h
+++ b/variants/roboheart_hercules/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/sonoff_dualr3/pins_arduino.h b/variants/sonoff_dualr3/pins_arduino.h
index 500220777b4..93c5b168d5e 100644
--- a/variants/sonoff_dualr3/pins_arduino.h
+++ b/variants/sonoff_dualr3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h b/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h
index c58c2d0932c..2e10025c056 100755
--- a/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h
+++ b/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/tbeam/pins_arduino.h b/variants/tbeam/pins_arduino.h
index 371fd903fec..af0fb7fb4b2 100644
--- a/variants/tbeam/pins_arduino.h
+++ b/variants/tbeam/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/ttgo-lora32-v1/pins_arduino.h b/variants/ttgo-lora32-v1/pins_arduino.h
index 258c367aa05..c65750d71b5 100644
--- a/variants/ttgo-lora32-v1/pins_arduino.h
+++ b/variants/ttgo-lora32-v1/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/ttgo-lora32-v2/pins_arduino.h b/variants/ttgo-lora32-v2/pins_arduino.h
index 5ad1e249ab1..981710506da 100644
--- a/variants/ttgo-lora32-v2/pins_arduino.h
+++ b/variants/ttgo-lora32-v2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/ttgo-lora32-v21new/pins_arduino.h b/variants/ttgo-lora32-v21new/pins_arduino.h
index 2a510d180f8..6c0e65217e1 100644
--- a/variants/ttgo-lora32-v21new/pins_arduino.h
+++ b/variants/ttgo-lora32-v21new/pins_arduino.h
@@ -8,6 +8,7 @@
 ************************/
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/ttgo-t-oi-plus/pins_arduino.h b/variants/ttgo-t-oi-plus/pins_arduino.h
index 55a0fbb2618..e82b68f3364 100644
--- a/variants/ttgo-t-oi-plus/pins_arduino.h
+++ b/variants/ttgo-t-oi-plus/pins_arduino.h
@@ -2,13 +2,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..21 - not all are available
 #define NUM_ANALOG_INPUTS       6                     // GPIO 0..5
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t LED_BUILTIN = 3;
diff --git a/variants/ttgo-t1/pins_arduino.h b/variants/ttgo-t1/pins_arduino.h
index caa61c76499..ce38e77342e 100644
--- a/variants/ttgo-t1/pins_arduino.h
+++ b/variants/ttgo-t1/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/ttgo-t7-v13-mini32/pins_arduino.h b/variants/ttgo-t7-v13-mini32/pins_arduino.h
index 3bd349192d8..dd4d6155d5f 100755
--- a/variants/ttgo-t7-v13-mini32/pins_arduino.h
+++ b/variants/ttgo-t7-v13-mini32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/ttgo-t7-v14-mini32/pins_arduino.h b/variants/ttgo-t7-v14-mini32/pins_arduino.h
index 9d487e43aef..61e647449e6 100755
--- a/variants/ttgo-t7-v14-mini32/pins_arduino.h
+++ b/variants/ttgo-t7-v14-mini32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/turta_iot_node/pins_arduino.h b/variants/turta_iot_node/pins_arduino.h
index c2b81a4783f..beb7710e3ac 100644
--- a/variants/turta_iot_node/pins_arduino.h
+++ b/variants/turta_iot_node/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/twatch/pins_arduino.h b/variants/twatch/pins_arduino.h
index 75fbda9dff6..e0546c5d0d2 100644
--- a/variants/twatch/pins_arduino.h
+++ b/variants/twatch/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/uPesy_esp32_wroom_devkit/pins_arduino.h b/variants/uPesy_esp32_wroom_devkit/pins_arduino.h
index f38b0ba8fe1..3f351181ed6 100644
--- a/variants/uPesy_esp32_wroom_devkit/pins_arduino.h
+++ b/variants/uPesy_esp32_wroom_devkit/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/uPesy_esp32_wrover_devkit/pins_arduino.h b/variants/uPesy_esp32_wrover_devkit/pins_arduino.h
index f38b0ba8fe1..3f351181ed6 100644
--- a/variants/uPesy_esp32_wrover_devkit/pins_arduino.h
+++ b/variants/uPesy_esp32_wrover_devkit/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/um_feathers2/pins_arduino.h b/variants/um_feathers2/pins_arduino.h
index 5b301af41f6..78c5ecce205 100644
--- a/variants/um_feathers2/pins_arduino.h
+++ b/variants/um_feathers2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x239A
 #define USB_PID 0x80AB
diff --git a/variants/um_feathers2neo/pins_arduino.h b/variants/um_feathers2neo/pins_arduino.h
index 65d8a2d8c81..f684d075dff 100644
--- a/variants/um_feathers2neo/pins_arduino.h
+++ b/variants/um_feathers2neo/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x239A
 #define USB_PID 0x80B4
diff --git a/variants/um_feathers3/pins_arduino.h b/variants/um_feathers3/pins_arduino.h
index a364539756c..0e24ba30386 100644
--- a/variants/um_feathers3/pins_arduino.h
+++ b/variants/um_feathers3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x80D6
diff --git a/variants/um_nanos3/pins_arduino.h b/variants/um_nanos3/pins_arduino.h
index 8f94a184be4..ccdbf646414 100644
--- a/variants/um_nanos3/pins_arduino.h
+++ b/variants/um_nanos3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x8179
diff --git a/variants/um_pros3/pins_arduino.h b/variants/um_pros3/pins_arduino.h
index eb6cf3a7c6c..8e7c534abfb 100644
--- a/variants/um_pros3/pins_arduino.h
+++ b/variants/um_pros3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x80D3
diff --git a/variants/um_rmp/pins_arduino.h b/variants/um_rmp/pins_arduino.h
index b68edd9d4f4..e318a2110e7 100644
--- a/variants/um_rmp/pins_arduino.h
+++ b/variants/um_rmp/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x8001
diff --git a/variants/um_tinypico/pins_arduino.h b/variants/um_tinypico/pins_arduino.h
index eb4227937f3..f89e10c9a3e 100644
--- a/variants/um_tinypico/pins_arduino.h
+++ b/variants/um_tinypico/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/um_tinys2/pins_arduino.h b/variants/um_tinys2/pins_arduino.h
index 0793b740be5..8df1c9891c9 100644
--- a/variants/um_tinys2/pins_arduino.h
+++ b/variants/um_tinys2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x8001
diff --git a/variants/um_tinys3/pins_arduino.h b/variants/um_tinys3/pins_arduino.h
index 3347d0213aa..63ee2a4b170 100644
--- a/variants/um_tinys3/pins_arduino.h
+++ b/variants/um_tinys3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x80D0
diff --git a/variants/unphone8/pins_arduino.h b/variants/unphone8/pins_arduino.h
index deebec834f4..1e9429a4754 100644
--- a/variants/unphone8/pins_arduino.h
+++ b/variants/unphone8/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x16D0
 #define USB_PID            0x1178
diff --git a/variants/unphone9/pins_arduino.h b/variants/unphone9/pins_arduino.h
index bfe8d167440..174a6feee63 100644
--- a/variants/unphone9/pins_arduino.h
+++ b/variants/unphone9/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x16D0
 #define USB_PID            0x1178
diff --git a/variants/vintlabsdevkitv1/pins_arduino.h b/variants/vintlabsdevkitv1/pins_arduino.h
index 7ae12cf386a..77c8d138c2b 100644
--- a/variants/vintlabsdevkitv1/pins_arduino.h
+++ b/variants/vintlabsdevkitv1/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/watchy/pins_arduino.h b/variants/watchy/pins_arduino.h
index 66c75d350d2..a9c8ead60fc 100644
--- a/variants/watchy/pins_arduino.h
+++ b/variants/watchy/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/wesp32/pins_arduino.h b/variants/wesp32/pins_arduino.h
index c6d8c38fe28..bd17b5f8965 100644
--- a/variants/wesp32/pins_arduino.h
+++ b/variants/wesp32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/widora-air/pins_arduino.h b/variants/widora-air/pins_arduino.h
index 58f147a9c9f..d12d7a6cde9 100644
--- a/variants/widora-air/pins_arduino.h
+++ b/variants/widora-air/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/wifiduino32/pins_arduino.h b/variants/wifiduino32/pins_arduino.h
index 79aff0107e3..fbd721b1960 100644
--- a/variants/wifiduino32/pins_arduino.h
+++ b/variants/wifiduino32/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/wifiduinov2/pins_arduino.h b/variants/wifiduinov2/pins_arduino.h
index 5207bdd4bdf..71a65a0dd45 100644
--- a/variants/wifiduinov2/pins_arduino.h
+++ b/variants/wifiduinov2/pins_arduino.h
@@ -9,7 +9,7 @@
 #define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
 
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUP)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
 static const uint8_t TX = 21;
diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h
index 1d4046c59c5..bbb1cbb08cd 100644
--- a/variants/wipy3/pins_arduino.h
+++ b/variants/wipy3/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins
diff --git a/variants/xinabox/pins_arduino.h b/variants/xinabox/pins_arduino.h
index a187006632f..9da96a64dfa 100644
--- a/variants/xinabox/pins_arduino.h
+++ b/variants/xinabox/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..39
 #define NUM_ANALOG_INPUTS       16                    // ESP32 has 16 ADC pins

From cb068d0fcc209d59bbfc2da04234485cb99e07aa Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Sun, 3 Sep 2023 16:20:17 -0300
Subject: [PATCH 13/18] fixes typos

---
 variants/Bee_Motion_Mini/pins_arduino.h       | 14 ++++++++++++++
 variants/heltec_wifi_kit_32_v3/pins_arduino.h |  1 +
 variants/um_nanos3/pins_arduino.h             |  2 +-
 variants/wipy3/pins_arduino.h                 |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/variants/Bee_Motion_Mini/pins_arduino.h b/variants/Bee_Motion_Mini/pins_arduino.h
index 77c67866a16..6ef12cc064c 100644
--- a/variants/Bee_Motion_Mini/pins_arduino.h
+++ b/variants/Bee_Motion_Mini/pins_arduino.h
@@ -18,6 +18,20 @@ static const uint8_t RX = 20;
 static const uint8_t BOOT_BTN = 9;
 static const uint8_t PIR = 5;
 
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+static const uint8_t SS    = 7;
+static const uint8_t MOSI  = 6;
+static const uint8_t MISO  = 5;
+static const uint8_t SCK   = 4;
+
+static const uint8_t A0 = 0;
+static const uint8_t A1 = 1;
+static const uint8_t A2 = 2;
+static const uint8_t A3 = 3;
+static const uint8_t A4 = 4;
+static const uint8_t A5 = 5;
 
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/heltec_wifi_kit_32_v3/pins_arduino.h b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
index 7f9b1202e4a..2dfb83870fd 100644
--- a/variants/heltec_wifi_kit_32_v3/pins_arduino.h
+++ b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include "soc/soc_caps.h"
+
 #define WIFI_Kit_32_V3	true
 
 #define DISPLAY_HEIGHT 64
diff --git a/variants/um_nanos3/pins_arduino.h b/variants/um_nanos3/pins_arduino.h
index ccdbf646414..2961de036a2 100644
--- a/variants/um_nanos3/pins_arduino.h
+++ b/variants/um_nanos3/pins_arduino.h
@@ -55,7 +55,7 @@ static const uint8_t RGB_DATA = 41;
 static const uint8_t RGB_PWR = 42;
 
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
-#define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT)  
+#define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = RGB_BUILTIN;
diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h
index bbb1cbb08cd..61e52f8eae5 100644
--- a/variants/wipy3/pins_arduino.h
+++ b/variants/wipy3/pins_arduino.h
@@ -15,7 +15,7 @@
 // Neopixel
 #define PIN_NEOPIXEL 0 // ->2812 RGB !!!
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT) 
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)

From 08df13b301a07a58f292a431c3764b10d6b1d630 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Sun, 3 Sep 2023 17:16:08 -0300
Subject: [PATCH 14/18] fixes typos

---
 variants/heltec_wifi_kit_32_v3/pins_arduino.h | 2 +-
 variants/unphone8/pins_arduino.h              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/variants/heltec_wifi_kit_32_v3/pins_arduino.h b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
index 2dfb83870fd..8e274ec67d5 100644
--- a/variants/heltec_wifi_kit_32_v3/pins_arduino.h
+++ b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
@@ -19,7 +19,7 @@
 
 #define PIN_NEOPIXEL        35
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = (SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN LED_BUILTIN
diff --git a/variants/unphone8/pins_arduino.h b/variants/unphone8/pins_arduino.h
index 1e9429a4754..cf842129547 100644
--- a/variants/unphone8/pins_arduino.h
+++ b/variants/unphone8/pins_arduino.h
@@ -15,7 +15,7 @@
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
-#define LED_BUILTIN         13
+#define LED_BUILTIN         (13)
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
 static const uint8_t TX = 37;

From 6d589dd11f7fa180e61af5913152a1ab278ce721 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Sun, 3 Sep 2023 17:41:10 -0300
Subject: [PATCH 15/18] changes board name to match boards.txt

---
 variants/heltec_wifi_kit_32_v3/pins_arduino.h | 85 -------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 variants/heltec_wifi_kit_32_v3/pins_arduino.h

diff --git a/variants/heltec_wifi_kit_32_v3/pins_arduino.h b/variants/heltec_wifi_kit_32_v3/pins_arduino.h
deleted file mode 100644
index 8e274ec67d5..00000000000
--- a/variants/heltec_wifi_kit_32_v3/pins_arduino.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef Pins_Arduino_h
-#define Pins_Arduino_h
-
-#include <stdint.h>
-#include "soc/soc_caps.h"
-
-#define WIFI_Kit_32_V3	true
-
-#define DISPLAY_HEIGHT 64
-#define DISPLAY_WIDTH  128
-
-#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
-#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
-#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
-
-#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
-#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
-
-#define PIN_NEOPIXEL        35
-// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = (SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL);
-#define BUILTIN_LED  LED_BUILTIN // backward compatibility
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
-#define RGB_BUILTIN LED_BUILTIN
-#define RGB_BRIGHTNESS 64
-
-static const uint8_t KEY_BUILTIN = 0;
-
-static const uint8_t TX = 43;
-static const uint8_t RX = 44;
-
-static const uint8_t SDA = 21;
-static const uint8_t SCL = 22;
-
-static const uint8_t SS = 8;
-static const uint8_t MOSI = 10;
-static const uint8_t MISO = 11;
-static const uint8_t SCK = 9;
-
-static const uint8_t A0 = 1;
-static const uint8_t A1 = 2;
-static const uint8_t A2 = 3;
-static const uint8_t A3 = 4;
-static const uint8_t A4 = 5;
-static const uint8_t A5 = 6;
-static const uint8_t A6 = 7;
-static const uint8_t A7 = 8;
-static const uint8_t A8 = 9;
-static const uint8_t A9 = 10;
-static const uint8_t A10 = 11;
-static const uint8_t A11 = 12;
-static const uint8_t A12 = 13;
-static const uint8_t A13 = 14;
-static const uint8_t A14 = 15;
-static const uint8_t A15 = 16;
-static const uint8_t A16 = 17;
-static const uint8_t A17 = 18;
-static const uint8_t A18 = 19;
-static const uint8_t A19 = 20;
-
-static const uint8_t T1 = 1;
-static const uint8_t T2 = 2;
-static const uint8_t T3 = 3;
-static const uint8_t T4 = 4;
-static const uint8_t T5 = 5;
-static const uint8_t T6 = 6;
-static const uint8_t T7 = 7;
-static const uint8_t T8 = 8;
-static const uint8_t T9 = 9;
-static const uint8_t T10 = 10;
-static const uint8_t T11 = 11;
-static const uint8_t T12 = 12;
-static const uint8_t T13 = 13;
-static const uint8_t T14 = 14;
-
-static const uint8_t Vext = 36;
-static const uint8_t LED  = 35;
-static const uint8_t RST_OLED = 21;
-static const uint8_t SCL_OLED = 18;
-static const uint8_t SDA_OLED = 17;
-
-static const uint8_t DIO0 = 14;
-
-#endif /* Pins_Arduino_h */

From 8365203c6263e3aff462eac7fbfefd92a56718da Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Sun, 3 Sep 2023 17:48:01 -0300
Subject: [PATCH 16/18] Fixes case V3

---
 variants/heltec_wifi_kit_32_V3/pins_arduino.h | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 variants/heltec_wifi_kit_32_V3/pins_arduino.h

diff --git a/variants/heltec_wifi_kit_32_V3/pins_arduino.h b/variants/heltec_wifi_kit_32_V3/pins_arduino.h
new file mode 100644
index 00000000000..46af54926fc
--- /dev/null
+++ b/variants/heltec_wifi_kit_32_V3/pins_arduino.h
@@ -0,0 +1,85 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+#define WIFI_Kit_32_V3	true
+
+#define DISPLAY_HEIGHT 64
+#define DISPLAY_WIDTH  128
+
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT    // GPIO 0..48
+#define NUM_ANALOG_INPUTS       20                    // GPIO 1..20
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS      // All GPIOs
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
+
+#define PIN_NEOPIXEL        35
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+static const uint8_t KEY_BUILTIN = 0;
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 21;
+static const uint8_t SCL = 22;
+
+static const uint8_t SS = 8;
+static const uint8_t MOSI = 10;
+static const uint8_t MISO = 11;
+static const uint8_t SCK = 9;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+static const uint8_t A18 = 19;
+static const uint8_t A19 = 20;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+static const uint8_t Vext = 36;
+static const uint8_t LED  = 35;
+static const uint8_t RST_OLED = 21;
+static const uint8_t SCL_OLED = 18;
+static const uint8_t SDA_OLED = 17;
+
+static const uint8_t DIO0 = 14;
+
+#endif /* Pins_Arduino_h */

From c598c4bb8bbb4015607cfa70a3beb18036432ce3 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Sun, 3 Sep 2023 19:15:37 -0300
Subject: [PATCH 17/18] adds flash-erase option to unphone8 board

---
 boards.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/boards.txt b/boards.txt
index 55ccc5968dc..5c6f65dbd25 100644
--- a/boards.txt
+++ b/boards.txt
@@ -23202,6 +23202,11 @@ unphone8.menu.DebugLevel.debug.build.code_debug=4
 unphone8.menu.DebugLevel.verbose=Verbose
 unphone8.menu.DebugLevel.verbose.build.code_debug=5
 
+unphone8.menu.EraseFlash.none=Disabled
+unphone8.menu.EraseFlash.none.upload.erase_cmd=
+unphone8.menu.EraseFlash.all=Enabled
+unphone8.menu.EraseFlash.all.upload.erase_cmd=-e
+
 #############################################################
 
 unphone9.name=unPhone 9

From 11a3691842dcee232dc7516f1958b3173b061ff8 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Sun, 3 Sep 2023 20:26:33 -0300
Subject: [PATCH 18/18] fixes unphone8 board qspi->qio

---
 boards.txt                       | 7 +------
 variants/unphone8/pins_arduino.h | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/boards.txt b/boards.txt
index 5c6f65dbd25..97584a552cc 100644
--- a/boards.txt
+++ b/boards.txt
@@ -23097,7 +23097,7 @@ unphone8.build.partitions=default_8MB
 unphone8.build.defines=-DBOARD_HAS_PSRAM -DUNPHONE_SPIN=8
 unphone8.build.loop_core=-DARDUINO_RUNNING_CORE=1
 unphone8.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
-unphone8.build.flash_type=qspi
+unphone8.build.flash_type=qio
 unphone8.build.psram_type=qspi
 unphone8.build.memory_type={build.flash_type}_{build.psram_type}
 
@@ -23202,11 +23202,6 @@ unphone8.menu.DebugLevel.debug.build.code_debug=4
 unphone8.menu.DebugLevel.verbose=Verbose
 unphone8.menu.DebugLevel.verbose.build.code_debug=5
 
-unphone8.menu.EraseFlash.none=Disabled
-unphone8.menu.EraseFlash.none.upload.erase_cmd=
-unphone8.menu.EraseFlash.all=Enabled
-unphone8.menu.EraseFlash.all.upload.erase_cmd=-e
-
 #############################################################
 
 unphone9.name=unPhone 9
diff --git a/variants/unphone8/pins_arduino.h b/variants/unphone8/pins_arduino.h
index cf842129547..1e9429a4754 100644
--- a/variants/unphone8/pins_arduino.h
+++ b/variants/unphone8/pins_arduino.h
@@ -15,7 +15,7 @@
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
 #define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
 
-#define LED_BUILTIN         (13)
+#define LED_BUILTIN         13
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
 static const uint8_t TX = 37;