diff --git a/variants/AirM2M_CORE_ESP32C3/pins_arduino.h b/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
index d0510fe8326b06c17b004c09a6dbc417ff6b20c7..af061a0eee212c0fbc6ced5158d480c9ee8d6e5b 100644
--- a/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
+++ b/variants/AirM2M_CORE_ESP32C3/pins_arduino.h
@@ -7,7 +7,7 @@
 #define NUM_DIGITAL_PINS        22
 #define NUM_ANALOG_INPUTS       6
 
-#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(esp32_adc2gpio[(p)]):-1)
+#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)
 
diff --git a/variants/Bee_Motion/pins_arduino.h b/variants/Bee_Motion/pins_arduino.h
index 31189ca67ef53f673e4c2c2a9cc9c28785576464..18cc71f24f57193b56ca2b1ee082857a1cbda097 100644
--- a/variants/Bee_Motion/pins_arduino.h
+++ b/variants/Bee_Motion/pins_arduino.h
@@ -13,7 +13,7 @@
 #define NUM_DIGITAL_PINS        21
 #define NUM_ANALOG_INPUTS       12
 
-#define analogInputToDigitalPin(p)  (((p)<29)?(esp32_adc2gpio[(p)]):-1)
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)
 
diff --git a/variants/Bee_Motion_Mini/pins_arduino.h b/variants/Bee_Motion_Mini/pins_arduino.h
index b31a7b598c58ddebd2e62c8a2e83c5fe01e6cda7..e3f43decb4ad241dac4ff5f4c95f09d15c1bd4c7 100644
--- a/variants/Bee_Motion_Mini/pins_arduino.h
+++ b/variants/Bee_Motion_Mini/pins_arduino.h
@@ -8,9 +8,9 @@
 #define NUM_DIGITAL_PINS        4
 #define NUM_ANALOG_INPUTS       2
 
-#define analogInputToDigitalPin(p)  (((p)<29)?(esp32_adc2gpio[(p)]):-1)
-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
+#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;
diff --git a/variants/Bee_S3/pins_arduino.h b/variants/Bee_S3/pins_arduino.h
index f709eba88508b4d15ef1a44305aa08d59b922a44..b095fb8fd7f9babf2b38247d0cb163c200156687 100644
--- a/variants/Bee_S3/pins_arduino.h
+++ b/variants/Bee_S3/pins_arduino.h
@@ -13,7 +13,7 @@
 #define NUM_DIGITAL_PINS        15
 #define NUM_ANALOG_INPUTS       8
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)
 
diff --git a/variants/cnrs_aw2eth/pins_arduino.h b/variants/cnrs_aw2eth/pins_arduino.h
index 547ef6d3b9e877f30f0a47af635ed528f9d8173b..56db3aebe58bfcc93de04feb86185730114c5425 100644
--- a/variants/cnrs_aw2eth/pins_arduino.h
+++ b/variants/cnrs_aw2eth/pins_arduino.h
@@ -7,7 +7,7 @@
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
diff --git a/variants/deneyapkart1A/pins_arduino.h b/variants/deneyapkart1A/pins_arduino.h
index 6e35c8ef9b81c242665e93ae8f1bdce2394d37f7..fda6990051b53909a8fd4e57be2fda2fd6ce0dd0 100644
--- a/variants/deneyapkart1A/pins_arduino.h
+++ b/variants/deneyapkart1A/pins_arduino.h
@@ -7,7 +7,7 @@
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
diff --git a/variants/esp32s3box/pins_arduino.h b/variants/esp32s3box/pins_arduino.h
index 5db18515d0a0ab93403aa15fde6e4d90c275550f..3ed655d1d3f8c5e51a8b07a5b4b5fe727a4fa2b2 100644
--- a/variants/esp32s3box/pins_arduino.h
+++ b/variants/esp32s3box/pins_arduino.h
@@ -10,7 +10,7 @@
 #define NUM_DIGITAL_PINS        48
 #define NUM_ANALOG_INPUTS       20
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)
 
diff --git a/variants/esp32s3camlcd/pins_arduino.h b/variants/esp32s3camlcd/pins_arduino.h
index 3f922c7b2dc836ee043e7c5399ec89897273780d..308644ff52eaa7c18335e1de0e8878b682f54412 100644
--- a/variants/esp32s3camlcd/pins_arduino.h
+++ b/variants/esp32s3camlcd/pins_arduino.h
@@ -10,7 +10,7 @@
 #define NUM_DIGITAL_PINS        48
 #define NUM_ANALOG_INPUTS       20
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)
 
diff --git a/variants/m5stack_station/pins_arduino.h b/variants/m5stack_station/pins_arduino.h
index 2cee4ee8b34bc17d367e100ec5c4fa9a23dde6fa..9ba182b90b5ea9a12557a45a4c498c618a1eac3d 100644
--- a/variants/m5stack_station/pins_arduino.h
+++ b/variants/m5stack_station/pins_arduino.h
@@ -7,9 +7,9 @@
 #define NUM_DIGITAL_PINS        20
 #define NUM_ANALOG_INPUTS       16
 
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
+#define 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_feathers3/pins_arduino.h b/variants/um_feathers3/pins_arduino.h
index b0c8d473c5bed2c261777c405e4022b4481f704d..9b60548d08f35de07ee375747010c8d91aade9aa 100644
--- a/variants/um_feathers3/pins_arduino.h
+++ b/variants/um_feathers3/pins_arduino.h
@@ -13,7 +13,7 @@
 #define NUM_DIGITAL_PINS        21
 #define NUM_ANALOG_INPUTS       13
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)
 
diff --git a/variants/um_pros3/pins_arduino.h b/variants/um_pros3/pins_arduino.h
index dc8b76768b54045db73aace5f8542cb25e48660e..d46a772d0cb15a1c777b9945f531c65f9360d48e 100644
--- a/variants/um_pros3/pins_arduino.h
+++ b/variants/um_pros3/pins_arduino.h
@@ -13,7 +13,7 @@
 #define NUM_DIGITAL_PINS        27
 #define NUM_ANALOG_INPUTS       14
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)
 
diff --git a/variants/um_rmp/pins_arduino.h b/variants/um_rmp/pins_arduino.h
index 282251196d97cffd3f5279401473c0867cacd9e2..bf79ad86176896107bd566d63f5262eea5591f82 100644
--- a/variants/um_rmp/pins_arduino.h
+++ b/variants/um_rmp/pins_arduino.h
@@ -13,7 +13,7 @@
 #define NUM_DIGITAL_PINS        48
 #define NUM_ANALOG_INPUTS       20
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)
 
diff --git a/variants/um_tinys3/pins_arduino.h b/variants/um_tinys3/pins_arduino.h
index 780482cf5a0112b4ba48df27c50a3c13baf6d7bf..ca2b4ba487363623e69cf0fe348619c6647c8f16 100644
--- a/variants/um_tinys3/pins_arduino.h
+++ b/variants/um_tinys3/pins_arduino.h
@@ -13,7 +13,7 @@
 #define NUM_DIGITAL_PINS        17
 #define NUM_ANALOG_INPUTS       9
 
-#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)