Merge branch 'master' into apollo

2025-12-23 03:00:56 +00:00 · 2024-06-13 22:22:58 +02:00
parent f2116a06a7 16b41b51af
commit 688385fd75
143 changed files with 13363 additions and 413 deletions
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -1,6 +1,7 @@
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
 extends = arduino_base
+custom_esp32_kind = esp32
 platform = platformio/espressif32@6.7.0

 build_src_filter = 
--- a/arch/esp32/esp32c3.ini
+++ b/arch/esp32/esp32c3.ini
@@ -1,4 +1,7 @@
 [esp32c3_base]
 extends = esp32_base
+
+custom_esp32_kind = esp32c3
+
 monitor_speed = 115200
 monitor_filters = esp32_c3_exception_decoder
--- a/arch/esp32/esp32s2.ini
+++ b/arch/esp32/esp32s2.ini
@@ -1,5 +1,6 @@
 [esp32s2_base]
 extends = esp32_base
+custom_esp32_kind = esp32s2

 build_src_filter = 
 ${esp32_base.build_src_filter} - <libpax/> -<nimble/> -<mesh/raspihttp>
--- a/arch/esp32/esp32s3.ini
+++ b/arch/esp32/esp32s3.ini
@@ -1,3 +1,6 @@
 [esp32s3_base]
 extends = esp32_base
+
+custom_esp32_kind = esp32s3
+
 monitor_speed = 115200