From ab6a25ed8db8431f6d0464b560445ed9e0e62be6 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Fri, 6 Oct 2023 07:50:15 -0300
Subject: [PATCH] Master5.1 s3 gpio48 and platform txt review (#8726)

* variants + S3 GPIO48

* fixes unphone8.build.flash_type

* fixes unphone8.build.flash_type

* heltec board name issue step 1

* heltec board name issue step 2

* fixes defines and new boards

* final review
---
 boards.txt                                    |   2 +-
 cores/esp32/Arduino.h                         |  12 ++++++++
 cores/esp32/esp32-hal-gpio.c                  |   3 ++
 variants/AirM2M_CORE_ESP32C3/pins_arduino.h   |  12 ++------
 variants/Aventen_S3_Sync/pins_arduino.h       |   9 ------
 variants/Bee_Data_Logger/pins_arduino.h       |  17 ++++++------
 variants/Bee_Motion/pins_arduino.h            |   8 ------
 variants/Bee_Motion_Mini/pins_arduino.h       |  22 +++++++++------
 variants/Bee_Motion_S3/pins_arduino.h         |  17 ++++++------
 variants/Bee_S3/pins_arduino.h                |  18 ++++++------
 variants/ET-Board/pins_arduino.h              |  12 +-------
 variants/Edgebox-ESP-100/pins_arduino.h       |   8 ------
 variants/Microduino-esp32/pins_arduino.h      |  10 +------
 variants/Nebula_S3/pins_arduino.h             |  14 ++--------
 variants/S_ODI_Ultra_v1/pins_arduino.h        |  10 +------
 .../VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h   |   8 ------
 .../VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h   |   8 ------
 variants/XIAO_ESP32C3/pins_arduino.h          |   8 ------
 variants/XIAO_ESP32S3/pins_arduino.h          |  11 +-------
 .../adafruit_camera_esp32s3/pins_arduino.h    |  20 ++++++++------
 .../adafruit_feather_esp32_v2/pins_arduino.h  |  21 ++++++--------
 .../adafruit_feather_esp32s2/pins_arduino.h   |  20 ++++++--------
 .../pins_arduino.h                            |  20 ++++++--------
 .../pins_arduino.h                            |  20 ++++++--------
 .../adafruit_feather_esp32s3/pins_arduino.h   |  18 ++++++------
 .../pins_arduino.h                            |  18 ++++++------
 .../pins_arduino.h                            |  20 ++++++--------
 .../pins_arduino.h                            |  20 ++++++--------
 .../adafruit_funhouse_esp32s2/pins_arduino.h  |  10 +------
 .../adafruit_itsybitsy_esp32/pins_arduino.h   |  16 +++++------
 .../adafruit_magtag29_esp32s2/pins_arduino.h  |  20 ++++++--------
 .../pins_arduino.h                            |  17 ++++++------
 .../adafruit_metro_esp32s2/pins_arduino.h     |  16 +++++------
 .../bootloader-tinyuf2.bin                    | Bin 22256 -> 22256 bytes
 .../adafruit_metro_esp32s3/pins_arduino.h     |  26 ++++++++----------
 variants/adafruit_metro_esp32s3/tinyuf2.bin   | Bin 174736 -> 174736 bytes
 variants/adafruit_metro_esp32s3/variant.cpp   |   3 +-
 variants/adafruit_qtpy_esp32/pins_arduino.h   |  17 +++++++-----
 variants/adafruit_qtpy_esp32c3/pins_arduino.h |  19 +++++++------
 variants/adafruit_qtpy_esp32s2/pins_arduino.h |  21 ++++++--------
 .../adafruit_qtpy_esp32s3_n4r2/pins_arduino.h |  11 ++------
 .../pins_arduino.h                            |  11 ++------
 .../adafruit_qualia_s3_rgb666/pins_arduino.h  |   8 ------
 variants/alksesp32/pins_arduino.h             |  10 +------
 variants/atd147_s3/pins_arduino.h             |   9 ------
 variants/atmegazero_esp32s2/pins_arduino.h    |  17 ++++++------
 variants/bpi-bit/pins_arduino.h               |  16 +++++------
 variants/bpi_leaf_s3/pins_arduino.h           |  15 ++++------
 variants/ch_denky/pins_arduino.h              |   8 ------
 variants/cnrs_aw2eth/pins_arduino.h           |   8 ------
 variants/connaxio_espoir/pins_arduino.h       |   8 ------
 variants/crabik_slot_esp32_s3/pins_arduino.h  |  10 +------
 .../pins_arduino.h                            |  17 +++---------
 variants/d-duino-32/pins_arduino.h            |   8 ------
 variants/d1_mini32/pins_arduino.h             |   2 +-
 variants/d1_uno32/pins_arduino.h              |  11 +-------
 variants/d32/d32_core.h                       |   8 ------
 variants/d32/pins_arduino.h                   |   2 +-
 variants/d32_pro/pins_arduino.h               |   3 +-
 variants/deneyapkart/pins_arduino.h           |  12 ++------
 variants/deneyapkart1A/pins_arduino.h         |  14 ++--------
 variants/deneyapkart1Av2/pins_arduino.h       |  14 ++--------
 variants/deneyapkartg/pins_arduino.h          |  14 ++--------
 variants/deneyapmini/pins_arduino.h           |  12 ++------
 variants/deneyapminiv2/pins_arduino.h         |  14 ++--------
 .../pins_arduino.h                            |  20 ++++++--------
 .../dfrobot_beetle_esp32c3/pins_arduino.h     |  11 ++------
 .../dfrobot_firebeetle2_esp32e/pins_arduino.h |  12 +-------
 .../pins_arduino.h                            |  11 ++------
 variants/dfrobot_romeo_esp32s3/pins_arduino.h |  11 --------
 variants/doitESP32devkitV1/pins_arduino.h     |  10 +------
 variants/doitESPduino32/pins_arduino.h        |   9 +-----
 variants/dpu_esp32/pins_arduino.h             |   8 ------
 variants/esp32-devkit-lipo/pins_arduino.h     |   8 ------
 variants/esp32-evb/pins_arduino.h             |   9 ------
 variants/esp32-gateway/pins_arduino.h         |  10 +------
 variants/esp32-poe-iso/pins_arduino.h         |   8 ------
 variants/esp32-poe/pins_arduino.h             |   8 ------
 .../pins_arduino.h                            |  11 ++------
 .../pins_arduino.h                            |  11 ++------
 .../esp32-trueverit-iot-driver/pins_arduino.h |  11 ++------
 variants/esp32/pins_arduino.h                 |   8 ------
 variants/esp320/pins_arduino.h                |  10 +------
 variants/esp32_s3r8n16/pins_arduino.h         |   9 ------
 variants/esp32c3/pins_arduino.h               |  15 ++++------
 variants/esp32c6/pins_arduino.h               |  15 ++++------
 variants/esp32da/pins_arduino.h               |   8 ------
 variants/esp32h2/pins_arduino.h               |  15 ++++------
 variants/esp32micromod/pins_arduino.h         |  10 ++-----
 variants/esp32s2/pins_arduino.h               |  19 ++++++-------
 variants/esp32s2thing_plus/pins_arduino.h     |   9 +-----
 variants/esp32s2usb/pins_arduino.h            |   9 ------
 variants/esp32s3/pins_arduino.h               |  14 ++++------
 variants/esp32s3box/pins_arduino.h            |   8 ------
 variants/esp32s3camlcd/pins_arduino.h         |   8 ------
 variants/esp32s3usbotg/pins_arduino.h         |   8 ------
 variants/esp32thing/pins_arduino.h            |  10 +------
 variants/esp32thing_plus/pins_arduino.h       |  10 +------
 variants/esp32thing_plus_c/pins_arduino.h     |  13 ++-------
 variants/esp32vn-iot-uno/pins_arduino.h       |   8 ------
 variants/esp_c3_m1_i_kit/pins_arduino.h       |   9 +-----
 variants/espea32/pins_arduino.h               |  10 +------
 variants/espectro32/pins_arduino.h            |  10 +------
 variants/espino32/pins_arduino.h              |  10 +------
 variants/feather_esp32/pins_arduino.h         |  10 +------
 variants/firebeetle32/pins_arduino.h          |  12 +-------
 variants/fm-devkit/pins_arduino.h             |  10 ++-----
 .../franzininho_wifi_esp32s2/pins_arduino.h   |  16 +++++------
 .../pins_arduino.h                            |  16 +++++------
 variants/frog32/pins_arduino.h                |   8 ------
 variants/gpy/pins_arduino.h                   |  18 ++++++------
 variants/healthypi4/pins_arduino.h            |  10 +------
 variants/heltec_wifi_kit_32/pins_arduino.h    |  10 +------
 .../pins_arduino.h                            |  10 +------
 variants/heltec_wifi_lora_32/pins_arduino.h   |  10 +------
 .../heltec_wifi_lora_32_V2/pins_arduino.h     |  10 +------
 .../heltec_wifi_lora_32_V3/pins_arduino.h     |  18 ++----------
 variants/heltec_wireless_stick/pins_arduino.h |  10 +------
 .../heltec_wireless_stick_lite/pins_arduino.h |  10 +------
 .../pins_arduino.h                            |  10 +------
 variants/honeylemon/pins_arduino.h            |  10 +------
 variants/hornbill32dev/pins_arduino.h         |  10 +------
 variants/hornbill32minima/pins_arduino.h      |   8 ------
 variants/imbrios-logsens-v1p1/pins_arduino.h  |  12 ++------
 variants/intorobot-fig/pins_arduino.h         |  10 +------
 variants/ioxesp32/pins_arduino.h              |  10 +------
 variants/lilygo_t_display/pins_arduino.h      |  10 +------
 variants/lilygo_t_display_s3/pins_arduino.h   |   9 ------
 variants/lionbit/pins_arduino.h               |  11 ++------
 variants/lionbits3/pins_arduino.h             |  11 ++------
 variants/lolin32-lite/pins_arduino.h          |   9 +-----
 variants/lolin32/pins_arduino.h               |  12 +-------
 variants/lolin_c3_mini/pins_arduino.h         |   9 +-----
 variants/lolin_s2_mini/pins_arduino.h         |   9 +-----
 variants/lolin_s2_pico/pins_arduino.h         |   9 +-----
 variants/lolin_s3/pins_arduino.h              |  13 ++-------
 variants/lolin_s3_mini/pins_arduino.h         |  14 ++--------
 variants/lolin_s3_pro/pins_arduino.h          |  14 ++--------
 variants/lopy/pins_arduino.h                  |  18 ++++++------
 variants/lopy4/pins_arduino.h                 |  18 ++++++------
 variants/m5stack_atom/pins_arduino.h          |   8 ------
 variants/m5stack_atoms3/pins_arduino.h        |  18 ++----------
 variants/m5stack_core2/pins_arduino.h         |   8 ------
 variants/m5stack_core_esp32/pins_arduino.h    |   8 ------
 variants/m5stack_coreink/pins_arduino.h       |   8 ------
 variants/m5stack_cores3/pins_arduino.h        |  19 +------------
 variants/m5stack_fire/pins_arduino.h          |   8 ------
 variants/m5stack_stamp_pico/pins_arduino.h    |   9 ------
 variants/m5stack_stamp_s3/pins_arduino.h      |  10 -------
 variants/m5stack_station/pins_arduino.h       |   8 ------
 variants/m5stack_timer_cam/pins_arduino.h     |   9 +-----
 variants/m5stick_c/pins_arduino.h             |   8 ------
 variants/magicbit/pins_arduino.h              |  11 ++------
 variants/metro_esp-32/pins_arduino.h          |  10 +------
 variants/mgbot-iotik32a/pins_arduino.h        |  10 +------
 variants/mgbot-iotik32b/pins_arduino.h        |  10 +------
 variants/mhetesp32devkit/pins_arduino.h       |  12 ++------
 variants/mhetesp32minikit/pins_arduino.h      |  12 ++------
 variants/micro_s2/pins_arduino.h              |  16 +++++------
 variants/mpython/pins_arduino.h               |   8 ------
 variants/namino_arancio/pins_arduino.h        |   8 ------
 variants/namino_rosso/pins_arduino.h          |   8 ------
 variants/nano32/pins_arduino.h                |  10 +------
 variants/nina_w10/pins_arduino.h              |   8 ------
 variants/node32s/pins_arduino.h               |  10 +------
 variants/nodemcu-32s/pins_arduino.h           |  10 +------
 variants/nora_w10/pins_arduino.h              |   9 ------
 variants/odroid_esp32/pins_arduino.h          |  10 +------
 variants/onehorse32dev/pins_arduino.h         |  10 +------
 variants/openkb/pins_arduino.h                |  10 +------
 variants/oroca_edubot/pins_arduino.h          |  10 +------
 variants/pico32/pins_arduino.h                |   8 ------
 variants/piranha_esp-32/pins_arduino.h        |  10 +------
 variants/pocket_32/pins_arduino.h             |  12 +-------
 variants/quantum/pins_arduino.h               |   8 ------
 variants/redpill_esp32s3/pins_arduino.h       |  13 ++-------
 variants/roboheart_hercules/pins_arduino.h    |   9 ------
 variants/sonoff_dualr3/pins_arduino.h         |   8 ------
 .../pins_arduino.h                            |  15 +++-------
 .../pins_arduino.h                            |  10 ++-----
 variants/tamc_termod_s3/pins_arduino.h        |  18 +-----------
 variants/tbeam/pins_arduino.h                 |  10 +------
 variants/ttgo-lora32-v1/pins_arduino.h        |  10 +------
 variants/ttgo-lora32-v2/pins_arduino.h        |  12 ++------
 variants/ttgo-lora32-v21new/pins_arduino.h    |  14 ++--------
 variants/ttgo-t-oi-plus/pins_arduino.h        |  10 ++-----
 variants/ttgo-t1/pins_arduino.h               |  10 +------
 variants/ttgo-t7-v13-mini32/pins_arduino.h    |   9 +-----
 variants/ttgo-t7-v14-mini32/pins_arduino.h    |   9 +-----
 variants/turta_iot_node/pins_arduino.h        |  10 +------
 variants/twatch/pins_arduino.h                |   8 ------
 .../uPesy_esp32_wroom_devkit/pins_arduino.h   |  10 +------
 .../uPesy_esp32_wrover_devkit/pins_arduino.h  |  10 +------
 variants/um_feathers2/pins_arduino.h          |   8 ------
 variants/um_feathers2neo/pins_arduino.h       |  17 ++++++------
 variants/um_feathers3/pins_arduino.h          |  18 ++++++------
 variants/um_nanos3/pins_arduino.h             |  17 ++++++------
 variants/um_pros3/pins_arduino.h              |  17 ++++++------
 variants/um_rmp/pins_arduino.h                |  17 ++++++------
 variants/um_tinypico/pins_arduino.h           |   8 ------
 variants/um_tinys2/pins_arduino.h             |  17 ++++++------
 variants/um_tinys3/pins_arduino.h             |  17 ++++++------
 variants/unphone8/pins_arduino.h              |   8 ------
 variants/unphone9/pins_arduino.h              |   8 ------
 variants/vintlabsdevkitv1/pins_arduino.h      |  10 +------
 variants/watchy/pins_arduino.h                |   8 ------
 variants/wesp32/pins_arduino.h                |   8 ------
 variants/widora-air/pins_arduino.h            |  11 +-------
 variants/wifiduino32/pins_arduino.h           |  10 +------
 variants/wifiduino32s3/pins_arduino.h         |  18 +-----------
 variants/wifiduinov2/pins_arduino.h           |  15 ++--------
 variants/wipy3/pins_arduino.h                 |  19 ++++++-------
 variants/wt32-eth01/pins_arduino.h            |   8 ------
 variants/xinabox/pins_arduino.h               |  10 +------
 214 files changed, 557 insertions(+), 1898 deletions(-)
 rename variants/{heltec_wifi_kit_32_v3 => heltec_wifi_kit_32_V3}/pins_arduino.h (84%)

diff --git a/boards.txt b/boards.txt
index d1ef1989e7a..4b46104ea16 100644
--- a/boards.txt
+++ b/boards.txt
@@ -23802,7 +23802,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}
 
diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h
index cd87a914517..2756f6f3cb4 100644
--- a/cores/esp32/Arduino.h
+++ b/cores/esp32/Arduino.h
@@ -129,6 +129,18 @@
 #define NOT_AN_INTERRUPT -1
 #define NOT_ON_TIMER 0
 
+// some defines generic for all SoC moved from variants/board_name/pins_arduino.h
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT                                // All GPIOs
+#if SOC_ADC_PERIPH_NUM == 1
+#define NUM_ANALOG_INPUTS       (SOC_ADC_CHANNEL_NUM(0))                          // Depends on the SoC (ESP32C6, ESP32H2, ESP32C2, ESP32P4)
+#elif SOC_ADC_PERIPH_NUM == 2
+#define NUM_ANALOG_INPUTS       (SOC_ADC_CHANNEL_NUM(0)+SOC_ADC_CHANNEL_NUM(1))   // Depends on the SoC (ESP32, ESP32S2, ESP32S3, ESP32C3)
+#endif
+#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)
+
 typedef bool boolean;
 typedef uint8_t byte;
 typedef unsigned int word;
diff --git a/cores/esp32/esp32-hal-gpio.c b/cores/esp32/esp32-hal-gpio.c
index f4687641e7f..3888a38edb8 100644
--- a/cores/esp32/esp32-hal-gpio.c
+++ b/cores/esp32/esp32-hal-gpio.c
@@ -196,6 +196,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 >= SOC_GPIO_PIN_COUNT) 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);
diff --git a/variants/AirM2M_CORE_ESP32C3/pins_arduino.h b/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
index 4af6c1d87cd..48b128a25d0 100644
--- a/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
+++ b/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
@@ -3,16 +3,10 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
-
-#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 LED_BUILTIN     = 12;
-#define BUILTIN_LED  LED_BUILTIN
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 static const uint8_t LED_BUILTIN_AUX = 13;
 
 static const uint8_t TX = 21;
diff --git a/variants/Aventen_S3_Sync/pins_arduino.h b/variants/Aventen_S3_Sync/pins_arduino.h
index c42f6d3ff03..3ced97de06d 100644
--- a/variants/Aventen_S3_Sync/pins_arduino.h
+++ b/variants/Aventen_S3_Sync/pins_arduino.h
@@ -2,7 +2,6 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
@@ -10,14 +9,6 @@
 #define USB_PRODUCT "Aventen S3 Sync"
 #define USB_SERIAL ""
 
-#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/Bee_Data_Logger/pins_arduino.h b/variants/Bee_Data_Logger/pins_arduino.h
index b49fd08d030..d007ea18c6a 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
@@ -9,14 +10,6 @@
 #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 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;
 
@@ -74,5 +67,13 @@ 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+// 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..d11f332cef9 100644
--- a/variants/Bee_Motion/pins_arduino.h
+++ b/variants/Bee_Motion/pins_arduino.h
@@ -9,14 +9,6 @@
 #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 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/Bee_Motion_Mini/pins_arduino.h b/variants/Bee_Motion_Mini/pins_arduino.h
index e3f43decb4a..3e308be5de6 100644
--- a/variants/Bee_Motion_Mini/pins_arduino.h
+++ b/variants/Bee_Motion_Mini/pins_arduino.h
@@ -3,22 +3,26 @@
 
 #include <stdint.h>
 
-
-#define EXTERNAL_NUM_INTERRUPTS 4
-#define NUM_DIGITAL_PINS        4
-#define NUM_ANALOG_INPUTS       2
-
-#define analogInputToDigitalPin(p)  (((p)<6)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<22)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 22)
-
 static const uint8_t TX = 21;
 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/Bee_Motion_S3/pins_arduino.h b/variants/Bee_Motion_S3/pins_arduino.h
index 19025426c65..6eebf47d884 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
@@ -9,14 +10,6 @@
 #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 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;
 
@@ -81,5 +74,13 @@ 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+// 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..2ea399fd532 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
@@ -9,14 +10,6 @@
 #define USB_PRODUCT "BeeS3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 45
-#define NUM_DIGITAL_PINS        15
-#define NUM_ANALOG_INPUTS       8
-
-#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;
 
@@ -73,4 +66,13 @@ 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+// 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/ET-Board/pins_arduino.h b/variants/ET-Board/pins_arduino.h
index 9dada4cb50d..7275f956f4f 100644
--- a/variants/ET-Board/pins_arduino.h
+++ b/variants/ET-Board/pins_arduino.h
@@ -3,19 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       7
-
-#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 = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
-
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..0c14982ec9b 100644
--- a/variants/Edgebox-ESP-100/pins_arduino.h
+++ b/variants/Edgebox-ESP-100/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 34
-#define NUM_DIGITAL_PINS        34
-#define NUM_ANALOG_INPUTS       2
-
-#define analogInputToDigitalPin(p)  (((p)<2)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<34)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
-
 //Programming and Debugging Port
 static const uint8_t TXD = 43;
 static const uint8_t RXD = 44;
diff --git a/variants/Microduino-esp32/pins_arduino.h b/variants/Microduino-esp32/pins_arduino.h
index 034bd6173b3..7dc0d236de9 100644
--- a/variants/Microduino-esp32/pins_arduino.h
+++ b/variants/Microduino-esp32/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       12
-
-#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 = -1;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 #define MTDO 15
 #define MTDI 12
diff --git a/variants/Nebula_S3/pins_arduino.h b/variants/Nebula_S3/pins_arduino.h
index 513aef8409e..39fbe5707d2 100644
--- a/variants/Nebula_S3/pins_arduino.h
+++ b/variants/Nebula_S3/pins_arduino.h
@@ -2,22 +2,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #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)
-
-
-static const uint8_t LED_BUILTIN = 45;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 45;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/S_ODI_Ultra_v1/pins_arduino.h b/variants/S_ODI_Ultra_v1/pins_arduino.h
index 51278ce94be..87a6d56e0b3 100644
--- a/variants/S_ODI_Ultra_v1/pins_arduino.h
+++ b/variants/S_ODI_Ultra_v1/pins_arduino.h
@@ -3,18 +3,10 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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 LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 #define BUILTIN_LED2  LED_BUILTINB
 
 static const uint8_t TX = 1;
diff --git a/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h b/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
index 4e3c771578b..b473c8afff1 100644
--- a/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
+++ b/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
-
-#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 = 21;
 static const uint8_t RX = 20;
 
diff --git a/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h b/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
index 4e3c771578b..b473c8afff1 100644
--- a/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
+++ b/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
-
-#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 = 21;
 static const uint8_t RX = 20;
 
diff --git a/variants/XIAO_ESP32C3/pins_arduino.h b/variants/XIAO_ESP32C3/pins_arduino.h
index 420ed499dc8..8de70af9ea2 100644
--- a/variants/XIAO_ESP32C3/pins_arduino.h
+++ b/variants/XIAO_ESP32C3/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
-
-#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 = 21;
 static const uint8_t RX = 20;
 
diff --git a/variants/XIAO_ESP32S3/pins_arduino.h b/variants/XIAO_ESP32S3/pins_arduino.h
index 975b5717097..cb77ca81cb6 100644
--- a/variants/XIAO_ESP32S3/pins_arduino.h
+++ b/variants/XIAO_ESP32S3/pins_arduino.h
@@ -2,22 +2,13 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #define USB_VID 0x2886
 #define USB_PID 0x0056
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
-
 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)
-#define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/adafruit_camera_esp32s3/pins_arduino.h b/variants/adafruit_camera_esp32s3/pins_arduino.h
index 6117cd9f4ae..26c72ad392c 100644
--- a/variants/adafruit_camera_esp32s3/pins_arduino.h
+++ b/variants/adafruit_camera_esp32s3/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            0x8117
@@ -11,17 +11,19 @@
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
 
-#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)
-
 static const uint8_t PIN_NEOPIXEL = 1;
 static const uint8_t NEOPIXEL_PIN = 1;
 
+//By making LED_BUILTIN have the same value of RGB_BUILTIN
+//NeoPixel LED can also be used as LED_BUILTIN with digitalMode() + digitalWrite()
+static const uint8_t LED_BUILTIN = PIN_NEOPIXEL+SOC_GPIO_PIN_COUNT;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#define RGB_BUILTIN (PIN_NEOPIXEL+SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
+
+
 //static const uint8_t TFT_BACKLIGHT = 41;
 static const uint8_t TFT_DC        = 40;
 static const uint8_t TFT_CS        = 39;
diff --git a/variants/adafruit_feather_esp32_v2/pins_arduino.h b/variants/adafruit_feather_esp32_v2/pins_arduino.h
index 71e32cc60e1..7aae51a2d16 100644
--- a/variants/adafruit_feather_esp32_v2/pins_arduino.h
+++ b/variants/adafruit_feather_esp32_v2/pins_arduino.h
@@ -2,18 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
-static const uint8_t LED_BUILTIN = 13;
-#define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#include "soc/soc_caps.h"
 
 static const uint8_t TX = 8;
 static const uint8_t RX = 7;
@@ -50,8 +39,16 @@ static const uint8_t A13 = 35;
 // internal switch
 #define BUTTON 38
 
+// User LED 
+static const uint8_t LED_BUILTIN = 13;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 // Neopixel
 #define PIN_NEOPIXEL 0
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#define RGB_BUILTIN (PIN_NEOPIXEL+SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
 
 // Neopixel & I2C power
 #define NEOPIXEL_I2C_POWER 2
diff --git a/variants/adafruit_feather_esp32s2/pins_arduino.h b/variants/adafruit_feather_esp32s2/pins_arduino.h
index 261377de89c..013ae6c6dea 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
@@ -10,18 +10,16 @@
 #define USB_PRODUCT        "Feather ESP32-S2"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-#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 LED_BUILTIN     13
+// Neopixel
+#define PIN_NEOPIXEL 33
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#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..d39b50628e2 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
@@ -10,18 +10,16 @@
 #define USB_PRODUCT        "Feather ESP32-S2 Reverse TFT"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-#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 LED_BUILTIN     13
+// Neopixel
+#define PIN_NEOPIXEL 33
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#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..ca713ac315d 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
@@ -10,18 +10,16 @@
 #define USB_PRODUCT        "Feather ESP32-S2 TFT"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-#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 LED_BUILTIN     13
+// Neopixel
+#define PIN_NEOPIXEL 33
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#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_feather_esp32s3/pins_arduino.h b/variants/adafruit_feather_esp32s3/pins_arduino.h
index 16ae97b640f..a8c491a64ad 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
@@ -9,17 +10,16 @@
 #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
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+// Neopixel
+#define PIN_NEOPIXEL 33
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#define RGB_BUILTIN (PIN_NEOPIXEL+SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
 
-#define LED_BUILTIN         13
-
-#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_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h
index 58a23a17f7c..65aec064fad 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
@@ -9,17 +10,16 @@
 #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
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+// Neopixel
+#define PIN_NEOPIXEL 33
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#define RGB_BUILTIN (PIN_NEOPIXEL+SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
 
-#define LED_BUILTIN         13
-
-#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_esp32s3_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h
index 594940f5710..8fa045489fe 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
@@ -10,18 +10,16 @@
 #define USB_PRODUCT        "Feather ESP32-S3 Reverse TFT"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-#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 LED_BUILTIN     13
+// Neopixel
+#define PIN_NEOPIXEL 33
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#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_esp32s3_tft/pins_arduino.h b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h
index d1a9dc5ff81..56860f3c2d7 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
@@ -10,18 +10,16 @@
 #define USB_PRODUCT        "Feather ESP32-S3 TFT"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-#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 LED_BUILTIN     13
+// Neopixel
+#define PIN_NEOPIXEL 33
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#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..3594af16021 100644
--- a/variants/adafruit_funhouse_esp32s2/pins_arduino.h
+++ b/variants/adafruit_funhouse_esp32s2/pins_arduino.h
@@ -10,16 +10,8 @@
 #define USB_PRODUCT        "Funhouse 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 analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 #define LED_BUILTIN   37
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
 #define PIN_BUTTON1   3
 #define PIN_BUTTON2   4
diff --git a/variants/adafruit_itsybitsy_esp32/pins_arduino.h b/variants/adafruit_itsybitsy_esp32/pins_arduino.h
index d81c077c91d..c526628f7b1 100644
--- a/variants/adafruit_itsybitsy_esp32/pins_arduino.h
+++ b/variants/adafruit_itsybitsy_esp32/pins_arduino.h
@@ -2,21 +2,19 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
+// User LED 
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 // Neopixel
 static const uint8_t PIN_NEOPIXEL = 0;
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#define RGB_BUILTIN (PIN_NEOPIXEL+SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
+
 static const uint8_t NEOPIXEL_POWER = 2;
 
 static const uint8_t TX = 20;
diff --git a/variants/adafruit_magtag29_esp32s2/pins_arduino.h b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
index 610312d05fd..aaeb744ce0a 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
@@ -10,18 +10,16 @@
 #define USB_PRODUCT        "EPD MagTag 2.9\" ESP32-S2"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-#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 LED_BUILTIN         13
-
+// Neopixel
 #define PIN_NEOPIXEL        1    // D1
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#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_matrixportal_esp32s3/pins_arduino.h b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h
index fc7e69f5c1d..99529c02510 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
@@ -9,18 +10,16 @@
 #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 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
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
 #define PIN_NEOPIXEL        4
 #define NEOPIXEL_PIN        4
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#define RGB_BUILTIN (PIN_NEOPIXEL+SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
+
 #define NEOPIXEL_NUM        1
 #define PIN_LIGHTSENSOR     A5
 
diff --git a/variants/adafruit_metro_esp32s2/pins_arduino.h b/variants/adafruit_metro_esp32s2/pins_arduino.h
index 4c70e662f1d..3b2e02b1dc1 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
@@ -10,17 +10,15 @@
 #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 analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 #define LED_BUILTIN     42
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
+// Neopixel
 #define PIN_NEOPIXEL    45
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#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_metro_esp32s3/bootloader-tinyuf2.bin b/variants/adafruit_metro_esp32s3/bootloader-tinyuf2.bin
index 2ed855b65a59f12e9c7a659ccbf24b4691f58426..73e8c06b33bd5ce0ffccfb8ffe6ba67e8171c717 100644
GIT binary patch
delta 2633
zcmY*b4^R}>8Grllgk#Y|0pXCiceoyh8gK821%%;FBc(J>IE>VgGW?0>SR+kM)l53H
z$3vrMVrC?3oj7BryN6eh^s30jG1i-MXo*sZO4^t@!7`3(E7}%^NMnb6+xPBFn(oa0
z-n-xTz2Eok_rAA#Q&DOvN^$oX`uW0sZgfF#`;S(8FXG#DICHe}ec%OGzhRDI=3kgG
zj$!))e5b0IxdfWO#T>_su&~51z_!)iVtku^i<!~?^8xrW$h8-1e2#A_?<Lo2kJPqK
zD3m|2%#)il|DNJ1Df2v2R$MYro0URkAD#=qDhR-*>su{2gJu8*4Is!r&MwNjMvYcF
z=+Vjt>p=5%JbKd^kTTGpy@8^BCv!P(7rtRkq=1Q<jK1R-{5uS9O$XeW;L0-kx+lsq
z%F0@g--fTsXLE|@G#R!g!`~!N=Q!uQU`+kf@^FJ(kh`8*Bk#z~Yb-ai>i{exi!~?6
zE&^gLXDdmNs|Y!yD5n)*Q3dEFKk+0`z<p7p{e+E~<0}nyr2$tHL)AkAfG8!Fa`uz&
zSC}2vGrTz>-^&%s-!+RfhHbIou+miyV9PPw3K$fCyA^2Lh{!@i%{AJmVF8heF;OZ|
z&0+hycD~;%ud`PEAhMZlGuNrp;%2tFZ?NY>dS3+*SYw~(^|JLlQKXes&I#jed<Lnr
zsHzw&zX@p~W}88EQDcpLMaw;e7ZkF!b_*VztnUu;Yw|6tz2+7oev?S(>$Kg#7*>Am
z^G-6tB;&OY_PA%%anu?$BA*%jO?a31`fsA;+p7PZkZXP-XS<AiBXUiieZ`us$;>R?
zDmMGs2Z4<wvv?e-!)Q!d3P*`T`!rtM+v+<bAIWnCKOhu5i#qx`;c<*4f!ax?W0I*2
z4fd4GVBgSKOF#04EWTf%Iu&?B0_F~kVR+Gm;d^cZVcQAvh%eH(`VN_{YBGlR;tg5l
z143AUJtW8qbN&?m9agAFHHT6AKF3>g0?%{O0J04r-vAMCG8hV3f4|(aD9iI3Bt?;9
zz|5zQrpMBw>5;V@jwAIUhv&Z72;ike@=5%d%x%Zz6N{DywMDE_BpkB_D#->PLFy3%
zcN2U5RAduQq`tw>8pwDPwREAVDd1+cWvm9+Ksj)m82@X?<tlc0cP`DG4?G3_SI|M3
zpZ0G<-^rvgie;=1qL^9TgT}d07B&%O36k_TG13;aKlsQh1<-dNWnz5&(Ojts{Y^{3
zctfM579_61NvXThIODx2z*@4H#B4^c;^L)ipPt!}>wgI?EfD<;XvVYHUyqK-{vRR}
zN6xr^6I%Lm8s^Tt%=v54mY?1UNJMROGLs4-)@hPI&9|5DAoG?6^spXnHC?Yq@p{x~
z?llb#P`6b8w-alWgRhV=(8ls+=p@rdGjD|sS$b-r6e%RiRR}*}9x?IRbr+`F&+dPd
z-uDb}UwAy@p{qO~d&VSHl1DFL<Q-3Km3$I<jvSv7w$?)$rIhtOjp|PR{s~3;A5%q$
zUyz(R<@t+?f`MET%S>Y3(s8V+O9oig0&rF$2_4yE!a4MmG<M~oQ0jZRM>D!|(V>tf
zfx-bwe9ELKnb+Q;y0TF(b*RtM(I=dsG&^S53Cw0-_H4%2e8dOfT*Rm11dgUa9<@JS
zl9=XC;dnzN{Fc5W!!rhM)*%IqDJg^J1->C7|8?;~QM|^GKE_*-v=Y-h*!T&<^DE5!
zJ2AezL6h@@yr6i6!G73lOu;fK!fB!0s*QY`vtW+5MlS!4BVAtJ7r4aO&g;E&vJ^ZY
z<4FkdV}?&(VJ0qoO<))=N@^$9h<{+DlX@=$uao>^H2+*We~`Co7Z}W4Azbnd@imbl
z5|30@>ehKKTmaxjVlQOW3;J1lz4_F&UHtY_r@q{MFnf?<2El^(kWAUuF4MkZ#%QXO
z1|8!W9pgeLO~=e2lyNO2jL}RyqIZl_DnS9hAiru`Kld<EZ8P^W-i-o$OCGV=g4!v@
z+apYH04MbeVxFKu&t6IV2ZN7kyRQCRhszVWS_3QD{HeT+;gR`)`^30QS6|nmNQ}c*
z4bm99$vlZMyw5w~PD1RPBHLzrR=3-M7H7h(;1D@Cm{VPPFz(X%H08=5oKJicW$=N1
zNgq?FAti@52hv#l(zrtcw(4rD4pWI=`+t&Kjzz@V41Td-j5p}GVH@;u8Uo^@3RqdZ
z%kViotrW_F(2Vy7mw1ED({HP#lG7%h=Ylaj7l$|u!`wJMN|WD#PA+nnt1yS-DcVPz
zTCK;cb!8xY9b<PVtR~{4W`2E)CJx<rZR8^&FvLNx9;Mz(DakoXm1YFaa8W8o2hQUm
zFvumEL%Ts9#HFhxI=nH9b%Fseu4=Lz;%AJ_spGH1b+@j%bzw+=pAetOpYS4eWr7$X
z#Mf0?rsH?EIKtr4&m&1`6{fgD?|10DS^OjEMiq34dTAFvN}*IYwL~q@1y6<&vN&N!
z@=cH$>{_h5DKX)p=Ic`)3Y&YsF)NW>fl^a16bcV3QBkZgNm+VVmQLJp)I-Vd4%0P1
z$>8IUEe9AkCBXY6(I^vfo76N?wur|Rj$1^7v-Au2`{TCF5g&736a}?mQV~{HSsluW
zr;W4ZABA92CK=^)SP6H!E(m;jQc#&(0I$w=xHAf2huz|`3(~)5;a9Ux=yF^3%ZX3e
zhn(ZJdHr9`;?kV+@M*4ddm`t!UZ{jQ@d_Ecv+zbesbK!pfVN~(a*}=|*SR;Fc09QC
h%WlxNFzsf0f8=Ke{vz((clqeu&>M}PZ=BZ_{V&L~96kU5

delta 2605
zcmY*b4R90372ea`30Xb|DHtQm7@vgCmK`uU8I1p^B`6TwP>>nZ;EWyHpwhT;N&_^V
zsWb9A8DbKc!5o<hGo*7TbHOoHg6)z?ph_$gAp9u&BtV<u8HeVY;xLUFVmGwhUUwy+
zsb=o&+wZ-7fBSY<6H#g+O0hR-)0%k$Y+^=u+cQ=E^Y}CG%S_a~3H;!~Lu5ZjzQu@f
z5X-;AUz&oEPeAhzkb@ZEXO$a<rLD?ejX(1{7)kt}4!}Qy{B~g*WB8+Tp7K_eitWpJ
zk962JU24w!hea%_^ew9NRt&A3X`!+XJOV%&1mLsPtu`D%GXTQ|@Jr8S6=wq;fQwY3
zrqGnAxwRZLKZ{3y1`W8OXx2K4Iw4Vx*F3*9#w=j0*4}>*li(J^U)u?{Cb3F;fA3hO
zy|S|P;0^ek^hd|SX-$T!$p|({-#Ut>turS6X}et~<z=s?0#bW+PGgmkRR>@NSu7NT
ztYV<8VO@)p;35K!$nu~JYzhzkWQrMKE_=OJ-NMAI@e)HRF<=!Dthj9e5T&$o*8T3A
zORR;?_c*I2Y1w@Bh*g*}Tyu;<r^)OAu33gp2E#n?wF0$`7|AjehtY8d&Lw7Ibd(Yv
zXR&;*n;S@z0?wL-&?ctcTBqE>;8OQ=zn@vpP{Kw=KE{tS@$ZphpcRXO(8@IT4<9=E
zmlb7XL*|V`ir8~aqPnQD)Lqi@HNxvX%v!e%k3~%21`2*9U30o?uOp&&6Y>3Bt}B>E
z<hKI;ahe~e{qEsIzA5E8YK<D9s|NQ4)QE2I&uCuT<5!aAn(v!)okoGrrDZwp;#HPp
zoHqXoCM*AzP)|}EM#?EPuN@}H@(z+nUu)o~v^U3_(N7@wKI-i6g1yp(97i}ffc)LI
z!0$2TvF6UpOBGVDRcuftDQxf&5^?pB$tn}BcA;e2(PWrk#v1_20)UV3@GW9>zBP9O
z&m%IaD5jyGu$)u-DJu>l*B}ZE5(7mvCLShu1g&)wZ$(TEXTqa<BhYpL*I^|70Tm8e
zxr{_cEF+pBEMu`_@oiLC`i;;C;OS)aDSC?Vu3kx*Jue)Z&B(?40jKsOlK$&Rc^$#+
zM4mgLK8XWc-(YABWc&iP>_JhpCNiPNm=It>)xc+_gTF>z??SJCTS4Zdpmc7q4egS+
zJHcnr;!G2!Y6TPML@}$<g+|!~1Dl9tv6JNUBrS%}E8$6}xCyPC%*6DC$w$N{^tEQe
z^qOW8n~}N*2c>LBqqP5H9<CvaiO;8zcj3Z<WhGPVvV#q%V6G6{fTl|Gg7xTt6nqMq
zS<+X*pP_<{=@@%&BO6?Ue!lf9%}cCpOhr;njCGl%bGh!Pw-CN%1G-(0eqp{;kK*;H
z(b{Jo9-?k20REClqbzJAqxLMrS)qrpjaJSH3kcVBa<b#9T*+^?OshM2x7{?g$S!z@
zujL5m?3A9EGe>%U&gKeHB#D>P0WW%j9Gr4yZ7JDGT%`G^?%j{>L!|97RD`%0Db6EV
z^NPcogP2SsCP#Jbb;TzJC~E;YoO}|5@RAui(V_Cj9w+Kfdn0?ly~ly}blZ}Y-$|*t
zW?9a>_$t*i6ZKJh`fZ*4{M%H>jZtO{qc)7bZ-0QR0RS@)mxcq_Z-MEk<8FGA&7Hvh
z;?jqC4ySO5CViV~<q;WNmMz17;;S3f3(`d1%&_n&&2jUs-0m1x-4II9o&9#cn17&u
zS;qI3g&*WOr+SXYC~p6UShX{B_J^1)sVAKIA4Yn-x?ej@yN>I9rc^yRF2-@Yxd!zV
z&1KAQv=SYzRy&DTrHrQ*sUOqgJ9-}tFOnk0Ok4)Hi*trf&=@*LpwtQCYK0NvkCa%9
z=o}lF3*ZSN_t46S^d&!wic5F-WmHI7;>yi9sCSN13ZXn)CvA4E4ogJ0-P%X{>v_17
zOvX&0o8mHo!w-I}_>b9Mw60HQkNlNCa*pTPLPu!-A%2VnIE)wXYae=9RBzGvSpH5|
zI&}CLf$_ai!sJfm)JM)fs*MxjHeLCR4)cld)CGg|!*<MvL2>{wyuaJvRwCUoVc<fz
zmg#Oc2*v40E7(I03dWQLdVGP-rOW4sp`EBE6Ayp^uYOskMq~$mA*>9(B>qMmw&+TW
z4lP8l<KL+kz&6w`X?&4j8sDJfJ`HcsM@`VUhn18(Y+BW5&cT^vkHquMct>zm>vYca
zno=Paxzyuq46|yS#pEPAYD$>MT!XCecXo+261RjtV3n16e5EcAMJ{35+XYvW01{Si
zb<9K*dhuG}17aY~!WumsrQWcVJN8o*cI_w|rD7)SI3Bc**kn6|u8~X@=*nUpUL`?l
zHMpv&YN%Iemq*8s)+JF_M4cbuVS=a#pW`)3NfJ0ifCp77*72RKo}qE+A0a`7mYCz=
z0)3!B=d3E}<T3^H<m(kZ_y~2U`KWxwt@EXJx!YC*J5x76TF)HaM+r#<Wwt(1N?~c=
zL#eE8*UHU(koWA9qk>v(7BlspOr5A>uX|F@58Y!=A^6k}hw*zv`zRiclSreq;4>>$
zQa7R09Esah#M%aU`~dk})70<T>&2l{q#(4e&^p|k%r?&8zYtoUSsth5!H68`@}A(i
zjFdfjd<OjVUZ>CQft_xf*UgJl_u#+o6+y4h_KHNFFd=l5Eqs3Zz@2+|a;%g~_a1vm
zIL7utIl`*v$k;nmjSqd6|DEXiRdZ~XW%c<xw_h09JbTmSeMM()7JhSg`XpUdavpuS
I`#*>O3#6+IUH||9

diff --git a/variants/adafruit_metro_esp32s3/pins_arduino.h b/variants/adafruit_metro_esp32s3/pins_arduino.h
index 5b3f8c23606..dd77fa7a5ab 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
@@ -9,18 +10,15 @@
 #define USB_PRODUCT        "Metro 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 analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 #define LED_BUILTIN     13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+// Neopixel
+#define PIN_NEOPIXEL    45
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#define RGB_BUILTIN (PIN_NEOPIXEL+SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
 
-#define PIN_NEOPIXEL    46
-#define NEOPIXEL_PIN    46
 #define NEOPIXEL_NUM    1
 
 #define PIN_BUTTON1     0  // BOOT0 switch
@@ -33,10 +31,10 @@ static const uint8_t RX = 41;
 static const uint8_t SDA = 47;
 static const uint8_t SCL = 48;
 
-static const uint8_t SS   = 45;
-static const uint8_t MOSI = 42;
-static const uint8_t SCK  = 39;
-static const uint8_t MISO = 21;
+static const uint8_t SS   = 21;
+static const uint8_t MOSI = 35;
+static const uint8_t SCK  = 36;
+static const uint8_t MISO = 37;
 
 static const uint8_t A0 = 14;
 static const uint8_t A1 = 15;
diff --git a/variants/adafruit_metro_esp32s3/tinyuf2.bin b/variants/adafruit_metro_esp32s3/tinyuf2.bin
index 25a5ba66b1e8020665347240932ecc49070f6c42..d57e5b75b55353e5d6f200e26ed04c88b8b5d881 100644
GIT binary patch
delta 1722
zcmXYx2~5*h9LL{#rSPY;AcL|ZC@o05H@W;HKJ1@bm4P~TpcRW2CldsX2lI-iibpgV
zqfN*Do*716Ts+W}twaSColaxoIpY$|x~Kyuird&J=IvXx;gj$0c-Qaue-F<OIuHJm
z=@9RrMDO*1-V$@dnB2UqoV@HT^7>cwNv%0E$Gc^O`Np0$jqCZD@>DkSV#5uo=lIB;
ziQzptUAOx5yLJD?H2A!Z62F-a&-Rz*97^-|JLWU$^i|A$PF?<Tr`1SneS4Nx`C^yN
zjVUnb>=kvDdFEHE``pW(c!T<6fnRVe<Dsn|yw>j5>RYmWlqpPRTmpJ90K|jPVBg;L
z@xI{l!?eoZP!|<RH~Dw0bB9s8Ke1k;F?jMB{~UCHN50{kTP8HT%lL+=jBhnvvUWg6
zIjOA+S~Q*UglUZb2yK8K)KJ^CG@=kQA#IM!*5inYY5s&Q(M)Tf%edV?d~5GY=~}z_
zh@o;D`^H3rOq+~EeBcG6g1#IyM5S7~k2(Vfv^0fk50)~%UA+`eZ(6=WZ6D__z6b<h
zw?Z#Kd!Zws3)S`rT5K?(%E6%OEV0d3jS`jJr$U7<l$E-@veNynti;c_Y^@o`cqif)
z!6V>+p8=9lq!3oL>5M3iC8kuw-T*DRjGK|$39SdUU=rfbF?SvGANV7I_(O=Fpcg;_
zD9dG;d<u+YY)V?shnb)rOlSfe3v&1y(CdrvwRx`&G)a9S(G+(%+-^{fv{WN2Wl$m9
zq7d4Lc;<M<7XbS#SxG}o&l!&ljluD!z)r@TZ1@{sdob=A=zv|~AuiK;jY~8N;VeZB
zh!Mg_W5g=dts&9`LL{PBcSX{~d>01PPs9RPC}~3I0KK9H{!!R-ph0M~mGKW?bEp-%
z8nHF7zgB;Xq-nHAHR|Y4%PfWQw~#GDwh49;?5EILbYN@&<CSW;jwZQv2!9Iq1o+E_
zuLDhiJ_HVM3{_o)Hi9}du=Yd7Z%k&~=s*l}PlJC!mK}EjoCLifeG)qInAn<sCAPB|
ze*`pxYQ#OzL(mnI*$CbT<81`QmqOHpRK%by&ji8M)))!7k614-sg@`j=bko&@tNQY
zuzicHC~IWJgOc=x*blr9T&wXVmJnAza?du(3NsV38SzGN9i+d5vx3_OEDOIC_U{1u
zo=-2rxxhK_0*o$Zd>N<*9mP!bN6~b{6*#wn0q?RveHcZH=?XPNPm>0DOBh%2g2SQx
zBv<JHx1Pv~eVwd0)M`D=vg|@?KN#>H9{0dY)=cPBuoyIgD{8x*TDAQ!vsG%KakN%7
z8fZ$sV+P(CCOAQ&HbdGDU!M8$*yr>TAzNXuNAu7?(GL3#{wv%C5%^RC)ujenW4H@5
z2p)iL^^t)l;ksy}>B#(&*?4iY@UoCW``tf7=a=C=K=p`+dgUp{0RSP#`Uz=XONa-Q
zXmZs>(e$JA3JlAxmX%f`Q7SOC8Y~2h!1p>72;HpyiQVWu)e=KfN>5?&-C!-avp`lT
zQOx3RAr9NA?H)!y1)*8DoQ$_UmX%O!+-LW5@u6@($g?po4@1a)<Q#MGLcqL0Qw%+@
zkKPH4_tPWcgIk)X7OriY*F0m)K67Vtl+tQWjn{39-9ankbb6f{ae|h`HHNndOWw_4
z%si}MNos6(pCEzdC+K%arA?i(A{7u4D6D2f3%o(elDX=aH|<wPhgEe>ZeO`6qor&5
U;;zh-`8NwSN&TmH(w0^K1GXjt`Tzg`

delta 1753
zcmY+EYfw{16vuZr1VTtaglJGK32O0y3JTtU3%Nvm6;!N3K_Z|81+;B|An0g=s1!ed
zFsXB~&=EzeGxaqMHrAFITdhj^a>P1xY9G@MGgNWJDy<{h+kezAy_4Vk&pCT`@7Z&A
z)AED51;0od+d3&iGi&a=S({87ic9915?d{^$HmW2o|~8)mq1=VD~lZlLqcoA48z8N
zz9)a(wEmdV7I3_D$bKikAT~VWo5o*n6}ZdC@4KOO?aIw^8|d@|jlJ@1TXnHxPGVwQ
zoO@Z~N0Z%;bBh?Yx$^Qy{Y&#0H>+I*)@YaA>gTSrhU;jp>p(^6|4MN^t0)YyXw~WK
z9VN+z7e%->SKjlJ@wn=$VyFA+^Ai~Nsp_R_pkqKd(1S=|aP?GOrFQpTM^GT$;cngO
z^rM;X(0YYJ+mXU}C-8z1mvQfz)PpM-Z^~r6QQvF!LSwDe@(`M{g7N6(j1NE$LQg2D
z<@#hI5(6RUbG_ys#DZ41gByaGGP98JOt-P|e$6>O{f#N7z>oAiV^pTk$6_U_q+PVs
zb4*F2sIoho@uO0&KkYMqJfHE(M8>y)ORz6OZ$L+(^PyX%o&cJmoq}D>0Ht3Li(S&G
zsNlQ?my`>l<FFtOej<qBIbL&3664<?-Umj24SouU#NK4tjJ92rvqOn~He#=U&rE0*
z#y*5LgIcf(@c`&Ps2>nu%MWGwF7yV71{+OmE?*5J5-%m)m;Ln64kRB291C*zO=xi+
z{LthV1+9{vsc4k54DKUPjbYVhLEH$HWv9FbN)|Al3aUVQo*>RaOwSqD`EpSHYS@vO
zBf@Wj-GRK@zzaL8g%s)Q6h-oWSuV}S9(?N&M)n8PV&4j)O2wfe8mT>yMx<;(Li0i_
zfTWmIUjg^!8u%ArmqUl36U>Yk!d?o^fbK=C0rolRK_Hz>A4@tljWL#pj3;9>2cw5!
z$H0C9-GUBS(ipFh)~V@4=QxDh;9da?_6T&Qh4BZ#2F_wvKSA4p0}ZTQ!}u?Y88_x4
zhWxLAG9A|lYz0@rD2QK#j@%`d&O5~NE%HAFCqXsh9Z(OneleTD37iE$J|xREK9xhz
zmSLITL@RWJ+(&E_Op%O1G|ZW|gz;i<1hh4v<J$$X1zXZDWqcYa07csbF~LrXo?>ix
zw;(bDA+3nFgP%eCGSmugX|XK)i?II%c<<%-*H9Pu9t37Eo&??j&A^+%BzF*<s_lpK
zJBYw_TrLd+(F|HI#cSxqNgre}-i3=h7W$N!#369=o*<_06hxa;rlIqU$1!vkM6SY}
zp3rMfh310opdIu}JsN6Os$OSYl&F@5(OOBTrBNxi9NaTZu!0C>yy__Yg>O7B`;taQ
z$a}Es&^$Cy?uFftKZDyK44>*%sX|LPYX@Ntfno4S`cq3M;<zY->CBYeeDp65i}@hK
z&U?t%vKHq78jhH+S8eMUw*x}XJ|(1c2O%vWOCd^c2GioHWk^dX6U1&E5z8>O0#t%(
za7~StLz|=#yp0Y>#t<5neGQAB0F9u3lOR$e8svXu`D8k^3?Tb&;G1>Z%J})ag6NAS
zHUDA4hr;<F!=~rO5ONe_MFqJ2pxkpHgdXdngPsL$ddfelb5s49-I<H5TjRP6n$N{<
zLv*;hemy-%OTyGgI&G5w1-f=@^A(S5OzNA)4Aau=(V_m2WKY!v`qk+%JH8aeF=>Qc
z?=hUxmh595v5du}86VW;pXk4I<&byy=7#q(-*pta_MA3OA7pLH@ne^4%h>hSe<uzK
Ai~s-t

diff --git a/variants/adafruit_metro_esp32s3/variant.cpp b/variants/adafruit_metro_esp32s3/variant.cpp
index 485f08b4aef..811a6d508c9 100644
--- a/variants/adafruit_metro_esp32s3/variant.cpp
+++ b/variants/adafruit_metro_esp32s3/variant.cpp
@@ -30,8 +30,7 @@ extern "C" {
 
 // Initialize variant/board, called before setup()
 void initVariant(void) {
-  // default SD_CS to input pullup (we cannot have built in pullup since its
-  // a strapping pin!)
+  // default SD_CS to input pullup
   pinMode(SS, INPUT_PULLUP);
 }
 
diff --git a/variants/adafruit_qtpy_esp32/pins_arduino.h b/variants/adafruit_qtpy_esp32/pins_arduino.h
index b22d0d5b780..40cad9f7005 100644
--- a/variants/adafruit_qtpy_esp32/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32/pins_arduino.h
@@ -2,16 +2,19 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
+// Neopixel
+#define PIN_NEOPIXEL   5
+// 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 LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
 
-#define PIN_NEOPIXEL   5
 #define NEOPIXEL_POWER 8
 
 static const uint8_t TX = 32;
diff --git a/variants/adafruit_qtpy_esp32c3/pins_arduino.h b/variants/adafruit_qtpy_esp32c3/pins_arduino.h
index 6c93bfd5820..6b50bbddbd0 100644
--- a/variants/adafruit_qtpy_esp32c3/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32c3/pins_arduino.h
@@ -2,17 +2,20 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
-
-#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)
+#include "soc/soc_caps.h"
 
 #define BUTTON 9
+
+// Neopixel
 #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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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 = 21;
 static const uint8_t RX = 20;
diff --git a/variants/adafruit_qtpy_esp32s2/pins_arduino.h b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
index 4c9c1524732..aac8614875b 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
@@ -10,18 +10,15 @@
 #define USB_PRODUCT        "QT Py 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 analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
-//#define LED_BUILTIN     13
-
+// Neopixel
 #define PIN_NEOPIXEL        39
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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
diff --git a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
index 789161da4ad..f4082c5cb2c 100644
--- a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
@@ -10,14 +10,6 @@
 #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 analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 #define PIN_NEOPIXEL        39
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      38    // power pin
@@ -25,7 +17,8 @@
 
 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 LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
index 38305f67e36..e8f4ab08130 100644
--- a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
@@ -10,14 +10,6 @@
 #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 analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 #define PIN_NEOPIXEL        39
 #define NEOPIXEL_NUM        1     // number of neopixels
 #define NEOPIXEL_POWER      38    // power pin
@@ -25,7 +17,8 @@
 
 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 LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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_qualia_s3_rgb666/pins_arduino.h b/variants/adafruit_qualia_s3_rgb666/pins_arduino.h
index 120a50b91a6..62f04d1a620 100644
--- a/variants/adafruit_qualia_s3_rgb666/pins_arduino.h
+++ b/variants/adafruit_qualia_s3_rgb666/pins_arduino.h
@@ -10,14 +10,6 @@
 #define USB_PRODUCT        "Qualia ESP32-S3 RGB666"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       2
-
-#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<EXTERNAL_NUM_INTERRUPTS)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 static const uint8_t PCA_TFT_SCK = 0;
 static const uint8_t PCA_TFT_CS = 1;
 static const uint8_t PCA_TFT_RESET = 2;
diff --git a/variants/alksesp32/pins_arduino.h b/variants/alksesp32/pins_arduino.h
index a40501ab20d..79e4b0791e4 100644
--- a/variants/alksesp32/pins_arduino.h
+++ b/variants/alksesp32/pins_arduino.h
@@ -3,19 +3,11 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/atd147_s3/pins_arduino.h b/variants/atd147_s3/pins_arduino.h
index 5cbb1ebe3b3..0726a1c4a1c 100644
--- a/variants/atd147_s3/pins_arduino.h
+++ b/variants/atd147_s3/pins_arduino.h
@@ -2,19 +2,10 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#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)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/atmegazero_esp32s2/pins_arduino.h b/variants/atmegazero_esp32s2/pins_arduino.h
index 44df45e0b18..45fd447331d 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
@@ -9,15 +10,15 @@
 #define USB_PRODUCT "ATMZ-ESP32S2"
 #define USB_SERIAL ""
 
-#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)
-
 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  // allow testing #ifdef 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 PD5 = 0;
 
 static const uint8_t TX = 43;
diff --git a/variants/bpi-bit/pins_arduino.h b/variants/bpi-bit/pins_arduino.h
index f1ef3003662..80ff9c2746b 100644
--- a/variants/bpi-bit/pins_arduino.h
+++ b/variants/bpi-bit/pins_arduino.h
@@ -2,22 +2,22 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS 40
-#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)
+#include "soc/soc_caps.h"
 
 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/bpi_leaf_s3/pins_arduino.h b/variants/bpi_leaf_s3/pins_arduino.h
index 56876ce9c9d..45117347e2d 100644
--- a/variants/bpi_leaf_s3/pins_arduino.h
+++ b/variants/bpi_leaf_s3/pins_arduino.h
@@ -10,23 +10,18 @@
 #define USB_PRODUCT "BPI-Leaf-S3"
 #define USB_SERIAL ""
 
-#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 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
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+// 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/ch_denky/pins_arduino.h b/variants/ch_denky/pins_arduino.h
index 23a786e0e53..ac202d527db 100644
--- a/variants/ch_denky/pins_arduino.h
+++ b/variants/ch_denky/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..b21c5889a38 100644
--- a/variants/cnrs_aw2eth/pins_arduino.h
+++ b/variants/cnrs_aw2eth/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..6e9a4fa3ceb 100644
--- a/variants/connaxio_espoir/pins_arduino.h
+++ b/variants/connaxio_espoir/pins_arduino.h
@@ -8,14 +8,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 /* USB UART */
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/crabik_slot_esp32_s3/pins_arduino.h b/variants/crabik_slot_esp32_s3/pins_arduino.h
index 31aa9ee79cb..b5021d5cd03 100644
--- a/variants/crabik_slot_esp32_s3/pins_arduino.h
+++ b/variants/crabik_slot_esp32_s3/pins_arduino.h
@@ -9,17 +9,9 @@
 #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 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 = 21;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..cf75fa6b0ac 100644
--- a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
+++ b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
@@ -10,23 +10,14 @@
 #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 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 = 2;                           // Status LED.
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 static const uint8_t RGB_BUILTIN = SOC_GPIO_PIN_COUNT + 46;     // RGB LED.
+#define RGB_BUILTIN RGB_BUILTIN  // necessary to make digitalWrite/digitalMode find it
+#define RGB_BRIGHTNESS 64
 
-#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/d-duino-32/pins_arduino.h b/variants/d-duino-32/pins_arduino.h
index 579cdfac77b..935261996b1 100644
--- a/variants/d-duino-32/pins_arduino.h
+++ b/variants/d-duino-32/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..1b507cde1fd 100644
--- a/variants/d1_mini32/pins_arduino.h
+++ b/variants/d1_mini32/pins_arduino.h
@@ -6,7 +6,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..6f46d419c83 100644
--- a/variants/d1_uno32/pins_arduino.h
+++ b/variants/d1_uno32/pins_arduino.h
@@ -5,15 +5,6 @@
 
 #include <stdint.h>
 
-
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
@@ -34,7 +25,7 @@ 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 LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 #define PIN_WIRE_SDA SDA // backward compatibility
 #define PIN_WIRE_SCL SCL // backward compatibility
diff --git a/variants/d32/d32_core.h b/variants/d32/d32_core.h
index 0416719f2cb..e658c980896 100644
--- a/variants/d32/d32_core.h
+++ b/variants/d32/d32_core.h
@@ -1,14 +1,6 @@
 #ifndef _D32_CORE_H_
 #define _D32_CORE_H_
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..e517def5e8f 100644
--- a/variants/d32/pins_arduino.h
+++ b/variants/d32/pins_arduino.h
@@ -6,7 +6,7 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..da7c14bc389 100644
--- a/variants/d32_pro/pins_arduino.h
+++ b/variants/d32_pro/pins_arduino.h
@@ -6,7 +6,8 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..587f92433fa 100644
--- a/variants/deneyapkart/pins_arduino.h
+++ b/variants/deneyapkart/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 4;
-#define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..edac64ac794 100644
--- a/variants/deneyapkart1A/pins_arduino.h
+++ b/variants/deneyapkart1A/pins_arduino.h
@@ -4,17 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13;
-#define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13; //D12
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGBLED      LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/deneyapkart1Av2/pins_arduino.h b/variants/deneyapkart1Av2/pins_arduino.h
index 24928d48422..34d84b057cf 100644
--- a/variants/deneyapkart1Av2/pins_arduino.h
+++ b/variants/deneyapkart1Av2/pins_arduino.h
@@ -10,17 +10,9 @@
 #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 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 = SOC_GPIO_PIN_COUNT+48;
-#define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48; //D9
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..817f63affc1 100644
--- a/variants/deneyapkartg/pins_arduino.h
+++ b/variants/deneyapkartg/pins_arduino.h
@@ -10,17 +10,9 @@
 #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 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 LED_BUILTIN = SOC_GPIO_PIN_COUNT+10;
-#define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+10; //D3
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..b4f8b71e05f 100644
--- a/variants/deneyapmini/pins_arduino.h
+++ b/variants/deneyapmini/pins_arduino.h
@@ -9,17 +9,9 @@
 #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 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
-#define LED_BUILTIN LED_BUILTIN
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..98ef80732f8 100644
--- a/variants/deneyapminiv2/pins_arduino.h
+++ b/variants/deneyapminiv2/pins_arduino.h
@@ -10,17 +10,9 @@
 #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 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 = SOC_GPIO_PIN_COUNT+33;
-#define BUILTIN_LED LED_BUILTIN
-#define LED_BUILTIN LED_BUILTIN
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+33; //D14
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGBLED      LED_BUILTIN
 #define RGB_BRIGHTNESS 64
diff --git a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
index c0e29e53a7a..67427d7e516 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
@@ -10,18 +10,16 @@
 #define USB_PRODUCT        "MiniMain ESP32-S2"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-#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 LED_BUILTIN     13
-
+// Neopixel
 #define PIN_NEOPIXEL        33
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+#define RGB_BUILTIN (PIN_NEOPIXEL+SOC_GPIO_PIN_COUNT)
+#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/dfrobot_beetle_esp32c3/pins_arduino.h b/variants/dfrobot_beetle_esp32c3/pins_arduino.h
index 735f894281f..abf093cfccb 100644
--- a/variants/dfrobot_beetle_esp32c3/pins_arduino.h
+++ b/variants/dfrobot_beetle_esp32c3/pins_arduino.h
@@ -9,16 +9,9 @@
 #define USB_PRODUCT        "Beetle ESP32-C3"
 #define USB_SERIAL         "" // Empty string for MAC adddress
 
-
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
-
-#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 LED_BUILTIN = 10;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
diff --git a/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h b/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
index 2e74381453a..335beebf32b 100644
--- a/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
+++ b/variants/dfrobot_firebeetle2_esp32e/pins_arduino.h
@@ -3,21 +3,11 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 typedef unsigned char uint8_t;
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
-
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h b/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h
index 91e164478b2..012596b01af 100644
--- a/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h
+++ b/variants/dfrobot_firebeetle2_esp32s3/pins_arduino.h
@@ -9,15 +9,6 @@
 #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 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;
 
@@ -50,6 +41,8 @@ static const uint8_t D13 = 21;
 static const uint8_t D14 = 47;
 
 static const uint8_t LED_BUILTIN = D13;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 
 static const uint8_t T1 = 1;
diff --git a/variants/dfrobot_romeo_esp32s3/pins_arduino.h b/variants/dfrobot_romeo_esp32s3/pins_arduino.h
index 1c16f6e9f65..40774c71ddf 100644
--- a/variants/dfrobot_romeo_esp32s3/pins_arduino.h
+++ b/variants/dfrobot_romeo_esp32s3/pins_arduino.h
@@ -3,17 +3,6 @@
 
 #include <stdint.h>
 
-
-
-#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)
-
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/doitESP32devkitV1/pins_arduino.h b/variants/doitESP32devkitV1/pins_arduino.h
index 69e4138428f..467c58c0034 100644
--- a/variants/doitESP32devkitV1/pins_arduino.h
+++ b/variants/doitESP32devkitV1/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..afd5dbe6aab 100644
--- a/variants/doitESPduino32/pins_arduino.h
+++ b/variants/doitESPduino32/pins_arduino.h
@@ -3,16 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 
 static const uint8_t SDA = 21;
diff --git a/variants/dpu_esp32/pins_arduino.h b/variants/dpu_esp32/pins_arduino.h
index ff6cb1e9ba4..1b2e1b6634f 100644
--- a/variants/dpu_esp32/pins_arduino.h
+++ b/variants/dpu_esp32/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..fb715c0e79e 100644
--- a/variants/esp32-devkit-lipo/pins_arduino.h
+++ b/variants/esp32-devkit-lipo/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..43691f02c7b 100644
--- a/variants/esp32-evb/pins_arduino.h
+++ b/variants/esp32-evb/pins_arduino.h
@@ -3,15 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
-
 static const uint8_t KEY_BUILTIN = 34;
 
 static const uint8_t TX = 1;
diff --git a/variants/esp32-gateway/pins_arduino.h b/variants/esp32-gateway/pins_arduino.h
index 5dd5d7e0fd9..1ba5fd0bfe9 100644
--- a/variants/esp32-gateway/pins_arduino.h
+++ b/variants/esp32-gateway/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 #if	defined (ARDUINO_ESP32_GATEWAY_E) || defined (ARDUINO_ESP32_GATEWAY_F)
 #define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
 #define ETH_PHY_POWER 5
@@ -18,7 +10,7 @@
 
 static const uint8_t LED_BUILTIN = 33;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..b9033d74cfe 100644
--- a/variants/esp32-poe-iso/pins_arduino.h
+++ b/variants/esp32-poe-iso/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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 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..b9033d74cfe 100644
--- a/variants/esp32-poe/pins_arduino.h
+++ b/variants/esp32-poe/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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 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..222046998dc 100644
--- a/variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h
+++ b/variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h
@@ -4,15 +4,8 @@
 #include <stdint.h>
 
 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 analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p) (p < 34)
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 #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..0a468d58856 100644
--- a/variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h
+++ b/variants/esp32-trueverit-iot-driver-mkiii/pins_arduino.h
@@ -4,15 +4,8 @@
 #include <stdint.h>
 
 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 analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p) (p < 34)
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 #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..da4ef3ce633 100644
--- a/variants/esp32-trueverit-iot-driver/pins_arduino.h
+++ b/variants/esp32-trueverit-iot-driver/pins_arduino.h
@@ -4,15 +4,8 @@
 #include <stdint.h>
 
 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 analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p) (p < 34)
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 #define TX1 12
 #define RX1 13
diff --git a/variants/esp32/pins_arduino.h b/variants/esp32/pins_arduino.h
index 4ad96ccef51..27ecc063483 100644
--- a/variants/esp32/pins_arduino.h
+++ b/variants/esp32/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..a7091aa09b2 100644
--- a/variants/esp320/pins_arduino.h
+++ b/variants/esp320/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 11
-#define NUM_DIGITAL_PINS        12
-#define NUM_ANALOG_INPUTS       5
-
-#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 = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/esp32_s3r8n16/pins_arduino.h b/variants/esp32_s3r8n16/pins_arduino.h
index 919765a7583..ba3f1908875 100644
--- a/variants/esp32_s3r8n16/pins_arduino.h
+++ b/variants/esp32_s3r8n16/pins_arduino.h
@@ -2,7 +2,6 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
@@ -10,14 +9,6 @@
 #define USB_PRODUCT 		"4D Systems gen4-ESP32 16MB Modules (ESP32-S3R8n16)"
 //#define USB_CLASS 2
 
-#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)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h
index ab28240d4b4..71318e27cf9 100644
--- a/variants/esp32c3/pins_arduino.h
+++ b/variants/esp32c3/pins_arduino.h
@@ -4,20 +4,15 @@
 #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+8;
+#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
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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 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 = 21;
 static const uint8_t RX = 20;
 
diff --git a/variants/esp32c6/pins_arduino.h b/variants/esp32c6/pins_arduino.h
index 3946cd8a8f3..b551983d7fe 100644
--- a/variants/esp32c6/pins_arduino.h
+++ b/variants/esp32c6/pins_arduino.h
@@ -4,20 +4,15 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 24
-#define NUM_DIGITAL_PINS        24
-#define NUM_ANALOG_INPUTS       7
-
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+8;
+#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
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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 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 = 16;
 static const uint8_t RX = 17;
 
diff --git a/variants/esp32da/pins_arduino.h b/variants/esp32da/pins_arduino.h
index 14c1e548615..7e8a27cbf54 100644
--- a/variants/esp32da/pins_arduino.h
+++ b/variants/esp32da/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/esp32h2/pins_arduino.h b/variants/esp32h2/pins_arduino.h
index dda584ccb49..93a02871090 100644
--- a/variants/esp32h2/pins_arduino.h
+++ b/variants/esp32h2/pins_arduino.h
@@ -4,20 +4,15 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 28
-#define NUM_DIGITAL_PINS        28
-#define NUM_ANALOG_INPUTS       5
-
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+8;
+#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
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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 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 = 24;
 static const uint8_t RX = 23;
 
diff --git a/variants/esp32micromod/pins_arduino.h b/variants/esp32micromod/pins_arduino.h
index abf2735e4a2..b31f20dbea5 100755
--- a/variants/esp32micromod/pins_arduino.h
+++ b/variants/esp32micromod/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
@@ -71,5 +63,7 @@ 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/esp32s2/pins_arduino.h b/variants/esp32s2/pins_arduino.h
index 4ab0f712042..ea68934a69b 100644
--- a/variants/esp32s2/pins_arduino.h
+++ b/variants/esp32s2/pins_arduino.h
@@ -4,21 +4,18 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
-
-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
+// GPIO pin for Saola-1 & DevKitM-1 = 18
+#define PIN_NEOPIXEL        18
+// GPIO pin for Kaluga = 45
+//#define PIN_NEOPIXEL 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
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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 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/esp32s2thing_plus/pins_arduino.h b/variants/esp32s2thing_plus/pins_arduino.h
index 219f357981e..d5c4510aa5d 100644
--- a/variants/esp32s2thing_plus/pins_arduino.h
+++ b/variants/esp32s2thing_plus/pins_arduino.h
@@ -9,16 +9,9 @@
 #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 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 = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/esp32s2usb/pins_arduino.h b/variants/esp32s2usb/pins_arduino.h
index c6d464b79b4..636c62482a0 100644
--- a/variants/esp32s2usb/pins_arduino.h
+++ b/variants/esp32s2usb/pins_arduino.h
@@ -19,15 +19,6 @@
 #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 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/esp32s3/pins_arduino.h b/variants/esp32s3/pins_arduino.h
index d746573aa94..339b47df0b4 100644
--- a/variants/esp32s3/pins_arduino.h
+++ b/variants/esp32s3/pins_arduino.h
@@ -7,22 +7,18 @@
 #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 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
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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 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/esp32s3box/pins_arduino.h b/variants/esp32s3box/pins_arduino.h
index 3ed655d1d3f..115ded2a2ec 100644
--- a/variants/esp32s3box/pins_arduino.h
+++ b/variants/esp32s3box/pins_arduino.h
@@ -6,14 +6,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#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)
-
 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..9580091dd3a 100644
--- a/variants/esp32s3camlcd/pins_arduino.h
+++ b/variants/esp32s3camlcd/pins_arduino.h
@@ -6,14 +6,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#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)
-
 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..1983c45d1a4 100644
--- a/variants/esp32s3usbotg/pins_arduino.h
+++ b/variants/esp32s3usbotg/pins_arduino.h
@@ -6,14 +6,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#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)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/esp32thing/pins_arduino.h b/variants/esp32thing/pins_arduino.h
index 2ab5614033f..68178cc2296 100644
--- a/variants/esp32thing/pins_arduino.h
+++ b/variants/esp32thing/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..9b4b1e25147 100644
--- a/variants/esp32thing_plus/pins_arduino.h
+++ b/variants/esp32thing_plus/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..fbfe934a698 100644
--- a/variants/esp32thing_plus_c/pins_arduino.h
+++ b/variants/esp32thing_plus_c/pins_arduino.h
@@ -4,20 +4,13 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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_BUILTIN RGB_BUILTIN  // necessary to make digitalWrite/digitalMode find it
 #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..fd196bdf34f 100644
--- a/variants/esp32vn-iot-uno/pins_arduino.h
+++ b/variants/esp32vn-iot-uno/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/esp_c3_m1_i_kit/pins_arduino.h b/variants/esp_c3_m1_i_kit/pins_arduino.h
index 0a1a0fe9fe8..8f5f433fea3 100644
--- a/variants/esp_c3_m1_i_kit/pins_arduino.h
+++ b/variants/esp_c3_m1_i_kit/pins_arduino.h
@@ -8,14 +8,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
-
-#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)
-
 // User LEDs are also connected to USB D- and D+
 static const uint8_t LED_WARM = 18;
 static const uint8_t LED_COLD = 19;
@@ -27,6 +19,7 @@ static const uint8_t LED_BLUE = 5;
 
 static const uint8_t LED_BUILTIN = LED_WARM;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 // Standard ESP32-C3 GPIOs
 static const uint8_t TX = 21;
diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h
index 37985c2b476..2a27157366f 100644
--- a/variants/espea32/pins_arduino.h
+++ b/variants/espea32/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..449b79247ac 100644
--- a/variants/espectro32/pins_arduino.h
+++ b/variants/espectro32/pins_arduino.h
@@ -7,17 +7,9 @@
 #define ESPECTRO32_VERSION 1
 #endif 
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 15;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..571912b7ee9 100644
--- a/variants/espino32/pins_arduino.h
+++ b/variants/espino32/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        38
-#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)
-
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..bc7c2dc6656 100644
--- a/variants/feather_esp32/pins_arduino.h
+++ b/variants/feather_esp32/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..7fd4a527975 100644
--- a/variants/firebeetle32/pins_arduino.h
+++ b/variants/firebeetle32/pins_arduino.h
@@ -3,21 +3,11 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 typedef unsigned char uint8_t;
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
-
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..b0cc94038f6 100644
--- a/variants/fm-devkit/pins_arduino.h
+++ b/variants/fm-devkit/pins_arduino.h
@@ -3,19 +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)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
 // IO
 static const uint8_t LED_BUILTIN = 5;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 static const uint8_t SW1 = 4;
 static const uint8_t SW2 = 18;
 static const uint8_t SW3 = 19;
diff --git a/variants/franzininho_wifi_esp32s2/pins_arduino.h b/variants/franzininho_wifi_esp32s2/pins_arduino.h
index dd287f417d0..4a07156d0c3 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
@@ -10,15 +11,14 @@
 #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 analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 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  // allow testing #ifdef 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 = 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..0589ad421d2 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
@@ -17,15 +18,14 @@
 #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 analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
 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  // allow testing #ifdef 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 = 43;
 static const uint8_t RX = 44;
diff --git a/variants/frog32/pins_arduino.h b/variants/frog32/pins_arduino.h
index 4ad96ccef51..27ecc063483 100644
--- a/variants/frog32/pins_arduino.h
+++ b/variants/frog32/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..255363ce5c7 100644
--- a/variants/gpy/pins_arduino.h
+++ b/variants/gpy/pins_arduino.h
@@ -2,14 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       18
-
-#define analogInputToDigitalPin(p)  (((p)<40)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#include "soc/soc_caps.h"
 
 // Sequans Monarch LTE Cat M1/NB1 modem
 // NOTE: The Pycom pinout as well as spec sheet block diagram / pin details
@@ -22,9 +15,14 @@
 #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 + SOC_GPIO_PIN_COUNT; 
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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 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..69471053402 100644
--- a/variants/healthypi4/pins_arduino.h
+++ b/variants/healthypi4/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 15;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..a164f9e153a 100644
--- a/variants/heltec_wifi_kit_32/pins_arduino.h
+++ b/variants/heltec_wifi_kit_32/pins_arduino.h
@@ -7,17 +7,9 @@
 #define DISPLAY_HEIGHT 64
 #define DISPLAY_WIDTH  128
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/heltec_wifi_kit_32_v3/pins_arduino.h b/variants/heltec_wifi_kit_32_V3/pins_arduino.h
similarity index 84%
rename from variants/heltec_wifi_kit_32_v3/pins_arduino.h
rename to variants/heltec_wifi_kit_32_V3/pins_arduino.h
index 6e889604dd8..c64fe199860 100644
--- a/variants/heltec_wifi_kit_32_v3/pins_arduino.h
+++ b/variants/heltec_wifi_kit_32_V3/pins_arduino.h
@@ -7,17 +7,9 @@
 #define DISPLAY_HEIGHT 64
 #define DISPLAY_WIDTH  128
 
-#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)
-
 static const uint8_t LED_BUILTIN = 35;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..b702b97f437 100644
--- a/variants/heltec_wifi_lora_32/pins_arduino.h
+++ b/variants/heltec_wifi_lora_32/pins_arduino.h
@@ -7,17 +7,9 @@
 #define DISPLAY_HEIGHT 64
 #define DISPLAY_WIDTH  128
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..d316145b8c6 100644
--- a/variants/heltec_wifi_lora_32_V2/pins_arduino.h
+++ b/variants/heltec_wifi_lora_32_V2/pins_arduino.h
@@ -7,17 +7,9 @@
 #define DISPLAY_HEIGHT 64
 #define DISPLAY_WIDTH  128
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..bd0d35a8912 100644
--- a/variants/heltec_wifi_lora_32_V3/pins_arduino.h
+++ b/variants/heltec_wifi_lora_32_V3/pins_arduino.h
@@ -2,7 +2,6 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #define WIFI_LoRa_32_V3 true
 #define DISPLAY_HEIGHT 64
@@ -11,22 +10,9 @@
 #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;
+static const uint8_t LED_BUILTIN = 35;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-#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 LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/heltec_wireless_stick/pins_arduino.h b/variants/heltec_wireless_stick/pins_arduino.h
index a1c4eec28c8..0910fcc7672 100644
--- a/variants/heltec_wireless_stick/pins_arduino.h
+++ b/variants/heltec_wireless_stick/pins_arduino.h
@@ -7,17 +7,9 @@
 #define DISPLAY_HEIGHT 32
 #define DISPLAY_WIDTH  64
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..ec4bac483de 100644
--- a/variants/heltec_wireless_stick_lite/pins_arduino.h
+++ b/variants/heltec_wireless_stick_lite/pins_arduino.h
@@ -7,17 +7,9 @@
 #define DISPLAY_HEIGHT 0
 #define DISPLAY_WIDTH  0
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..bf6cf207660 100644
--- a/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
+++ b/variants/heltec_wireless_stick_lite_v3/pins_arduino.h
@@ -7,17 +7,9 @@
 #define DISPLAY_HEIGHT 0
 #define DISPLAY_WIDTH  0
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       15
-
-#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 = 35;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/honeylemon/pins_arduino.h b/variants/honeylemon/pins_arduino.h
index 0156f5d3254..044dad7f269 100644
--- a/variants/honeylemon/pins_arduino.h
+++ b/variants/honeylemon/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        38
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..a868a7edffa 100644
--- a/variants/hornbill32dev/pins_arduino.h
+++ b/variants/hornbill32dev/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..a8fb52c60f7 100644
--- a/variants/hornbill32minima/pins_arduino.h
+++ b/variants/hornbill32minima/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..338b9151f7d 100644
--- a/variants/imbrios-logsens-v1p1/pins_arduino.h
+++ b/variants/imbrios-logsens-v1p1/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        9
-#define NUM_ANALOG_INPUTS       7
-
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
-
 // Renaming few signals
 #define SPI_CLK	SCK			// IO14
 #define SPI_MISO	MISO			// IO12
@@ -22,8 +14,8 @@
 
 /* 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
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..a0e8db822e8 100644
--- a/variants/intorobot-fig/pins_arduino.h
+++ b/variants/intorobot-fig/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        7
-#define NUM_ANALOG_INPUTS       10
-
-#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 = 4;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t RGB_R_BUILTIN = 27;
 static const uint8_t RGB_G_BUILTIN = 21;
diff --git a/variants/ioxesp32/pins_arduino.h b/variants/ioxesp32/pins_arduino.h
index 37985c2b476..2a27157366f 100644
--- a/variants/ioxesp32/pins_arduino.h
+++ b/variants/ioxesp32/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/lilygo_t_display/pins_arduino.h b/variants/lilygo_t_display/pins_arduino.h
index 87edf8ccd32..beae4b311c6 100644
--- a/variants/lilygo_t_display/pins_arduino.h
+++ b/variants/lilygo_t_display/pins_arduino.h
@@ -9,14 +9,6 @@
 #define USB_PRODUCT "T-Display"
 #define USB_SERIAL ""
 
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
@@ -64,4 +56,4 @@ static const uint8_t VBAT = 34;
 static const uint8_t RIGHT_BUTTON = 35;
 static const uint8_t LEFT_BUTTON = 0;
 
-#endif /* Pins_Arduino_h */
+#endif /* Pins_Arduino_h */
\ No newline at end of file
diff --git a/variants/lilygo_t_display_s3/pins_arduino.h b/variants/lilygo_t_display_s3/pins_arduino.h
index 099bdad5876..42b01587c39 100644
--- a/variants/lilygo_t_display_s3/pins_arduino.h
+++ b/variants/lilygo_t_display_s3/pins_arduino.h
@@ -2,19 +2,10 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#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)
-
 static const uint8_t BUTTON_1 = 0;
 static const uint8_t BUTTON_2 = 14;
 static const uint8_t BAT_VOLT = 4;
diff --git a/variants/lionbit/pins_arduino.h b/variants/lionbit/pins_arduino.h
index b7f5825079a..25d7bc1765c 100644
--- a/variants/lionbit/pins_arduino.h
+++ b/variants/lionbit/pins_arduino.h
@@ -3,15 +3,10 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS 40
-#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)
-
 static const uint8_t LED_BUILTIN = 0; // GPIO0, ADC2_CH1, TOUCH1, RTC_GPIO11, CLK_OUT1,EMAC_TX_CLK
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 static const uint8_t SWITCH_A = 2;    //  GPIO2, ADC2_CH2, TOUCH2, RTC_GPIO12, HSPIWP, HS2_DATA0,SD_DATA0
 static const uint8_t SWITCH_B = 4;    //  GPIO4, ADC2_CH0, TOUCH0, RTC_GPIO10, HSPIHD, HS2_DATA1,SD_DATA1, EMAC_TX_ER
 
diff --git a/variants/lionbits3/pins_arduino.h b/variants/lionbits3/pins_arduino.h
index 1428b1507c5..f7817d8340d 100644
--- a/variants/lionbits3/pins_arduino.h
+++ b/variants/lionbits3/pins_arduino.h
@@ -3,15 +3,10 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS 40
-#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)
-
 static const uint8_t LED_BUILTIN = 0;  //GPIO0, 
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 static const uint8_t SWITCH_A = 46;    //GPIO46, 
 static const uint8_t SWITCH_B = 47;    //GPIO47, 
 //Wifi and Bluetooth LEDs
diff --git a/variants/lolin32-lite/pins_arduino.h b/variants/lolin32-lite/pins_arduino.h
index 883695dfcf1..6aa497a8575 100755
--- a/variants/lolin32-lite/pins_arduino.h
+++ b/variants/lolin32-lite/pins_arduino.h
@@ -3,19 +3,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t SDA = 19;
 static const uint8_t SCL = 23;
diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h
index f38be67cc58..cba6162b645 100644
--- a/variants/lolin32/pins_arduino.h
+++ b/variants/lolin32/pins_arduino.h
@@ -3,19 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
-
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/lolin_c3_mini/pins_arduino.h b/variants/lolin_c3_mini/pins_arduino.h
index 59889448572..842683330cd 100644
--- a/variants/lolin_c3_mini/pins_arduino.h
+++ b/variants/lolin_c3_mini/pins_arduino.h
@@ -3,16 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
-
-#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 LED_BUILTIN = 7;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
diff --git a/variants/lolin_s2_mini/pins_arduino.h b/variants/lolin_s2_mini/pins_arduino.h
index 7b4596ef6a2..558e2e02a23 100644
--- a/variants/lolin_s2_mini/pins_arduino.h
+++ b/variants/lolin_s2_mini/pins_arduino.h
@@ -18,16 +18,9 @@
 #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 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 = 15;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 39;
 static const uint8_t RX = 37;
diff --git a/variants/lolin_s2_pico/pins_arduino.h b/variants/lolin_s2_pico/pins_arduino.h
index 10f0a9e7987..325e11ecff1 100644
--- a/variants/lolin_s2_pico/pins_arduino.h
+++ b/variants/lolin_s2_pico/pins_arduino.h
@@ -18,16 +18,9 @@
 #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 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 = 10;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 38;
 static const uint8_t RX = 33;
diff --git a/variants/lolin_s3/pins_arduino.h b/variants/lolin_s3/pins_arduino.h
index 6fa2e396176..d058630b69d 100644
--- a/variants/lolin_s3/pins_arduino.h
+++ b/variants/lolin_s3/pins_arduino.h
@@ -7,21 +7,12 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       18
-
-
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+38;
+static const uint8_t LED_BUILTIN = 38+SOC_GPIO_PIN_COUNT;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p)  (((p)<18)?(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 8a5e6ca866c..8c8b5c93854 100644
--- a/variants/lolin_s3_mini/pins_arduino.h
+++ b/variants/lolin_s3_mini/pins_arduino.h
@@ -2,25 +2,17 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x8167
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       18
-
-
-static const uint8_t LED_BUILTIN = 47;
+static const uint8_t LED_BUILTIN = 47+SOC_GPIO_PIN_COUNT;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 #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 a70e31b74d8..6a3259ed6e8 100644
--- a/variants/lolin_s3_pro/pins_arduino.h
+++ b/variants/lolin_s3_pro/pins_arduino.h
@@ -2,25 +2,17 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x8161
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       18
-
-
-static const uint8_t LED_BUILTIN = 38;
+static const uint8_t LED_BUILTIN = 38+SOC_GPIO_PIN_COUNT;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 #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/lopy/pins_arduino.h b/variants/lopy/pins_arduino.h
index 235f209825a..2c44d12d06b 100644
--- a/variants/lopy/pins_arduino.h
+++ b/variants/lopy/pins_arduino.h
@@ -2,14 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       18
-
-#define analogInputToDigitalPin(p)  (((p)<40)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#include "soc/soc_caps.h"
 
 // SPI LoRa Radio
 #define LORA_SCK 5      // GPIO5  - SX1276 SCK
@@ -22,9 +15,14 @@
 #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+SOC_GPIO_PIN_COUNT; 
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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 ANT_SELECT 16   // GPIO16 - External Antenna Switch
 
diff --git a/variants/lopy4/pins_arduino.h b/variants/lopy4/pins_arduino.h
index 723d3fa8c3c..ba89a4b401f 100644
--- a/variants/lopy4/pins_arduino.h
+++ b/variants/lopy4/pins_arduino.h
@@ -2,14 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       18
-
-#define analogInputToDigitalPin(p)  (((p)<40)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
+#include "soc/soc_caps.h"
 
 // SPI LoRa Radio
 #define LORA_SCK 5      // GPIO5  - SX1276 SCK
@@ -22,9 +15,14 @@
 #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+SOC_GPIO_PIN_COUNT; 
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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 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..00f3d130743 100644
--- a/variants/m5stack_atom/pins_arduino.h
+++ b/variants/m5stack_atom/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_atoms3/pins_arduino.h b/variants/m5stack_atoms3/pins_arduino.h
index 8af4ef2e53d..4da5a93b978 100644
--- a/variants/m5stack_atoms3/pins_arduino.h
+++ b/variants/m5stack_atoms3/pins_arduino.h
@@ -7,24 +7,12 @@
 #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 BUILTIN_LED    LED_BUILTIN  // backward compatibility
-#define LED_BUILTIN    LED_BUILTIN
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 35;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 #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_core2/pins_arduino.h b/variants/m5stack_core2/pins_arduino.h
index 895c7c0de2a..c5ea5d78eee 100644
--- a/variants/m5stack_core2/pins_arduino.h
+++ b/variants/m5stack_core2/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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 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..1984ab6bc6e 100644
--- a/variants/m5stack_core_esp32/pins_arduino.h
+++ b/variants/m5stack_core_esp32/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #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)
-
 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..84c0903c166 100644
--- a/variants/m5stack_coreink/pins_arduino.h
+++ b/variants/m5stack_coreink/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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 TX2 14
 #define RX2 13
 
diff --git a/variants/m5stack_cores3/pins_arduino.h b/variants/m5stack_cores3/pins_arduino.h
index c8c979abe69..fd6e5b886d3 100644
--- a/variants/m5stack_cores3/pins_arduino.h
+++ b/variants/m5stack_cores3/pins_arduino.h
@@ -2,28 +2,11 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #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 BUILTIN_LED    LED_BUILTIN  // backward compatibility
-#define LED_BUILTIN    LED_BUILTIN
-#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)
+// CoreS3 has no builtin LED / NeoLED
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/m5stack_fire/pins_arduino.h b/variants/m5stack_fire/pins_arduino.h
index 8b86a0d6fdc..1984ab6bc6e 100644
--- a/variants/m5stack_fire/pins_arduino.h
+++ b/variants/m5stack_fire/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #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)
-
 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..705890facea 100644
--- a/variants/m5stack_stamp_pico/pins_arduino.h
+++ b/variants/m5stack_stamp_pico/pins_arduino.h
@@ -3,15 +3,6 @@
 
 #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)
-
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_stamp_s3/pins_arduino.h b/variants/m5stack_stamp_s3/pins_arduino.h
index 510a459b11d..999d8c753a5 100644
--- a/variants/m5stack_stamp_s3/pins_arduino.h
+++ b/variants/m5stack_stamp_s3/pins_arduino.h
@@ -2,20 +2,10 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #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)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/m5stack_station/pins_arduino.h b/variants/m5stack_station/pins_arduino.h
index 9ba182b90b5..3a5812e3262 100644
--- a/variants/m5stack_station/pins_arduino.h
+++ b/variants/m5stack_station/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #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)
-
 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..f26bac1482c 100644
--- a/variants/m5stack_timer_cam/pins_arduino.h
+++ b/variants/m5stack_timer_cam/pins_arduino.h
@@ -3,16 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/m5stick_c/pins_arduino.h b/variants/m5stick_c/pins_arduino.h
index e4d73f6a2e3..35092416486 100644
--- a/variants/m5stick_c/pins_arduino.h
+++ b/variants/m5stick_c/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..0e91fa211a0 100644
--- a/variants/magicbit/pins_arduino.h
+++ b/variants/magicbit/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
@@ -66,6 +58,9 @@ static const uint8_t MOTOR1A = 27;
 static const uint8_t MOTOR1B = 18;
 static const uint8_t MOTOR2A = 16;
 static const uint8_t MOTOR2B = 17;
+
 static const uint8_t LED_BUILTIN=16;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/metro_esp-32/pins_arduino.h b/variants/metro_esp-32/pins_arduino.h
index 6675823c50e..cc13c5f6ffc 100644
--- a/variants/metro_esp-32/pins_arduino.h
+++ b/variants/metro_esp-32/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..84de808ee08 100644
--- a/variants/mgbot-iotik32a/pins_arduino.h
+++ b/variants/mgbot-iotik32a/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 4;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..81ee34f16e5 100644
--- a/variants/mgbot-iotik32b/pins_arduino.h
+++ b/variants/mgbot-iotik32b/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..467c58c0034 100644
--- a/variants/mhetesp32devkit/pins_arduino.h
+++ b/variants/mhetesp32devkit/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
-#define BUILTIN_LED  LED_BUILTIN 
-#define LED_BUILTIN LED_BUILTIN
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..467c58c0034 100644
--- a/variants/mhetesp32minikit/pins_arduino.h
+++ b/variants/mhetesp32minikit/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
-#define BUILTIN_LED  LED_BUILTIN 
-#define LED_BUILTIN LED_BUILTIN
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/micro_s2/pins_arduino.h b/variants/micro_s2/pins_arduino.h
index 389e51d9772..18fd2685b80 100644
--- a/variants/micro_s2/pins_arduino.h
+++ b/variants/micro_s2/pins_arduino.h
@@ -9,14 +9,6 @@
 #define USB_PRODUCT "microS2"
 #define USB_SERIAL ""
 
-#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)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
@@ -70,8 +62,14 @@ static const uint8_t DAC1 = 17;
 static const uint8_t DAC2 = 18;
 
 static const uint8_t LED_BUILTIN =  21;
-#define BUILTIN_LED  LED_BUILTIN    // backward compatibility
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 static const uint8_t PIXEL_BUILTIN = 33;
+// 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
+
 static const uint8_t BUTTON_BUILTIN = 0;
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/mpython/pins_arduino.h b/variants/mpython/pins_arduino.h
index 301700d6355..5f17b4ad1e3 100644
--- a/variants/mpython/pins_arduino.h
+++ b/variants/mpython/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/namino_arancio/pins_arduino.h b/variants/namino_arancio/pins_arduino.h
index 6f1972a4b5b..7cf807c014b 100644
--- a/variants/namino_arancio/pins_arduino.h
+++ b/variants/namino_arancio/pins_arduino.h
@@ -6,20 +6,12 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
 #define NAMINO_ARANCIO_BOARD
 
-#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)
-
 /* Begin Pins on ESP32-S3-WROOM-1U-N4R8 */
 static const uint8_t GPIO4       = 4;
 static const uint8_t GPIO5       = 5;
diff --git a/variants/namino_rosso/pins_arduino.h b/variants/namino_rosso/pins_arduino.h
index 01131927a6a..c5e9524a42e 100644
--- a/variants/namino_rosso/pins_arduino.h
+++ b/variants/namino_rosso/pins_arduino.h
@@ -6,20 +6,12 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
 #define NAMINO_ROSSO_BOARD
 
-#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)
-
 /* Begin Pins on ESP32-S3-WROOM-1U-N4R8 */
 static const uint8_t GPIO4       = 4;
 static const uint8_t GPIO5       = 5;
diff --git a/variants/nano32/pins_arduino.h b/variants/nano32/pins_arduino.h
index 586f9725dc4..571912b7ee9 100644
--- a/variants/nano32/pins_arduino.h
+++ b/variants/nano32/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        38
-#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)
-
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..660424de2b6 100644
--- a/variants/nina_w10/pins_arduino.h
+++ b/variants/nina_w10/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_GREEN = 33;
 static const uint8_t LED_RED = 23;
 static const uint8_t LED_BLUE = 21;
diff --git a/variants/node32s/pins_arduino.h b/variants/node32s/pins_arduino.h
index b37eaed659c..f4d30d32c09 100644
--- a/variants/node32s/pins_arduino.h
+++ b/variants/node32s/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..f4d30d32c09 100644
--- a/variants/nodemcu-32s/pins_arduino.h
+++ b/variants/nodemcu-32s/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/nora_w10/pins_arduino.h b/variants/nora_w10/pins_arduino.h
index ccf4556dcfc..ee473f5856f 100644
--- a/variants/nora_w10/pins_arduino.h
+++ b/variants/nora_w10/pins_arduino.h
@@ -2,19 +2,10 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#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)
-
 // 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/odroid_esp32/pins_arduino.h b/variants/odroid_esp32/pins_arduino.h
index 01a863ab236..dc10a37cd8a 100644
--- a/variants/odroid_esp32/pins_arduino.h
+++ b/variants/odroid_esp32/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..03cbbc1676c 100644
--- a/variants/onehorse32dev/pins_arduino.h
+++ b/variants/onehorse32dev/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..c429cc3f32a 100644
--- a/variants/openkb/pins_arduino.h
+++ b/variants/openkb/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        38
-#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)
-
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..e9322abb9c9 100644
--- a/variants/oroca_edubot/pins_arduino.h
+++ b/variants/oroca_edubot/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..27ecc063483 100644
--- a/variants/pico32/pins_arduino.h
+++ b/variants/pico32/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..aa170ca1605 100644
--- a/variants/piranha_esp-32/pins_arduino.h
+++ b/variants/piranha_esp-32/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..325331dbb26 100644
--- a/variants/pocket_32/pins_arduino.h
+++ b/variants/pocket_32/pins_arduino.h
@@ -3,19 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
-
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..27ecc063483 100644
--- a/variants/quantum/pins_arduino.h
+++ b/variants/quantum/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/redpill_esp32s3/pins_arduino.h b/variants/redpill_esp32s3/pins_arduino.h
index 0b58bd2415e..4c3672d263f 100644
--- a/variants/redpill_esp32s3/pins_arduino.h
+++ b/variants/redpill_esp32s3/pins_arduino.h
@@ -2,21 +2,14 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303A
 #define USB_PID 0x1001
 
-#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)
-
-static const uint8_t LED_BUILTIN = 3;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 3;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/roboheart_hercules/pins_arduino.h b/variants/roboheart_hercules/pins_arduino.h
index 17a5951773e..fc98590040f 100644
--- a/variants/roboheart_hercules/pins_arduino.h
+++ b/variants/roboheart_hercules/pins_arduino.h
@@ -3,15 +3,6 @@
 
 #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)
-
-
 // Motor driver pins 
 #define MOTOR_A_IN1 25  //  PHASE/IN1
 #define MOTOR_A_IN2 26  //  ENABLE/IN2
diff --git a/variants/sonoff_dualr3/pins_arduino.h b/variants/sonoff_dualr3/pins_arduino.h
index 1b3fae2d8bb..e7d6c6c1555 100644
--- a/variants/sonoff_dualr3/pins_arduino.h
+++ b/variants/sonoff_dualr3/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..abef21cdbbd 100644
--- a/variants/sparkfun_esp32_iot_redboard/pins_arduino.h
+++ b/variants/sparkfun_esp32_iot_redboard/pins_arduino.h
@@ -4,20 +4,13 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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_BUILTIN RGB_BUILTIN  // necessary to make digitalWrite/digitalMode find it
 #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..529ee3d003c 100755
--- a/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h
+++ b/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h
@@ -3,15 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const int LED_BUILTIN = 17;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/tamc_termod_s3/pins_arduino.h b/variants/tamc_termod_s3/pins_arduino.h
index ca86f85469f..637da583243 100644
--- a/variants/tamc_termod_s3/pins_arduino.h
+++ b/variants/tamc_termod_s3/pins_arduino.h
@@ -2,27 +2,11 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #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 BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-#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)
+// This board has no NeoLED or any User LED 
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/tbeam/pins_arduino.h b/variants/tbeam/pins_arduino.h
index fdec62d96d3..b27a913e1ff 100644
--- a/variants/tbeam/pins_arduino.h
+++ b/variants/tbeam/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #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)
-
 // SPI LoRa Radio
 #define LORA_SCK 5      // GPIO5  - SX1276 SCK
 #define LORA_MISO 19    // GPIO19 - SX1276 MISO
@@ -26,7 +18,7 @@ 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..b637cc51799 100644
--- a/variants/ttgo-lora32-v1/pins_arduino.h
+++ b/variants/ttgo-lora32-v1/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 // I2C OLED Display works with SSD1306 driver
 #define OLED_SDA 4
 #define OLED_SCL 15
@@ -26,7 +18,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..3d5a0b36f3c 100644
--- a/variants/ttgo-lora32-v2/pins_arduino.h
+++ b/variants/ttgo-lora32-v2/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 // I2C OLED Display works with SSD1306 driver
 #define OLED_SDA    21
 #define OLED_SCL    22
@@ -31,8 +23,8 @@
 #define SD_CS   13
 
 static const uint8_t LED_BUILTIN =  22;
-#define BUILTIN_LED  LED_BUILTIN    // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..a333d80917d 100644
--- a/variants/ttgo-lora32-v21new/pins_arduino.h
+++ b/variants/ttgo-lora32-v21new/pins_arduino.h
@@ -9,14 +9,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 // I2C OLED Display works with SSD1306 driver
 #define OLED_SDA    21
 #define OLED_SCL    22
@@ -38,9 +30,9 @@
 #define SD_MOSI 15
 #define SD_CS   13
 
-static const uint8_t LED_BUILTIN = 25  ;
-#define BUILTIN_LED  LED_BUILTIN    // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+static const uint8_t LED_BUILTIN = 25;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN =  0;
 
diff --git a/variants/ttgo-t-oi-plus/pins_arduino.h b/variants/ttgo-t-oi-plus/pins_arduino.h
index 16cac90bdaf..782b5fb4342 100644
--- a/variants/ttgo-t-oi-plus/pins_arduino.h
+++ b/variants/ttgo-t-oi-plus/pins_arduino.h
@@ -3,15 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 12
-#define NUM_DIGITAL_PINS        12
-#define NUM_ANALOG_INPUTS       3
-
-#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 LED_BUILTIN = 3;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
diff --git a/variants/ttgo-t1/pins_arduino.h b/variants/ttgo-t1/pins_arduino.h
index 8adc5eaf57f..e6024f0ac5b 100644
--- a/variants/ttgo-t1/pins_arduino.h
+++ b/variants/ttgo-t1/pins_arduino.h
@@ -3,20 +3,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..eecb5dc5817 100755
--- a/variants/ttgo-t7-v13-mini32/pins_arduino.h
+++ b/variants/ttgo-t7-v13-mini32/pins_arduino.h
@@ -3,19 +3,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t SDA = 21;
 static const uint8_t SCL = 22;
diff --git a/variants/ttgo-t7-v14-mini32/pins_arduino.h b/variants/ttgo-t7-v14-mini32/pins_arduino.h
index b0ca79e64e4..496141a7364 100755
--- a/variants/ttgo-t7-v14-mini32/pins_arduino.h
+++ b/variants/ttgo-t7-v14-mini32/pins_arduino.h
@@ -3,19 +3,12 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
 static const uint8_t LED_BUILTIN = 19;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t SDA = 21;
 static const uint8_t SCL = 22;
diff --git a/variants/turta_iot_node/pins_arduino.h b/variants/turta_iot_node/pins_arduino.h
index f156ee2fb70..64ebeb17172 100644
--- a/variants/turta_iot_node/pins_arduino.h
+++ b/variants/turta_iot_node/pins_arduino.h
@@ -3,18 +3,10 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 20
-#define NUM_DIGITAL_PINS        21
-#define NUM_ANALOG_INPUTS       9
-
-#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 34)
-
 // LED
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..e10a0d6a8e1 100644
--- a/variants/twatch/pins_arduino.h
+++ b/variants/twatch/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #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)
-
 // touch screen
 #define TP_SDA              23
 #define TP_SCL              32
diff --git a/variants/uPesy_esp32_wroom_devkit/pins_arduino.h b/variants/uPesy_esp32_wroom_devkit/pins_arduino.h
index 69e4138428f..467c58c0034 100644
--- a/variants/uPesy_esp32_wroom_devkit/pins_arduino.h
+++ b/variants/uPesy_esp32_wroom_devkit/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..467c58c0034 100644
--- a/variants/uPesy_esp32_wrover_devkit/pins_arduino.h
+++ b/variants/uPesy_esp32_wrover_devkit/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/um_feathers2/pins_arduino.h b/variants/um_feathers2/pins_arduino.h
index 26ff851d66f..edcde26ac71 100644
--- a/variants/um_feathers2/pins_arduino.h
+++ b/variants/um_feathers2/pins_arduino.h
@@ -9,14 +9,6 @@
 #define USB_PRODUCT "FeatherS2"
 #define USB_SERIAL ""
 
-#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)
-
 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..d66d565d280 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
@@ -9,14 +10,6 @@
 #define USB_PRODUCT "FeatherS2 Neo"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       11
-
-#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;
 
@@ -62,6 +55,14 @@ static const uint8_t NEOPIXEL_MATRIX_DATA = 21;
 static const uint8_t NEOPIXEL_MATRIX_PWR = 4;
 
 static const uint8_t NEOPIXEL_DATA = 40;
+// 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 = RGB_BUILTIN;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 static const uint8_t NEOPIXEL_PWR = 39;
 
 static const uint8_t VBAT_SENSE = 2;
diff --git a/variants/um_feathers3/pins_arduino.h b/variants/um_feathers3/pins_arduino.h
index 9b60548d08f..804a60d28e4 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
@@ -9,14 +10,6 @@
 #define USB_PRODUCT "FeatherS3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        21
-#define NUM_ANALOG_INPUTS       13
-
-#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;
 
@@ -59,10 +52,17 @@ static const uint8_t T14 = 14;
 static const uint8_t VBAT_SENSE = 2;
 static const uint8_t VBUS_SENSE = 34;
 
+// User LED 
+#define LED_BUILTIN 13
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
 static const uint8_t RGB_DATA = 40;
+// 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
+
 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;
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/um_nanos3/pins_arduino.h b/variants/um_nanos3/pins_arduino.h
index d80a40b8517..84d5b5a6219 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
@@ -9,14 +10,6 @@
 #define USB_PRODUCT "Nanos3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       9
-
-#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;
 
@@ -51,6 +44,14 @@ static const uint8_t T8 = 8;
 static const uint8_t T9 = 9;
 
 static const uint8_t RGB_DATA = 41;
+// 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 static const uint8_t RGB_PWR = 42;
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/um_pros3/pins_arduino.h b/variants/um_pros3/pins_arduino.h
index d46a772d0cb..9a8e8120151 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
@@ -9,14 +10,6 @@
 #define USB_PRODUCT "ProS3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        27
-#define NUM_ANALOG_INPUTS       14
-
-#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;
 
@@ -62,6 +55,14 @@ static const uint8_t VBAT_SENSE = 10;
 static const uint8_t VBUS_SENSE = 33;
 
 static const uint8_t RGB_DATA = 18;
+// 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 static const uint8_t RGB_PWR = 17;
 static const uint8_t LDO2 = 17;
 
diff --git a/variants/um_rmp/pins_arduino.h b/variants/um_rmp/pins_arduino.h
index bf79ad86176..5d3b7acc283 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
@@ -9,14 +10,6 @@
 #define USB_PRODUCT "RM Pro"
 #define USB_SERIAL ""
 
-#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)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
@@ -73,6 +66,14 @@ static const uint8_t VBAT_SENSE = 3;
 static const uint8_t VBUS_SENSE = 21;
 
 static const uint8_t RGB_DATA = 1;
+// 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 static const uint8_t RGB_PWR = 2;
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/um_tinypico/pins_arduino.h b/variants/um_tinypico/pins_arduino.h
index 134a5ce88d4..b10b9274178 100644
--- a/variants/um_tinypico/pins_arduino.h
+++ b/variants/um_tinypico/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/um_tinys2/pins_arduino.h b/variants/um_tinys2/pins_arduino.h
index a493a3fd78b..b3431781d99 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
@@ -9,14 +10,6 @@
 #define USB_PRODUCT "TinyS2"
 #define USB_SERIAL ""
 
-#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)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
@@ -73,6 +66,14 @@ static const uint8_t VBAT_SENSE = 3;
 static const uint8_t VBUS_SENSE = 21;
 
 static const uint8_t RGB_DATA = 1;
+// 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 static const uint8_t RGB_PWR = 2;
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/um_tinys3/pins_arduino.h b/variants/um_tinys3/pins_arduino.h
index ca2b4ba4873..251b1f8dd7d 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
@@ -9,14 +10,6 @@
 #define USB_PRODUCT "TinyS3"
 #define USB_SERIAL ""
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       9
-
-#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;
 
@@ -54,6 +47,14 @@ static const uint8_t VBAT_SENSE = 10;
 static const uint8_t VBUS_SENSE = 33;
 
 static const uint8_t RGB_DATA = 18;
+// 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
 static const uint8_t RGB_PWR = 17;
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/unphone8/pins_arduino.h b/variants/unphone8/pins_arduino.h
index f6270e7224b..66e30bdd564 100644
--- a/variants/unphone8/pins_arduino.h
+++ b/variants/unphone8/pins_arduino.h
@@ -6,14 +6,6 @@
 #define USB_VID            0x16D0
 #define USB_PID            0x1178
 
-#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 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..e20cd337b7f 100644
--- a/variants/unphone9/pins_arduino.h
+++ b/variants/unphone9/pins_arduino.h
@@ -6,14 +6,6 @@
 #define USB_VID            0x16D0
 #define USB_PID            0x1178
 
-#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 LED_BUILTIN         13
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
diff --git a/variants/vintlabsdevkitv1/pins_arduino.h b/variants/vintlabsdevkitv1/pins_arduino.h
index 6f0df757180..d0559b9f01b 100644
--- a/variants/vintlabsdevkitv1/pins_arduino.h
+++ b/variants/vintlabsdevkitv1/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/watchy/pins_arduino.h b/variants/watchy/pins_arduino.h
index 2c93c173429..b5bc02f374c 100644
--- a/variants/watchy/pins_arduino.h
+++ b/variants/watchy/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 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..670c75fff93 100644
--- a/variants/wesp32/pins_arduino.h
+++ b/variants/wesp32/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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 TX1   12
 #define RX1   13
 #define TX2   33
diff --git a/variants/widora-air/pins_arduino.h b/variants/widora-air/pins_arduino.h
index 4cb0fa4da0d..0c0472b3ac8 100644
--- a/variants/widora-air/pins_arduino.h
+++ b/variants/widora-air/pins_arduino.h
@@ -3,18 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        7
-#define NUM_ANALOG_INPUTS       10
-
-#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 = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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..cc3841aba73 100644
--- a/variants/wifiduino32/pins_arduino.h
+++ b/variants/wifiduino32/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/wifiduino32s3/pins_arduino.h b/variants/wifiduino32s3/pins_arduino.h
index 9115256472b..db372a34358 100644
--- a/variants/wifiduino32s3/pins_arduino.h
+++ b/variants/wifiduino32s3/pins_arduino.h
@@ -2,27 +2,11 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-#include "soc/soc_caps.h"
 
 #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 BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-#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)
+// No USER LED or NeoLED
 
 static const uint8_t TX = 45;
 static const uint8_t RX = 44;
diff --git a/variants/wifiduinov2/pins_arduino.h b/variants/wifiduinov2/pins_arduino.h
index 4eb83a7c3ae..f80247e24b9 100644
--- a/variants/wifiduinov2/pins_arduino.h
+++ b/variants/wifiduinov2/pins_arduino.h
@@ -2,21 +2,10 @@
 #define Pins_Arduino_h
 
 #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;
+static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-#define BOARD_HAS_NEOPIXEL
-#define LED_BRIGHTNESS 64
-
-#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)
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h
index 87792e471b4..1cff6173ea1 100644
--- a/variants/wipy3/pins_arduino.h
+++ b/variants/wipy3/pins_arduino.h
@@ -2,18 +2,17 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       18
-
-#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 = 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
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef 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 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..49cc740efb3 100644
--- a/variants/wt32-eth01/pins_arduino.h
+++ b/variants/wt32-eth01/pins_arduino.h
@@ -9,14 +9,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS 40
-#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)
-
 // interface to Ethernet PHY (LAN8720A)
 #define ETH_PHY_ADDR 1
 #define ETH_PHY_POWER 16
diff --git a/variants/xinabox/pins_arduino.h b/variants/xinabox/pins_arduino.h
index 52b3e4f12d8..b5978d1ea94 100644
--- a/variants/xinabox/pins_arduino.h
+++ b/variants/xinabox/pins_arduino.h
@@ -3,17 +3,9 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#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)
-
 static const uint8_t LED_BUILTIN = 27;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;