Merge branch 'master' into apollo

2025-12-22 02:32:23 +00:00 · 2024-03-18 12:03:44 +01:00
parent a7c0109349 aae49f5ecf
commit 93d7f24d74
115 changed files with 2143 additions and 568 deletions
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -10,6 +10,7 @@ build_src_filter =
  -<platform/rp2040>
  -<platform/apollo3>
  -<mesh/eth/>
+  -<mesh/raspihttp>

 upload_speed = 921600
 debug_init_break = tbreak setup
--- a/arch/esp32/esp32s2.ini
+++ b/arch/esp32/esp32s2.ini
@@ -2,7 +2,7 @@
 extends = esp32_base

 build_src_filter = 
-  ${esp32_base.build_src_filter} -<nimble/>
+  ${esp32_base.build_src_filter} -<nimble/> -<mesh/raspihttp>

 monitor_speed = 115200

@@ -12,5 +12,4 @@ build_flags =
  
 lib_ignore = 
  ${esp32_base.lib_ignore} 
-  NimBLE-Arduino
-
+  NimBLE-Arduino