diff --git a/hardware/heltec/v3/platformio.ini b/hardware/heltec/v3/platformio.ini
index 7546f6d..5e4b5e1 100644
--- a/hardware/heltec/v3/platformio.ini
+++ b/hardware/heltec/v3/platformio.ini
@@ -17,9 +17,9 @@ build_flags =
     -DSX126X_CURRENT_LIMIT=140
     -DSX126X_RX_BOOSTED_GAIN=1
     ; GPIO
-    -DPIN_USER_BTN=0
-    -DPIN_VEXT_EN=36
-    -DLORA_TX_LED=35
+    -DUSER_BTN_PIN=0
+    -DVEXT_EN_PIN=36
+    -DLORA_TX_LED_PIN=35
     ; I2C (SoC pins)
     -DSOC_PIN_SDA=17
     -DSOC_PIN_SCL=18
diff --git a/hardware/seeed/xiao_s3_wio_sx1262/platformio.ini b/hardware/seeed/xiao_s3_wio_sx1262/platformio.ini
index 4ea1c6b..af05c87 100644
--- a/hardware/seeed/xiao_s3_wio_sx1262/platformio.ini
+++ b/hardware/seeed/xiao_s3_wio_sx1262/platformio.ini
@@ -11,11 +11,17 @@ build_flags =
     -DLORA_PIN_DIO1=39
     -DLORA_PIN_RESET=42
     -DLORA_PIN_BUSY=40
-    ; SX1262 RF switch on DIO2
-    -DSX126X_DIO2_AS_RF_SWITCH=true
-    -DSX126X_DIO3_TCXO_VOLTAGE=1.8
-    -DSX126X_CURRENT_LIMIT=140
     ; SPI pins
     -DLORA_PIN_SCLK=7
     -DLORA_PIN_MISO=8
     -DLORA_PIN_MOSI=9
+    ; SX1262 RF switch and tuning
+    -DSX126X_DIO2_AS_RF_SWITCH=true
+    -DSX126X_DIO3_TCXO_VOLTAGE=1.8
+    -DSX126X_CURRENT_LIMIT=140
+    ; GPIO
+    -DUSER_BTN_PIN=21
+    -DSTATUS_LED_PIN=48
+    ; I2C (SoC pins)
+    -DSOC_PIN_SDA=4
+    -DSOC_PIN_SCL=5