From 8a5981644d3bf6db1a83a6ab4b8145124d0bea74 Mon Sep 17 00:00:00 2001 From: Xuejie Xiao Date: Sun, 5 Jul 2026 08:00:46 +0800 Subject: [PATCH] Fix board type selection for waveshare esp32-s3-epaper-1.54 (#2101) Right now when we follow the tips in: https://github.com/78/xiaozhi-esp32/tree/main/main/boards/waveshare/esp32-s3-epaper-1.54 and run the following command: python ./scripts/release.py --name esp32-s3-epaper-1.54-v2 waveshare/esp32-s3-epaper-1.54 It will actually build the firmware for v1. This commit fixes it. --- main/boards/waveshare/esp32-s3-epaper-1.54/config.json | 2 ++ scripts/release.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/main/boards/waveshare/esp32-s3-epaper-1.54/config.json b/main/boards/waveshare/esp32-s3-epaper-1.54/config.json index a298dad8..81b7f3ad 100644 --- a/main/boards/waveshare/esp32-s3-epaper-1.54/config.json +++ b/main/boards/waveshare/esp32-s3-epaper-1.54/config.json @@ -5,6 +5,7 @@ { "name": "esp32-s3-epaper-1.54-v2", "sdkconfig_append": [ + "CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_ePaper_1_54_v2=y", "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y", "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/8m.csv\"", "CONFIG_USE_MULTILINE_CHAT_MESSAGE=y" @@ -13,6 +14,7 @@ { "name": "esp32-s3-epaper-1.54-v1", "sdkconfig_append": [ + "CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_ePaper_1_54_v1=y", "CONFIG_SPIRAM_MODE_QUAD=y", "CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y", "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/4m.csv\"", diff --git a/scripts/release.py b/scripts/release.py index 299d4bc7..90929626 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -162,7 +162,7 @@ def _find_board_config_candidates(board_type: str) -> list[str]: def _extract_board_config_from_sdkconfig_append(sdkconfig_append: list[str]) -> Optional[str]: """Extract explicit CONFIG_BOARD_TYPE_xxx=y from sdkconfig_append, if present.""" - pattern = re.compile(r"^(CONFIG_BOARD_TYPE_[A-Z0-9_]+)=y$") + pattern = re.compile(r"^(CONFIG_BOARD_TYPE_[A-Za-z0-9_]+)=y$") matches = [] for item in sdkconfig_append: m = pattern.match(item.strip())