From a54ad6ba75694386e4963ab98e20bdd4fb9523f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 24 Apr 2023 17:09:47 +0200 Subject: [PATCH] update apollo platform files and exclude from building other platforms --- arch/apollo3/apollo3.ini | 4 ++-- arch/esp32/esp32.ini | 2 +- arch/esp32/esp32c3.ini | 2 +- arch/esp32/esp32s2.ini | 2 +- arch/esp32/esp32s3.ini | 2 +- arch/nrf52/nrf52.ini | 2 +- arch/portduino/portduino.ini | 1 + arch/rp2040/rp2040.ini | 2 +- arch/stm32/stm32wl5e.ini | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/apollo3/apollo3.ini b/arch/apollo3/apollo3.ini index 2842e33b0b..75eaf89e57 100644 --- a/arch/apollo3/apollo3.ini +++ b/arch/apollo3/apollo3.ini @@ -1,6 +1,6 @@ [apollo3_base] -platform = apollo3blue -platform_packages=framework-arduinoapollo3@https://github.com/sparkfun/Arduino_Apollo3#v2.2.0 +platform = https://github.com/nigelb/platform-apollo3blue.git#cdbb76ec805033a4543f2d3c136d926d06bfc361 +platform_packages=framework-arduinoapollo3@https://github.com/sparkfun/Arduino_Apollo3#v2.2.1 framework = arduino build_type = debug build_flags = diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini index fb83ec2d48..2f8450c7a8 100644 --- a/arch/esp32/esp32.ini +++ b/arch/esp32/esp32.ini @@ -3,7 +3,7 @@ extends = arduino_base platform = platformio/espressif32@^6.1.0 build_src_filter = - ${arduino_base.build_src_filter} - - - - + ${arduino_base.build_src_filter} - - - - - upload_speed = 921600 debug_init_break = tbreak setup monitor_filters = esp32_exception_decoder diff --git a/arch/esp32/esp32c3.ini b/arch/esp32/esp32c3.ini index 5ebb789ad7..d35e25ef29 100644 --- a/arch/esp32/esp32c3.ini +++ b/arch/esp32/esp32c3.ini @@ -2,7 +2,7 @@ extends = arduino_base platform = platformio/espressif32@^6.1.0 build_src_filter = - ${arduino_base.build_src_filter} - - - - + ${arduino_base.build_src_filter} - - - - - upload_speed = 961200 monitor_speed = 115200 debug_init_break = tbreak setup diff --git a/arch/esp32/esp32s2.ini b/arch/esp32/esp32s2.ini index 6e75c08c98..e2236a0cab 100644 --- a/arch/esp32/esp32s2.ini +++ b/arch/esp32/esp32s2.ini @@ -2,7 +2,7 @@ extends = arduino_base platform = platformio/espressif32@^6.1.0 build_src_filter = - ${arduino_base.build_src_filter} - - - - - + ${arduino_base.build_src_filter} - - - - - - upload_speed = 961200 monitor_speed = 115200 debug_init_break = tbreak setup diff --git a/arch/esp32/esp32s3.ini b/arch/esp32/esp32s3.ini index bb0214f464..96057f1181 100644 --- a/arch/esp32/esp32s3.ini +++ b/arch/esp32/esp32s3.ini @@ -2,7 +2,7 @@ extends = arduino_base platform = platformio/espressif32@^6.1.0 build_src_filter = - ${arduino_base.build_src_filter} - - - - + ${arduino_base.build_src_filter} - - - - - upload_speed = 961200 monitor_speed = 115200 debug_init_break = tbreak setup diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini index c2287d7e51..0655420046 100644 --- a/arch/nrf52/nrf52.ini +++ b/arch/nrf52/nrf52.ini @@ -8,7 +8,7 @@ build_flags = ${arduino_base.build_flags} -Wno-unused-variable -Isrc/platform/nrf52 build_src_filter = - ${arduino_base.build_src_filter} - - - - - - - - - + ${arduino_base.build_src_filter} - - - - - - - - - - lib_ignore = BluetoothOTA diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini index 100f3538dd..2d45382f5d 100644 --- a/arch/portduino/portduino.ini +++ b/arch/portduino/portduino.ini @@ -9,6 +9,7 @@ build_src_filter = - - - + - - - - diff --git a/arch/rp2040/rp2040.ini b/arch/rp2040/rp2040.ini index c41f92892d..6df6d47772 100644 --- a/arch/rp2040/rp2040.ini +++ b/arch/rp2040/rp2040.ini @@ -10,7 +10,7 @@ build_flags = -D__PLAT_RP2040__ # -D _POSIX_THREADS build_src_filter = - ${arduino_base.build_src_filter} - - - - - - - - - + ${arduino_base.build_src_filter} - - - - - - - -- - lib_ignore = BluetoothOTA lib_deps = diff --git a/arch/stm32/stm32wl5e.ini b/arch/stm32/stm32wl5e.ini index a38fb65e87..8dc1dcbf87 100644 --- a/arch/stm32/stm32wl5e.ini +++ b/arch/stm32/stm32wl5e.ini @@ -10,7 +10,7 @@ build_flags = # Arduino/PlatformIO framework-arduinoststm32 package does not presently have SUBGHZSPI support # -DPIN_SPI_MOSI=PINSUBGHZSPIMOSI -DPIN_SPI_MISO=PINSUBGHZSPIMISO -DPIN_SPI_SCK=PINSUBGHZSPISCK build_src_filter = - ${arduino_base.build_src_filter} - - - - - - - - - - - - - - + ${arduino_base.build_src_filter} - - - - - - - - - - - - - - - lib_deps = ${env.lib_deps} https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b