From 0e1aeb2eeb0990b680fc649d410ca788a2443fa6 Mon Sep 17 00:00:00 2001 From: Xiaoxia Date: Fri, 17 Jul 2026 05:09:20 +0800 Subject: [PATCH] Update project version to 2.4.0 and adjust component dependencies - Bump project version in CMakeLists.txt to 2.4.0. - Change espressif/esp_video component version to ^2.0.1 in idf_component.yml. - Modify AUDIO_INPUT_REFERENCE setting in config.h to false for m5stack-core-s3. - Remove unnecessary infinite loops in xmini_c3_board.cc during initialization. --- CMakeLists.txt | 2 +- main/boards/m5stack-core-s3/config.h | 2 +- main/boards/xmini-c3/xmini_c3_board.cc | 8 -------- main/idf_component.yml | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69d9c311..eb94cf8b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,5 +9,5 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. idf_build_set_property(MINIMAL_BUILD ON) -set(PROJECT_VER "2.3.0") +set(PROJECT_VER "2.4.0") project(xiaozhi) diff --git a/main/boards/m5stack-core-s3/config.h b/main/boards/m5stack-core-s3/config.h index e0037829..69ba581d 100644 --- a/main/boards/m5stack-core-s3/config.h +++ b/main/boards/m5stack-core-s3/config.h @@ -5,7 +5,7 @@ #include -#define AUDIO_INPUT_REFERENCE true +#define AUDIO_INPUT_REFERENCE false #define AUDIO_INPUT_SAMPLE_RATE 24000 #define AUDIO_OUTPUT_SAMPLE_RATE 24000 diff --git a/main/boards/xmini-c3/xmini_c3_board.cc b/main/boards/xmini-c3/xmini_c3_board.cc index 53c409ed..f9e7a93f 100644 --- a/main/boards/xmini-c3/xmini_c3_board.cc +++ b/main/boards/xmini-c3/xmini_c3_board.cc @@ -173,18 +173,10 @@ public: XminiC3Board() : boot_button_(BOOT_BUTTON_GPIO) { InitializeCodecI2c(); InitializeSsd1306Display(); - while (true) { - ESP_LOGI(TAG, "Initializing SSD1306 display"); - vTaskDelay(1000 / portTICK_PERIOD_MS); - } InitializeButtons(); InitializePowerSaveTimer(); InitializeTools(); - while (true) { - ESP_LOGI(TAG, "Waiting for boot button to be pressed"); - vTaskDelay(1000 / portTICK_PERIOD_MS); - } // 避免使用错误的固件,把 EFUSE 操作放在最后 // 把 ESP32C3 的 VDD SPI 引脚作为普通 GPIO 口使用 esp_efuse_write_field_bit(ESP_EFUSE_VDD_SPI_AS_GPIO); diff --git a/main/idf_component.yml b/main/idf_component.yml index ca261ff1..5f1852df 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -43,7 +43,7 @@ dependencies: rules: - if: target in [esp32s3] espressif/esp_video: - version: ^2.3.0 + version: ^2.0.1 rules: - if: target in [esp32p4, esp32s3]