From 46f41e90381f6512b9d810a656d5cca81cea8312 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:58:14 +0100
Subject: [PATCH] matrixportal: switch to "tinyUF2" (adafruit bootloader)

---
 platformio.ini | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 851235ee..91ef9b99 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -106,8 +106,8 @@ default_envs =
   esp01_1MB_S
   ;;
   athom_music_esp32_4MB_M
-  adafruit_matrixportal_esp32s3 ;;  HUB75 supported
-  ; adafruit_matrixportal_esp32s3_tinyUF2 ;; experimental - uses adafruit bootloader
+  adafruit_matrixportal_esp32s3_tinyUF2  ;;  HUB75 supported, uses adafruit bootloader
+  ; adafruit_matrixportal_esp32s3_legacy ;;  ty this if the "tinyUF2" firmware doesn't run on your board
 
 ; Go to MoonModules environments for environments
 
@@ -2793,7 +2793,7 @@ lib_ignore =
 ;
 
 
-[env:adafruit_matrixportal_esp32s3]
+[env:adafruit_matrixportal_esp32s3_legacy]
 ; ESP32-S3 processor, 8 MB flash, 2 MB of PSRAM, dedicated driver pins for HUB75
 extends = esp32_4MB_V4_M_base
 platform = ${esp32.platformV4_xp} ;; 6.5.0 = first platform release supporting matrixportal
@@ -2810,7 +2810,7 @@ build_unflags = ${env:esp32S3_8MB_M.build_unflags}   ;; use the same as "normal"
 build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
   ${common_mm.build_flags_S}
   ${Speed_Flags.build_flags_V4}  ;; -O2 -> optimize for speed instead of size
-  -D WLED_RELEASE_NAME=matrixportal_esp32s3
+  -D WLED_RELEASE_NAME=matrixportal_esp32s3_legacy
   -D SERVERNAME='"WLED-MatrixPortalS3"'
   ; Serial debug enabled  -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=1 ;; for Hardware-CDC USB mode
   -D ARDUINO_USB_CDC_ON_BOOT=0
@@ -2836,14 +2836,19 @@ monitor_filters = esp32_exception_decoder
 
 ;; this buildenv uses the original bootloader and partions from adafruit
 [env:adafruit_matrixportal_esp32s3_tinyUF2]
-extends = env:adafruit_matrixportal_esp32s3
+extends = env:adafruit_matrixportal_esp32s3_legacy
+
 board_build.partitions = tools/partitions-8MB_spiffs-tinyuf2.csv    ;; use original adafruit 8MB tinyUF2 partitioning
 
 ;; we just replace WLED_RELEASE_NAME
-build_unflags = ${env:adafruit_matrixportal_esp32s3.build_unflags}
-  -D WLED_RELEASE_NAME=matrixportal_esp32s3
-build_flags = ${env:adafruit_matrixportal_esp32s3.build_flags}
+build_unflags = ${env:adafruit_matrixportal_esp32s3_legacy.build_unflags}
+  -D WLED_RELEASE_NAME=matrixportal_esp32s3_legacy
+build_flags = ${env:adafruit_matrixportal_esp32s3_legacy.build_flags}
   -D WLED_RELEASE_NAME=matrixportal_esp32s3_tinyUF2
 ; 
 ; RAM:   [==        ]  18.4% (used 60456 bytes from 327680 bytes)
 ; Flash: [========  ]  79.9% (used 1675601 bytes from 2097152 bytes)
+
+[env:adafruit_matrixportal_esp32s3]
+;; this buildenv is just an alias for the matrixportal UF2 build, to keep 3rd party build tools happy.
+extends = env:adafruit_matrixportal_esp32s3_tinyUF2