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