Merge pull request #725 from recrof/rpi_picow_refactor

tidy up rpi picow variant

variants/rpi_picow/PicoWBoard.h

@@ -3,19 +3,6 @@
 #include <MeshCore.h>
 #include <Arduino.h>
 
-// LoRa radio module pins for PicoW
-#define  P_LORA_DIO_1   20
-#define  P_LORA_NSS     3
-#define  P_LORA_RESET   15
-#define  P_LORA_BUSY    2
-#define  P_LORA_SCLK    10
-#define  P_LORA_MISO    12
-#define  P_LORA_MOSI    11
-//#define  SX126X_POWER_EN  ??? // Not Sure
-
-#define SX126X_DIO2_AS_RF_SWITCH  true
-#define SX126X_DIO3_TCXO_VOLTAGE   1.8
-
 // built-ins
 #define  PIN_VBAT_READ    26
 #define  ADC_MULTIPLIER   (3.1 * 3.3 * 1000) // MT Uses 3.1

variants/rpi_picow/platformio.ini

@@ -1,26 +1,35 @@
-[picow]
+[rpi_picow]
 extends = rp2040_base
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git
 board = rpipicow
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
 build_flags = ${rp2040_base.build_flags}
-  -I variants/picow
+  -I variants/rpi_picow
 ;  -D PICOW
 ;  -D HW_SPI1_DEVICE
+  -D P_LORA_DIO_1=20
+  -D P_LORA_NSS=3
+  -D P_LORA_RESET=15
+  -D P_LORA_BUSY=2
+  -D P_LORA_SCLK=10
+  -D P_LORA_MISO=12
+  -D P_LORA_MOSI=11
+  -D SX126X_DIO2_AS_RF_SWITCH=true
+  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=130
+  -D SX126X_RX_BOOSTED_GAIN=1
+  -D LORA_TX_POWER=22
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D LORA_TX_POWER=22
-  -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${rp2040_base.build_src_filter}
-  +<helpers/rp2040/PicoWBoard.cpp>
-  +<../variants/picow>
+  +<PicoWBoard.cpp>
+  +<../variants/rpi_picow>
 lib_deps = ${rp2040_base.lib_deps}
 
 [env:PicoW_Repeater]
-extends = picow
-build_flags = ${picow.build_flags}
+extends = rpi_picow
+build_flags = ${rpi_picow.build_flags}
   -D ADVERT_NAME='"PicoW Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -28,12 +37,12 @@ build_flags = ${picow.build_flags}
   -D MAX_NEIGHBOURS=8
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${picow.build_src_filter}
+build_src_filter = ${rpi_picow.build_src_filter}
   +<../examples/simple_repeater>
 
 [env:PicoW_room_server]
-extends = picow
-build_flags = ${picow.build_flags}
+extends = rpi_picow
+build_flags = ${rpi_picow.build_flags}
   -D ADVERT_NAME='"Test Room"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -41,38 +50,38 @@ build_flags = ${picow.build_flags}
   -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${picow.build_src_filter}
+build_src_filter = ${rpi_picow.build_src_filter}
   +<../examples/simple_room_server>
 
 [env:PicoW_companion_radio_usb]
-extends = picow
-build_flags = ${picow.build_flags}
+extends = rpi_picow
+build_flags = ${rpi_picow.build_flags}
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${picow.build_src_filter}
+build_src_filter = ${rpi_picow.build_src_filter}
   +<../examples/companion_radio/*.cpp>
-lib_deps = ${picow.lib_deps}
+lib_deps = ${rpi_picow.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
 ; [env:PicoW_companion_radio_ble]
-; extends = picow
-; build_flags = ${picow.build_flags}
+; extends = rpi_picow
+; build_flags = ${rpi_picow.build_flags}
 ;   -D MAX_CONTACTS=100
 ;   -D MAX_GROUP_CHANNELS=8
 ;   -D BLE_PIN_CODE=123456
 ;   -D BLE_DEBUG_LOGGING=1
 ; ;  -D MESH_PACKET_LOGGING=1
 ; ;  -D MESH_DEBUG=1
-; build_src_filter = ${picow.build_src_filter}
+; build_src_filter = ${rpi_picow.build_src_filter}
 ;   +<../examples/companion_radio/*.cpp>
-; lib_deps = ${picow.lib_deps}
+; lib_deps = ${rpi_picow.lib_deps}
 ;   densaugeo/base64 @ ~1.4.0
 
 ; [env:PicoW_companion_radio_wifi]
-; extends = picow
-; build_flags = ${picow.build_flags}
+; extends = rpi_picow
+; build_flags = ${rpi_picow.build_flags}
 ;   -D MAX_CONTACTS=100
 ;   -D MAX_GROUP_CHANNELS=8
 ;   -D WIFI_DEBUG_LOGGING=1
@@ -80,19 +89,19 @@ lib_deps = ${picow.lib_deps}
 ;   -D WIFI_PWD='"mypwd"'
 ; ;  -D MESH_PACKET_LOGGING=1
 ; ;  -D MESH_DEBUG=1
-; build_src_filter = ${picow.build_src_filter}
+; build_src_filter = ${rpi_picow.build_src_filter}
 ;   +<../examples/companion_radio/*.cpp>
-; lib_deps = ${picow.lib_deps}
+; lib_deps = ${rpi_picow.lib_deps}
 ;   densaugeo/base64 @ ~1.4.0
 
 [env:PicoW_terminal_chat]
-extends = picow
-build_flags = ${picow.build_flags}
+extends = rpi_picow
+build_flags = ${rpi_picow.build_flags}
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${picow.build_src_filter}
+build_src_filter = ${rpi_picow.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
-lib_deps = ${picow.lib_deps}
+lib_deps = ${rpi_picow.lib_deps}
   densaugeo/base64 @ ~1.4.0

variants/rpi_picow/target.h

@@ -3,7 +3,7 @@
 #define RADIOLIB_STATIC_ONLY 1
 #include <RadioLib.h>
 #include <helpers/radiolib/RadioLibWrappers.h>
-#include <helpers/rp2040/PicoWBoard.h>
+#include <PicoWBoard.h>
 #include <helpers/radiolib/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/SensorManager.h>