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

arch/apollo3/apollo3.ini

@@ -1,15 +1,30 @@
 [apollo3_base]
-platform = https://github.com/nigelb/platform-apollo3blue.git#e24b0b1970aab9e7b20d759e5e86ce6b2647d1e1
-platform_packages=framework-arduinoapollo3@https://github.com/sparkfun/Arduino_Apollo3#v2.2.1
+platform = https://github.com/nigelb/platform-apollo3blue.git#2e8a9895cf82f2836c483885e6f89b3f83d3ade4
+platform_packages=framework-arduinoapollo3@https://github.com/sparkfun/Arduino_Apollo3#v2.2.2rc2
 framework = arduino
 build_type = debug
 build_flags = 
   ${arduino_base.build_flags}
   -Isrc/platform/apollo3 -g
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<mqtt/> -<graphics> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040> -<platform/stm32wl>
+  ${arduino_base.build_src_filter}
+  -<platform/nrf52>
+  -<platform/esp32/>
+  -<platform/rp2040>
+  -<platform/portduino>
+  -<platform/stm32wl>
+  -<nimble/>
+  -<mesh/api/>
+  -<mesh/http/>
+  -<modules/esp32>
+  -<mesh/eth/>
+  -<mqtt/>
+  -<graphics>
+  -<input>
+  -<buzz>
+  -<modules/Telemetry>
 lib_deps =
   ${env.lib_deps}
-  jgromes/RadioLib@^6.1.0
+  jgromes/RadioLib@^6.3.0
 lib_ignore = 
-  mathertel/OneButton@^2.0.3
+  mathertel/OneButton

arch/esp32/esp32.ini

@@ -4,7 +4,12 @@ extends = arduino_base
 platform = platformio/espressif32@6.3.2 # This is a temporary fix to the S3-based devices bluetooth issues until we can determine what within ESP-IDF changed and can develop a suitable patch. 
 
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<platform/apollo3> -<mesh/eth/>
+  ${arduino_base.build_src_filter}
+  -<platform/nrf52/>
+  -<platform/stm32wl>
+  -<platform/rp2040>
+  -<platform/apollo3>
+  -<mesh/eth/>
 
 upload_speed = 921600
 debug_init_break = tbreak setup

arch/nrf52/nrf52.ini

@@ -11,7 +11,17 @@ build_flags =
   -Isrc/platform/nrf52
 
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2040> -<platform/apollo3> -<mesh/eth/>
+  ${arduino_base.build_src_filter}
+  -<platform/esp32/>
+  -<platform/stm32wl>
+  -<nimble/>
+  -<mesh/wifi/>
+  -<mesh/api/>
+  -<mesh/http/>
+  -<modules/esp32>
+  -<platform/rp2040>
+  -<mesh/eth/>
+  -<platform/apollo3>
 
 lib_deps=
   ${arduino_base.lib_deps}

arch/portduino/portduino.ini

@@ -11,6 +11,7 @@ build_src_filter =
   -<platform/stm32wl/> 
   -<platform/rp2040>
   -<platform/apollo3>
+  -<mesh/wifi/>
   -<mesh/http/>
   -<mesh/eth/>
   -<modules/esp32>

arch/rp2040/rp2040.ini

@@ -1,8 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#0c33219f53faa035e188925ea1324f472e8b93d2
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#612de5399d68b359053f1307ed223d400aea975c
 extends = arduino_base
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#3.2.2
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#d2461a14ad5aa920e44508d236c2f459e3befbf8
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -12,7 +12,16 @@ build_flags =
   -D__PLAT_RP2040__
 #  -D _POSIX_THREADS
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/nrf52/> -<platform/apollo3> -<platform/stm32wl> -<mesh/eth/>
+  ${arduino_base.build_src_filter}
+  -<platform/esp32/>
+  -<nimble/>
+  -<modules/esp32>
+  -<platform/nrf52/>
+  -<platform/stm32wl>
+  -<mesh/eth/>
+  -<mesh/wifi/>
+  -<mesh/http/>
+  -<platform/apollo3>
 
 lib_ignore =
   BluetoothOTA

arch/stm32/stm32wl5e.ini

@@ -13,7 +13,21 @@ build_flags =
   -DVECT_TAB_OFFSET=0x08000000
   
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/apollo3> -<nimble/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040>
+  ${arduino_base.build_src_filter}
+  -<platform/esp32/>
+  -<nimble/> 
+  -<mesh/api/>
+  -<mesh/wifi/>
+  -<mesh/http/>
+  -<modules/esp32>
+  -<mesh/eth/>
+  -<input>
+  -<buzz>
+  -<modules/Telemetry>
+  -<platform/nrf52>
+  -<platform/portduino>
+  -<platform/rp2040>
+  -<platform/apollo3>
 
 board_upload.offset_address = 0x08000000
 upload_protocol = stlink
@@ -26,4 +40,4 @@ lib_deps =
   https://github.com/stm32duino/STM32FreeRTOS.git#10.3.1
 
 lib_ignore =
-  https://github.com/mathertel/OneButton#2.1.0
+  mathertel/OneButton