Merge pull request #3902 from Aircoookie/arduino_2_0_9

update esp32 platform to arduino-esp32 v2.0.9
2024-04-23 15:56:08 +02:00
parent 6e2bd77808
commit 7ca4fc070b
2 changed files with 53 additions and 17 deletions
--- a/platformio.ini
+++ b/platformio.ini
@@ -307,6 +307,13 @@ build_flags = -g
 default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv      ;; WLED standard for 4MB flash: 1.4MB firmware, 1MB filesystem
 ;default_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv   ;; WLEDMM alternative for 4MB flash:   1.8MB firmware, 256KB filesystem (esptool erase_flash needed before changing)

+tiny_partitions = tools/WLED_ESP32_2MB_noOTA.csv
+default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
+extended_partitions = tools/WLED_ESP32_4MB_700k_FS.csv
+big_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv     ;; 1.8MB firmware, 256KB filesystem, coredump support
+large_partitions = tools/WLED_ESP32_8MB.csv
+extreme_partitions = tools/WLED_ESP32_16MB_9MB_FS.csv
+
 lib_deps =
  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0 ;; WLEDMM this must be first in the list, otherwise Aircoookie/ESPAsyncWebServer pulls in an older version of AsyncTCP !!
  ; https://github.com/lorol/LITTLEFS.git
@@ -323,8 +330,8 @@ platformV4_pre = espressif32@5.2.0
 platformV4_packages_pre =
  toolchain-riscv32-esp @ 8.4.0+2021r2-patch5 ; required for platform version < 5.3.0, remove this line when upgrading to platform >=5.3.0
 ;;; standard V4 platform
-platformV4 = espressif32@5.3.0
-platformV4_packages =
+platformV4 = espressif32@ ~6.3.2
+platformV4_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)

 ;;; experimental: latest V4 platform with latest arduino-esp32 2.0.9 + ESP-IDF 4.4.4 (may or may not work)
 platformV4_xp = espressif32@ ~6.4.0
@@ -355,8 +362,8 @@ lib_depsV4 =
 ;;
 ;; please note that you can NOT update existing ESP32 installs with a "V4" build. Also updating by OTA will not work properly.
 ;; You need to completely erase your device (esptool erase_flash) first, then install the "V4" build from VSCode+platformio.
-platform = espressif32@5.3.0
-platform_packages =
+platform = espressif32@ ~6.3.2
+platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
 build_flags = -g
  -Wshadow=compatible-local ;; emit warning in case a local variable "shadows" another local one
  -DARDUINO_ARCH_ESP32 -DESP32
@@ -372,10 +379,13 @@ lib_deps =

 [esp32s2]
 ;; generic definitions for all ESP32-S2 boards
-platform = espressif32@5.2.0
-platform_packages =
-  toolchain-riscv32-esp @ 8.4.0+2021r2-patch5
-  toolchain-xtensa-esp32s2 @ 8.4.0+2021r2-patch5
+;;platform = espressif32@5.2.0
+;;platform_packages =
+;;  toolchain-riscv32-esp @ 8.4.0+2021r2-patch5
+;;  toolchain-xtensa-esp32s2 @ 8.4.0+2021r2-patch5
+platform = espressif32@ ~6.3.2
+platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
+
 build_flags = -g
  -DARDUINO_ARCH_ESP32 -DESP32                     ;; WLEDMM
  -DARDUINO_ARCH_ESP32S2
@@ -396,8 +406,8 @@ lib_deps =

 [esp32c3]
 ;; generic definitions for all ESP32-C3 boards
-platform = espressif32@5.3.0
-platform_packages =
+platform = espressif32@ ~6.3.2
+platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
 build_flags = -g
  -DARDUINO_ARCH_ESP32 -DESP32                     ;; WLEDMM
  -DARDUINO_ARCH_ESP32C3
@@ -417,8 +427,8 @@ lib_deps =

 [esp32s3]
 ;; generic definitions for all ESP32-S3 boards
-platform = espressif32@5.3.0
-platform_packages =
+platform = espressif32@ ~6.3.2
+platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
 build_flags = -g
  -DESP32
  -DARDUINO_ARCH_ESP32
@@ -431,7 +441,6 @@ build_flags = -g
  -DCO
  ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
  ;; ARDUINO_USB_MODE, ARDUINO_USB_CDC_ON_BOOT
-
 lib_deps =
  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
  makuna/NeoPixelBus @ 2.7.5
@@ -602,13 +611,29 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags} #-D WLED_RELEASE_NAME
  -DARDUINO_USB_CDC_ON_BOOT=1
 lib_deps = ${esp32s2.lib_deps}

+[env:esp32_wrover]
+extends = esp32_idf_V4
+platform = ${esp32_idf_V4.platform}
+platform_packages = ${esp32_idf_V4.platform_packages}
+board = ttgo-t7-v14-mini32
+board_build.f_flash = 80000000L
+board_build.flash_mode = qio
+board_build.partitions = ${esp32.extended_partitions}
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags_esp32_V4} -D WLED_RELEASE_NAME=ESP32_WROVER
+  -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue ;; Older ESP32 (rev.<3) need a PSRAM fix (increases static RAM used) https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/external-ram.html
+  -D LEDPIN=25
+  ; ${esp32.AR_build_flags}
+lib_deps = ${esp32_idf_V4.lib_deps}
+  ; ${esp32.AR_lib_deps}
+
 [env:esp32c3dev]
 extends = esp32c3
 platform = ${esp32c3.platform}
 platform_packages = ${esp32c3.platform_packages}
 framework = arduino
 board = esp32-c3-devkitm-1
-board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
+board_build.partitions = ${esp32.default_partitions}
 build_flags = ${common.build_flags} ${esp32c3.build_flags} -D WLED_RELEASE_NAME=ESP32-C3
  -D WLED_WATCHDOG_TIMEOUT=0
  -DLOLIN_WIFI_FIX ; seems to work much better with this
@@ -631,7 +656,8 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=
  ;-D ARDUINO_USB_CDC_ON_BOOT=1 ;; -D ARDUINO_USB_MODE=1 ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
  ;-D WLED_DEBUG
 lib_deps = ${esp32s3.lib_deps}
-board_build.partitions = tools/WLED_ESP32_8MB.csv
+  ${esp32.AR_lib_deps}
+board_build.partitions = ${esp32.large_partitions}
 board_build.f_flash = 80000000L
 board_build.flash_mode = qio
 ; board_build.flash_mode = dio   ;; try this if you have problems at startup
@@ -652,7 +678,8 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags}
  ; -D WLED_RELEASE_NAME=ESP32-S3_PSRAM
  -D WLED_USE_PSRAM -DBOARD_HAS_PSRAM ; tells WLED that PSRAM shall be used
 lib_deps = ${esp32s3.lib_deps}
-board_build.partitions = tools/WLED_ESP32_8MB.csv
+  ${esp32.AR_lib_deps}
+board_build.partitions = ${esp32.large_partitions}
 board_build.f_flash = 80000000L
 board_build.flash_mode = qio
 monitor_filters = esp32_exception_decoder
@@ -735,8 +762,11 @@ lib_deps = ${esp8266.lib_deps}
 platform = ${esp32s2.platform}
 platform_packages = ${esp32s2.platform_packages}
 board = lolin_s2_mini
-board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
+board_build.partitions = ${esp32.default_partitions}
 build_unflags = ${common.build_unflags} #-DARDUINO_USB_CDC_ON_BOOT=1
+;board_build.flash_mode = qio
+;board_build.f_flash = 80000000L
+build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME=ESP32-S2
  -DBOARD_HAS_PSRAM
  -DARDUINO_USB_CDC_ON_BOOT=1 # try disabling and enabling unflag above in case of board-specific issues, will disable Serial