diff --git a/src/sleep_utils.cpp b/src/sleep_utils.cpp
index 80ed572..d8efea4 100644
--- a/src/sleep_utils.cpp
+++ b/src/sleep_utils.cpp
@@ -51,10 +51,10 @@ namespace SLEEP_Utils {
         if (Config.digi.ecoMode == 1) {
             pinMode(RADIO_WAKEUP_PIN, INPUT);
             attachInterrupt(digitalPinToInterrupt(RADIO_WAKEUP_PIN), wakeUpLoRaPacketReceived, RISING);
-            #if defined(ESP32) || defined(ESP32_S2) || defined(ESP32_S3)
+            #if defined(HAS_ESP32) || defined(HAS_ESP32_S2) || defined(HAS_ESP32_S3)
                 esp_sleep_enable_ext1_wakeup(GPIO_WAKEUP_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
             #endif
-            #if defined(ESP32_C3)
+            #if defined(HAS_ESP32_C3)
                 esp_deep_sleep_enable_gpio_wakeup(1ULL << GPIO_WAKEUP_PIN, ESP_GPIO_WAKEUP_GPIO_HIGH);
             #endif
         }
diff --git a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h
index 7de26d6..831db19 100644
--- a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h
+++ b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_C3
+    #define HAS_ESP32_C3
 
     //  LoRa Radio
     #define HAS_SX1268
diff --git a/variants/ESP32_DIY_1W_LoRa/board_pinout.h b/variants/ESP32_DIY_1W_LoRa/board_pinout.h
index 952cff8..9a4b57b 100644
--- a/variants/ESP32_DIY_1W_LoRa/board_pinout.h
+++ b/variants/ESP32_DIY_1W_LoRa/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1268
diff --git a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h
index 4f34915..0a73840 100644
--- a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h
+++ b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h
index 71f2640..dd17a26 100644
--- a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h
+++ b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_LLCC68
diff --git a/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h
index a73f063..426e76b 100644
--- a/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h
+++ b/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1268
diff --git a/variants/ESP32_DIY_LoRa/board_pinout.h b/variants/ESP32_DIY_LoRa/board_pinout.h
index 7bea410..75c67e8 100644
--- a/variants/ESP32_DIY_LoRa/board_pinout.h
+++ b/variants/ESP32_DIY_LoRa/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/ESP32_DIY_LoRa_915/board_pinout.h b/variants/ESP32_DIY_LoRa_915/board_pinout.h
index fd96292..c679364 100644
--- a/variants/ESP32_DIY_LoRa_915/board_pinout.h
+++ b/variants/ESP32_DIY_LoRa_915/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1276
diff --git a/variants/ESP32_DIY_LoRa_A7670/board_pinout.h b/variants/ESP32_DIY_LoRa_A7670/board_pinout.h
index 1ae1618..20bfacd 100644
--- a/variants/ESP32_DIY_LoRa_A7670/board_pinout.h
+++ b/variants/ESP32_DIY_LoRa_A7670/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h b/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h
index 0968050..a3a65d3 100644
--- a/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h
+++ b/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1276
diff --git a/variants/LoRaHAM_V2/board_pinout.h b/variants/LoRaHAM_V2/board_pinout.h
index dbf7fa7..2303959 100644
--- a/variants/LoRaHAM_V2/board_pinout.h
+++ b/variants/LoRaHAM_V2/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/OE5HWN_MeshCom/board_pinout.h b/variants/OE5HWN_MeshCom/board_pinout.h
index bb2b05e..ee86932 100644
--- a/variants/OE5HWN_MeshCom/board_pinout.h
+++ b/variants/OE5HWN_MeshCom/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1268
diff --git a/variants/QRPLabs_LightGateway_1_0/board_pinout.h b/variants/QRPLabs_LightGateway_1_0/board_pinout.h
index 2f62fc9..f22da56 100644
--- a/variants/QRPLabs_LightGateway_1_0/board_pinout.h
+++ b/variants/QRPLabs_LightGateway_1_0/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1268
diff --git a/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h b/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h
index 47de1df..0ea2bed 100644
--- a/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h
+++ b/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1268
diff --git a/variants/TROY_LoRa_APRS/board_pinout.h b/variants/TROY_LoRa_APRS/board_pinout.h
index 92a83be..049f7a2 100644
--- a/variants/TROY_LoRa_APRS/board_pinout.h
+++ b/variants/TROY_LoRa_APRS/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/WEMOS-D1-R32-RA02/board_pinout.h b/variants/WEMOS-D1-R32-RA02/board_pinout.h
index 2f3929e..c1c44d1 100644
--- a/variants/WEMOS-D1-R32-RA02/board_pinout.h
+++ b/variants/WEMOS-D1-R32-RA02/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h
index e92ac46..7588548 100644
--- a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h
+++ b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h
index d71db41..5b409cc 100644
--- a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h
+++ b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S2
+    #define HAS_ESP32_S2
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h b/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h
index f2a0496..72502a3 100644
--- a/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h
+++ b/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/esp32c3_DIY_1W_LoRa/board_pinout.h b/variants/esp32c3_DIY_1W_LoRa/board_pinout.h
index 664c2bf..bb55433 100644
--- a/variants/esp32c3_DIY_1W_LoRa/board_pinout.h
+++ b/variants/esp32c3_DIY_1W_LoRa/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_C3
+    #define HAS_ESP32_C3
 
     //  LoRa Radio
     #define HAS_SX1268
diff --git a/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h b/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h
index 04470d1..3f2a1b0 100644
--- a/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h
+++ b/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_C3
+    #define HAS_ESP32_C3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec-lora32-v2/board_pinout.h b/variants/heltec-lora32-v2/board_pinout.h
index 6b36c79..8b43c17 100644
--- a/variants/heltec-lora32-v2/board_pinout.h
+++ b/variants/heltec-lora32-v2/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/heltec-lora32-v2_915/board_pinout.h b/variants/heltec-lora32-v2_915/board_pinout.h
index 54d4801..1cb22c2 100644
--- a/variants/heltec-lora32-v2_915/board_pinout.h
+++ b/variants/heltec-lora32-v2_915/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1276
diff --git a/variants/heltec_ht-ct62/board_pinout.h b/variants/heltec_ht-ct62/board_pinout.h
index ab99899..009cf8f 100644
--- a/variants/heltec_ht-ct62/board_pinout.h
+++ b/variants/heltec_ht-ct62/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_C3
+    #define HAS_ESP32_C3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec_vision_master_e290/board_pinout.h b/variants/heltec_vision_master_e290/board_pinout.h
index 7dc3c9c..ddbc1c4 100644
--- a/variants/heltec_vision_master_e290/board_pinout.h
+++ b/variants/heltec_vision_master_e290/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec_wifi_lora_32_V3/board_pinout.h b/variants/heltec_wifi_lora_32_V3/board_pinout.h
index fcef0e6..935acbd 100644
--- a/variants/heltec_wifi_lora_32_V3/board_pinout.h
+++ b/variants/heltec_wifi_lora_32_V3/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec_wifi_lora_32_V3_2/board_pinout.h b/variants/heltec_wifi_lora_32_V3_2/board_pinout.h
index db8c46f..e099b01 100644
--- a/variants/heltec_wifi_lora_32_V3_2/board_pinout.h
+++ b/variants/heltec_wifi_lora_32_V3_2/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec_wifi_lora_32_V4/board_pinout.h b/variants/heltec_wifi_lora_32_V4/board_pinout.h
index 85e2fc6..3543e05 100644
--- a/variants/heltec_wifi_lora_32_V4/board_pinout.h
+++ b/variants/heltec_wifi_lora_32_V4/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec_wireless_bridge/board_pinout.h b/variants/heltec_wireless_bridge/board_pinout.h
index 8b41dbe..51fc7e7 100644
--- a/variants/heltec_wireless_bridge/board_pinout.h
+++ b/variants/heltec_wireless_bridge/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1276
diff --git a/variants/heltec_wireless_paper_v1/board_pinout.h b/variants/heltec_wireless_paper_v1/board_pinout.h
index 504228b..df1dc75 100644
--- a/variants/heltec_wireless_paper_v1/board_pinout.h
+++ b/variants/heltec_wireless_paper_v1/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec_wireless_paper_v1_2/board_pinout.h b/variants/heltec_wireless_paper_v1_2/board_pinout.h
index 504228b..df1dc75 100644
--- a/variants/heltec_wireless_paper_v1_2/board_pinout.h
+++ b/variants/heltec_wireless_paper_v1_2/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec_wireless_stick/board_pinout.h b/variants/heltec_wireless_stick/board_pinout.h
index e723d23..eaee591 100644
--- a/variants/heltec_wireless_stick/board_pinout.h
+++ b/variants/heltec_wireless_stick/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec_wireless_stick_lite_v3/board_pinout.h b/variants/heltec_wireless_stick_lite_v3/board_pinout.h
index 84d5e78..313ae84 100644
--- a/variants/heltec_wireless_stick_lite_v3/board_pinout.h
+++ b/variants/heltec_wireless_stick_lite_v3/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h b/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h
index 58f29d4..8138a3c 100644
--- a/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h
+++ b/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/heltec_wireless_tracker/board_pinout.h b/variants/heltec_wireless_tracker/board_pinout.h
index 3b296db..f12363a 100644
--- a/variants/heltec_wireless_tracker/board_pinout.h
+++ b/variants/heltec_wireless_tracker/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/ttgo-lora32-v21/board_pinout.h b/variants/ttgo-lora32-v21/board_pinout.h
index dd350a7..c76de72 100644
--- a/variants/ttgo-lora32-v21/board_pinout.h
+++ b/variants/ttgo-lora32-v21/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/ttgo-lora32-v21_915/board_pinout.h b/variants/ttgo-lora32-v21_915/board_pinout.h
index ae77ed4..18a4e41 100644
--- a/variants/ttgo-lora32-v21_915/board_pinout.h
+++ b/variants/ttgo-lora32-v21_915/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1276
diff --git a/variants/ttgo-t-beam-v1/board_pinout.h b/variants/ttgo-t-beam-v1/board_pinout.h
index b964874..8e55e7d 100644
--- a/variants/ttgo-t-beam-v1/board_pinout.h
+++ b/variants/ttgo-t-beam-v1/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/ttgo-t-beam-v1_2/board_pinout.h b/variants/ttgo-t-beam-v1_2/board_pinout.h
index b7e90ed..12ff362 100644
--- a/variants/ttgo-t-beam-v1_2/board_pinout.h
+++ b/variants/ttgo-t-beam-v1_2/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1278
diff --git a/variants/ttgo-t-beam-v1_2_915/board_pinout.h b/variants/ttgo-t-beam-v1_2_915/board_pinout.h
index 3ff4f2b..bebd734 100644
--- a/variants/ttgo-t-beam-v1_2_915/board_pinout.h
+++ b/variants/ttgo-t-beam-v1_2_915/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1276
diff --git a/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h b/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h
index 9338abb..6ab04d5 100644
--- a/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h
+++ b/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/ttgo-t-beam-v1_915/board_pinout.h b/variants/ttgo-t-beam-v1_915/board_pinout.h
index c6711b6..5361301 100644
--- a/variants/ttgo-t-beam-v1_915/board_pinout.h
+++ b/variants/ttgo-t-beam-v1_915/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1276
diff --git a/variants/ttgo-t-beam-v1_SX1268/board_pinout.h b/variants/ttgo-t-beam-v1_SX1268/board_pinout.h
index 506f6b1..1439f13 100644
--- a/variants/ttgo-t-beam-v1_SX1268/board_pinout.h
+++ b/variants/ttgo-t-beam-v1_SX1268/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
+    #define HAS_ESP32
 
     //  LoRa Radio
     #define HAS_SX1268
diff --git a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h
index 09c4d43..cefcfde 100644
--- a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h
+++ b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h b/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h
index 7790662..d6dd1e9 100644
--- a/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h
+++ b/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/ttgo_t_deck_GPS/board_pinout.h b/variants/ttgo_t_deck_GPS/board_pinout.h
index 75e8404..ddc7eb7 100644
--- a/variants/ttgo_t_deck_GPS/board_pinout.h
+++ b/variants/ttgo_t_deck_GPS/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262
diff --git a/variants/ttgo_t_deck_plus/board_pinout.h b/variants/ttgo_t_deck_plus/board_pinout.h
index b101ca2..2e0781b 100644
--- a/variants/ttgo_t_deck_plus/board_pinout.h
+++ b/variants/ttgo_t_deck_plus/board_pinout.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
+    #define HAS_ESP32_S3
 
     //  LoRa Radio
     #define HAS_SX1262