From 72b267092f3bdad3dc4d8818f4496b5241689e09 Mon Sep 17 00:00:00 2001
From: recrof <recrof@gmail.com>
Date: Wed, 3 Sep 2025 21:28:46 +0200
Subject: [PATCH 1/2] xiao rp2040 cleanup

---
 .../xiao_rp2040}/XiaoRP2040Board.cpp            |  0
 .../xiao_rp2040}/XiaoRP2040Board.h              | 15 ---------------
 variants/xiao_rp2040/platformio.ini             | 17 +++++++++++------
 variants/xiao_rp2040/target.h                   |  2 +-
 4 files changed, 12 insertions(+), 22 deletions(-)
 rename {src/helpers/rp2040 => variants/xiao_rp2040}/XiaoRP2040Board.cpp (100%)
 rename {src/helpers/rp2040 => variants/xiao_rp2040}/XiaoRP2040Board.h (79%)

diff --git a/src/helpers/rp2040/XiaoRP2040Board.cpp b/variants/xiao_rp2040/XiaoRP2040Board.cpp
similarity index 100%
rename from src/helpers/rp2040/XiaoRP2040Board.cpp
rename to variants/xiao_rp2040/XiaoRP2040Board.cpp
diff --git a/src/helpers/rp2040/XiaoRP2040Board.h b/variants/xiao_rp2040/XiaoRP2040Board.h
similarity index 79%
rename from src/helpers/rp2040/XiaoRP2040Board.h
rename to variants/xiao_rp2040/XiaoRP2040Board.h
index c9353906a..d2951c755 100644
--- a/src/helpers/rp2040/XiaoRP2040Board.h
+++ b/variants/xiao_rp2040/XiaoRP2040Board.h
@@ -3,21 +3,6 @@
 #include <Arduino.h>
 #include <MeshCore.h>
 
-// LoRa radio module pins for the Xiao RP2040
-// https://wiki.seeedstudio.com/XIAO-RP2040/
-
-#define P_LORA_DIO_1      27 // D1
-#define P_LORA_NSS        6  // D4
-#define P_LORA_RESET      28 // D2
-#define P_LORA_BUSY       29 // D3
-#define P_LORA_TX_LED     17
-
-#define SX126X_RXEN       7  // D5
-#define SX126X_TXEN       -1
-
-#define SX126X_DIO2_AS_RF_SWITCH true
-#define SX126X_DIO3_TCXO_VOLTAGE 1.8
-
 /*
  * This board has no built-in way to read battery voltage.
  * Nevertheless it's very easy to make it work, you only require two 1% resistors.
diff --git a/variants/xiao_rp2040/platformio.ini b/variants/xiao_rp2040/platformio.ini
index 619350ecc..48ae3c264 100644
--- a/variants/xiao_rp2040/platformio.ini
+++ b/variants/xiao_rp2040/platformio.ini
@@ -1,27 +1,32 @@
 [Xiao_rp2040]
 extends = rp2040_base
-
 board = seeed_xiao_rp2040
 board_build.filesystem_size = 0.5m
-
 build_flags = ${rp2040_base.build_flags}
   -I variants/xiao_rp2040
   -D SX126X_CURRENT_LIMIT=140
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D LORA_TX_POWER=22
+  -D P_LORA_DIO_1=27 ; D1
+  -D P_LORA_NSS=6  ; D4
+  -D P_LORA_RESET=28 ; D2
+  -D P_LORA_BUSY=29 ; D3
+  -D P_LORA_TX_LED=17
+  -D SX126X_RXEN=7  ; D5
+  -D SX126X_TXEN=1
+  -D SX126X_DIO2_AS_RF_SWITCH=true
+  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_RX_BOOSTED_GAIN=1
+  -D LORA_TX_POWER=22
 ; Debug options
   ; -D DEBUG_RP2040_WIRE=1
   ; -D DEBUG_RP2040_SPI=1
   ; -D DEBUG_RP2040_CORE=1
   ; -D RADIOLIB_DEBUG_SPI=1
   ; -D DEBUG_RP2040_PORT=Serial
-
 build_src_filter = ${rp2040_base.build_src_filter}
-  +<helpers/rp2040/XiaoRP2040Board.cpp>
+  +<XiaoRP2040Board.cpp>
   +<../variants/xiao_rp2040>
-
 lib_deps = ${rp2040_base.lib_deps}
 
 [env:Xiao_rp2040_Repeater]
diff --git a/variants/xiao_rp2040/target.h b/variants/xiao_rp2040/target.h
index 34861db31..33b3766c2 100644
--- a/variants/xiao_rp2040/target.h
+++ b/variants/xiao_rp2040/target.h
@@ -7,7 +7,7 @@
 #include <helpers/radiolib/CustomSX1262Wrapper.h>
 #include <helpers/radiolib/RadioLibWrappers.h>
 #include <helpers/SensorManager.h>
-#include <helpers/rp2040/XiaoRP2040Board.h>
+#include <XiaoRP2040Board.h>
 
 extern XiaoRP2040Board board;
 extern WRAPPER_CLASS radio_driver;

From c9e6ae9e6c907a4fcf0bf1917ede33754b508c51 Mon Sep 17 00:00:00 2001
From: recrof <recrof@gmail.com>
Date: Fri, 5 Sep 2025 11:12:17 +0200
Subject: [PATCH 2/2] fix typo in pin configuration

---
 variants/xiao_rp2040/platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variants/xiao_rp2040/platformio.ini b/variants/xiao_rp2040/platformio.ini
index 48ae3c264..6c9c70f66 100644
--- a/variants/xiao_rp2040/platformio.ini
+++ b/variants/xiao_rp2040/platformio.ini
@@ -13,7 +13,7 @@ build_flags = ${rp2040_base.build_flags}
   -D P_LORA_BUSY=29 ; D3
   -D P_LORA_TX_LED=17
   -D SX126X_RXEN=7  ; D5
-  -D SX126X_TXEN=1
+  -D SX126X_TXEN=RADIOLIB_NC
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_RX_BOOSTED_GAIN=1