Merge remote-tracking branch 'remotes/origin/master' into apollo

# Conflicts:
#	arch/nrf52/nrf52.ini
#	arch/portduino/portduino.ini
#	arch/rp2040/rp2040.ini
#	arch/stm32/stm32wl5e.ini

variants/diy/hydra/variant.h

@@ -18,6 +18,7 @@
 
 // Radio
 #define USE_SX1262 // E22-900M30S uses SX1262
+#define USE_SX1268 // E22-400M30S uses SX1268
 #define SX126X_MAX_POWER                                                                                                         \
     22 // Outputting 22dBm from SX1262 results in ~30dBm E22-900M30S output (module only uses last stage of the YP2233W PA)
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8 // E22 series TCXO reference voltage is 1.8V

variants/rpipicow/platformio.ini

@@ -8,8 +8,10 @@ upload_protocol = picotool
 build_flags = ${rp2040_base.build_flags} 
   -DRPI_PICO
   -Ivariants/rpipicow
-  -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
+  -fexceptions  # for exception handling in MQTT
+build_src_filter = ${rp2040_base.build_src_filter} +<mesh/wifi/>
 lib_deps =
-  ${rp2040_base.lib_deps}
+  ${rp2040_base.lib_deps}
+  ${networking_base.lib_deps}

variants/rpipicow/variant.h

@@ -4,6 +4,10 @@
 
 #define ARDUINO_ARCH_AVR
 
+#ifndef HAS_WIFI
+#define HAS_WIFI 1
+#endif
+
 #define USE_SH1106 1
 
 // default I2C pins:
@@ -46,4 +50,4 @@
 #define SX126X_RESET LORA_RESET
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
-#endif
+#endif