Merge branch '2.6' into update-indicator-speed-again

This commit is contained in:
rcarteraz 2025-02-07 15:41:21 -07:00 committed by GitHub
commit 102c328436
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 9 deletions

View File

@ -2,7 +2,6 @@
extends = esp32s3_base
board = bpi_picow_esp32_s3
board_check = true
board_level = extra
;OpenOCD flash method
;upload_protocol = esp-builtin
;Normal method
@ -23,7 +22,6 @@ build_src_filter =
[env:picomputer-s3-tft]
extends = env:picomputer-s3
board_level = main
board_build.partitions = default_8MB.csv ; just for test
build_flags =
@ -63,4 +61,4 @@ build_src_filter =
+<../lib/device-ui/generated/ui_320x240>
+<../lib/device-ui/resources>
+<../lib/device-ui/locale>
+<../lib/device-ui/source>
+<../lib/device-ui/source>

View File

@ -6,7 +6,6 @@ platform_packages =
board = seeed-sensecap-indicator
board_check = true
board_level = extra
upload_protocol = esptool
build_flags = ${esp32_base.build_flags}

View File

@ -2,7 +2,6 @@
[env:t-deck]
extends = esp32s3_base
board = t-deck
board_level = extra
board_check = true
upload_protocol = esptool
@ -22,7 +21,6 @@ lib_deps = ${esp32s3_base.lib_deps}
[env:t-deck-tft]
extends = env:t-deck
board_build.partitions = default_16MB.csv
board_level = main
build_flags =
${env:t-deck.build_flags}
@ -81,4 +79,4 @@ build_src_filter =
lib_deps =
${env:t-deck.lib_deps}
bitbank2/bb_captouch@1.2.2 ; alternative touch library supporting GT911
bitbank2/bb_captouch@1.2.2 ; alternative touch library supporting GT911

View File

@ -3,7 +3,6 @@
[env:unphone]
extends = esp32s3_base
board = unphone
board_level = extra
upload_speed = 921600
monitor_speed = 115200
monitor_filters = esp32_exception_decoder
@ -33,7 +32,6 @@ lib_deps = ${esp32s3_base.lib_deps}
[env:unphone-tft]
extends = env:unphone
board_level = main
board_build.partitions = default_8MB.csv
build_flags =
${env:unphone.build_flags}