Merge pull request #479 from 446564/cleanup-xio-nrf

cleanup xiao nrf52

src/helpers/nrf52/XiaoNrf52Board.h → variants/xiao_nrf52/XiaoNrf52Board.h

@@ -5,20 +5,19 @@
 
 #ifdef XIAO_NRF52
 
-// LoRa radio module pins for Seeed Xiao-nrf52
+// redefine lora pins if using the S3 variant of SX1262 board
 #ifdef SX1262_XIAO_S3_VARIANT
   #undef P_LORA_DIO_1
   #undef P_LORA_BUSY
   #undef P_LORA_RESET
   #undef P_LORA_NSS
+  #undef SX126X_RXEN
   #define  P_LORA_DIO_1       D0
   #define  P_LORA_BUSY        D1
   #define  P_LORA_RESET       D2
   #define  P_LORA_NSS         D3
+  #define  SX126X_RXEN        D4
 #endif
-//#define  SX126X_POWER_EN  37
-
-
 
 class XiaoNrf52Board : public mesh::MainBoard {
 protected:

variants/xiao_nrf52/platformio.ini

@@ -50,8 +50,7 @@ build_flags = ${nrf52840_xiao.build_flags}
   -D ENV_INCLUDE_INA219=1
 build_src_filter = ${nrf52840_xiao.build_src_filter}
   +<helpers/*.cpp>
-  +<helpers/sensors>  
-  +<helpers/nrf52/XiaoNrf52Board.cpp>
+  +<helpers/sensors>
   +<../variants/xiao_nrf52>
 debug_tool = jlink
 upload_protocol = nrfutil

variants/xiao_nrf52/target.h

@@ -3,7 +3,7 @@
 #define RADIOLIB_STATIC_ONLY 1
 #include <RadioLib.h>
 #include <helpers/RadioLibWrappers.h>
-#include <helpers/nrf52/XiaoNrf52Board.h>
+#include <XiaoNrf52Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/ArduinoHelpers.h>