Merge branch 'master' into esp-idf5

This commit is contained in:
Ben Meadors 2025-03-27 07:46:36 -05:00 committed by GitHub
commit 11ca63c0ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions

View File

@ -17,8 +17,8 @@ SET "LOGCOUNTER=0"
SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone" SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
SET "C3=esp32c3" SET "C3=esp32c3"
@REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable. @REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger" SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core t-watch-s3 tracksenger"
SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite t-watch-s3" SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite"
GOTO getopts GOTO getopts
:help :help

View File

@ -22,6 +22,7 @@ BIGDB_8MB=(
"icarus" "icarus"
"seeed-xiao-s3" "seeed-xiao-s3"
"tbeam-s3-core" "tbeam-s3-core"
"t-watch-s3"
"tracksenger" "tracksenger"
) )
BIGDB_16MB=( BIGDB_16MB=(
@ -33,7 +34,6 @@ BIGDB_16MB=(
"m5stack-cores3" "m5stack-cores3"
"station-g2" "station-g2"
"t-eth-elite" "t-eth-elite"
"t-watch-s3"
) )
S3_VARIANTS=( S3_VARIANTS=(
"s3" "s3"

View File

@ -3,7 +3,7 @@
extends = esp32s3_base extends = esp32s3_base
board = t-watch-s3 board = t-watch-s3
board_check = true board_check = true
board_build.partitions = default_16MB.csv board_build.partitions = default_8MB.csv
upload_protocol = esptool upload_protocol = esptool
build_flags = ${esp32s3_base.build_flags} build_flags = ${esp32s3_base.build_flags}