Merge branch 'master' into picomputer-s3

variants/rak11310/platformio.ini

@@ -5,10 +5,9 @@ upload_protocol = picotool
 
 # add our variants files to the include and src paths
 build_flags = ${rp2040_base.build_flags} 
-  -DPRIVATE_HW
+  -DRAK11310
   -Ivariants/rak11310
   -DDEBUG_RP2040_PORT=Serial
-  -DUSE_TINYUSB
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}

variants/rak11310/variant.h

@@ -50,6 +50,4 @@
 #define SX126X_RESET LORA_RESET
 #define SX126X_POWER_EN 25
 #define SX126X_E22 // DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
-#endif
-
-#include <Adafruit_TinyUSB.h>
+#endif

variants/rpipico/platformio.ini

@@ -5,10 +5,9 @@ upload_protocol = picotool
 
 # add our variants files to the include and src paths
 build_flags = ${rp2040_base.build_flags} 
-  -DPRIVATE_HW
+  -DRPI_PICO
   -Ivariants/rpipico
   -DDEBUG_RP2040_PORT=Serial
-  -DUSE_TINYUSB
   -DHW_SPI1_DEVICE
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
 lib_deps =

variants/rpipico/variant.h

@@ -51,6 +51,4 @@
 #define SX126X_BUSY LORA_DIO2
 #define SX126X_RESET LORA_RESET
 #define SX126X_E22
-#endif
-
-#include <Adafruit_TinyUSB.h>
+#endif

variants/rpipicow/platformio.ini

@@ -6,10 +6,9 @@ upload_protocol = picotool
 
 # add our variants files to the include and src paths
 build_flags = ${rp2040_base.build_flags} 
-  -DPRIVATE_HW
+  -DRPI_PICO
   -Ivariants/rpipicow
   -DDEBUG_RP2040_PORT=Serial
-  -DUSE_TINYUSB
   -DHW_SPI1_DEVICE
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
 lib_deps =

variants/rpipicow/variant.h

@@ -49,6 +49,4 @@
 #define SX126X_BUSY LORA_DIO2
 #define SX126X_RESET LORA_RESET
 #define SX126X_E22
-#endif
-
-#include <Adafruit_TinyUSB.h>
+#endif