Update to v1.9.4 (#1374)

* fix: Corrected the inverted touch screen parameter configuration of lichuang_S3_dev, which caused touch offset. (#1209)

* ci: support multiple variants per board (#1036)

* fix release.py

* OTTO 左右腿反了 (#1239)

* Change the button array to ADC buttons as in the board for esp32s3-korv2 (#1256)

* Change the button array to ADC buttons as in the board for esp32s3-korv2

* Add MuteVol function to control audio volume

* Optimize AdcBatteryMonitor to work without charge detection pin. (#1276)

Co-authored-by: Yuv Zhao <admin@yuvcloud.com>

* 修复charging_pin为NC充电时Battery Level不更新的问题 (#1316)

Co-authored-by: Yuv Zhao <admin@yuvcloud.com>

* Bump to 1.9.4

---------

Co-authored-by: ZhouShaoYuan <cnfalcon@qq.com>
Co-authored-by: laride <198868291+laride@users.noreply.github.com>
Co-authored-by: Toby <naivetoby@gmail.com>
Co-authored-by: masc2008 <masc2008@gmail.com>
Co-authored-by: konglingboy <konglingboy@sina.com>
Co-authored-by: Yuv Zhao <admin@yuvcloud.com>

.github/workflows/build.yml

@@ -14,10 +14,10 @@ permissions:
 
 jobs:
   prepare:
-    name: Determine boards to build
+    name: Determine variants to build
     runs-on: ubuntu-latest
     outputs:
-      boards: ${{ steps.select.outputs.boards }}
+      variants: ${{ steps.select.outputs.variants }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -28,30 +28,30 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y jq
 
       - id: list
-        name: Get all board list
+        name: Get all variant list
         run: |
-          echo "all_boards=$(python scripts/release.py --list-boards --json)" >> $GITHUB_OUTPUT
+          echo "all_variants=$(python scripts/release.py --list-boards --json)" >> $GITHUB_OUTPUT
 
       - id: select
-        name: Select boards based on changes
+        name: Select variants based on changes
         env:
-          ALL_BOARDS: ${{ steps.list.outputs.all_boards }}
+          ALL_VARIANTS: ${{ steps.list.outputs.all_variants }}
         run: |
           EVENT_NAME="${{ github.event_name }}"
 
-          # For push to main branch, build all boards
+          # push 到 main 分支，编译全部变体
           if [[ "$EVENT_NAME" == "push" ]]; then
-            echo "boards=$ALL_BOARDS" >> $GITHUB_OUTPUT
+            echo "variants=$ALL_VARIANTS" >> $GITHUB_OUTPUT
             exit 0
           fi
 
-          # For pull_request
+          # pull_request 场景
           BASE_SHA="${{ github.event.pull_request.base.sha }}"
           HEAD_SHA="${{ github.event.pull_request.head.sha }}"
           echo "Base: $BASE_SHA, Head: $HEAD_SHA"
 
           CHANGED=$(git diff --name-only $BASE_SHA $HEAD_SHA || true)
-          echo "Changed files:\n$CHANGED"
+          echo -e "Changed files:\n$CHANGED"
 
           NEED_ALL=0
           declare -A AFFECTED
@@ -60,6 +60,10 @@ jobs:
               NEED_ALL=1
             fi
 
+            if [[ "$file" == main/boards/common/* ]]; then
+              NEED_ALL=1
+            fi
+
             if [[ "$file" == main/boards/* ]]; then
               board=$(echo "$file" | cut -d '/' -f3)
               AFFECTED[$board]=1
@@ -67,24 +71,25 @@ jobs:
           done <<< "$CHANGED"
 
           if [[ "$NEED_ALL" -eq 1 ]]; then
-            echo "boards=$ALL_BOARDS" >> $GITHUB_OUTPUT
+            echo "variants=$ALL_VARIANTS" >> $GITHUB_OUTPUT
           else
             if [[ ${#AFFECTED[@]} -eq 0 ]]; then
-              echo "boards=[]" >> $GITHUB_OUTPUT
+              echo "variants=[]" >> $GITHUB_OUTPUT
             else
-              JSON=$(printf '%s\n' "${!AFFECTED[@]}" | sort -u | jq -R -s -c 'split("\n")[:-1]')
-              echo "boards=$JSON" >> $GITHUB_OUTPUT
+              BOARDS_JSON=$(printf '%s\n' "${!AFFECTED[@]}" | sort -u | jq -R -s -c 'split("\n")[:-1]')
+              FILTERED=$(echo "$ALL_VARIANTS" | jq -c --argjson boards "$BOARDS_JSON" 'map(select(.board as $b | $boards | index($b)))')
+              echo "variants=$FILTERED" >> $GITHUB_OUTPUT
             fi
           fi
 
   build:
-    name: Build ${{ matrix.board }}
+    name: Build ${{ matrix.name }}
     needs: prepare
-    if: ${{ needs.prepare.outputs.boards != '[]' }}
+    if: ${{ needs.prepare.outputs.variants != '[]' }}
     strategy:
-      fail-fast: false  # 单个 board 失败不影响其它 board
+      fail-fast: false  # 单个变体失败不影响其它变体
       matrix:
-        board: ${{ fromJson(needs.prepare.outputs.boards) }}
+        include: ${{ fromJson(needs.prepare.outputs.variants) }}
     runs-on: ubuntu-latest
     container:
       image: espressif/idf:release-v5.4
@@ -92,15 +97,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Build current board
+      - name: Build current variant
         shell: bash
         run: |
           source $IDF_PATH/export.sh
-          python scripts/release.py ${{ matrix.board }}
+          python scripts/release.py ${{ matrix.board }} --name ${{ matrix.name }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: xiaozhi_${{ matrix.board }}_${{ github.sha }}.bin
+          name: xiaozhi_${{ matrix.name }}_${{ github.sha }}.bin
           path: build/merged-binary.bin
-          if-no-files-found: error
+          if-no-files-found: error

CMakeLists.txt

@@ -4,7 +4,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(PROJECT_VER "1.8.9")
+set(PROJECT_VER "1.9.4")
 
 # Add this line to disable the specific warning
 add_compile_options(-Wno-missing-field-initializers)

main/CMakeLists.txt

@@ -86,6 +86,8 @@ elseif(CONFIG_BOARD_TYPE_ATOMS3R_ECHO_BASE)
     set(BOARD_TYPE "atoms3r-echo-base")
 elseif(CONFIG_BOARD_TYPE_ATOMS3R_CAM_M12_ECHO_BASE)
     set(BOARD_TYPE "atoms3r-cam-m12-echo-base")
+elseif(CONFIG_BOARD_TYPE_ATOM_ECHOS3R)
+    set(BOARD_TYPE "atom-echos3r")
 elseif(CONFIG_BOARD_TYPE_ATOMMATRIX_ECHO_BASE)
     set(BOARD_TYPE "atommatrix-echo-base")
 elseif(CONFIG_BOARD_TYPE_XMINI_C3_V3)
@@ -104,6 +106,8 @@ elseif(CONFIG_BOARD_TYPE_ESP_HI)
     set(BOARD_TYPE "esp-hi")
 elseif(CONFIG_BOARD_TYPE_ECHOEAR)
     set(BOARD_TYPE "echoear")
+elseif(CONFIG_BOARD_TYPE_ESP32S3_AUDIO_BOARD)
+    set(BOARD_TYPE "waveshare-s3-audio-board")
 elseif(CONFIG_BOARD_TYPE_ESP32S3_Touch_AMOLED_1_8)
     set(BOARD_TYPE "esp32-s3-touch-amoled-1.8")
 elseif(CONFIG_BOARD_TYPE_ESP32S3_Touch_AMOLED_2_06)
@@ -394,4 +398,4 @@ spiffs_create_partition_assets(
     MMAP_FILE_SUPPORT_FORMAT ".aaf, ttf, bin"
     IMPORT_INC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}
 )
-endif()
+endif()

main/Kconfig.projbuild

@@ -178,9 +178,15 @@ choice BOARD_TYPE
     config BOARD_TYPE_ATOMS3R_CAM_M12_ECHO_BASE
         bool "AtomS3R CAM/M12 + Echo Base"
         depends on IDF_TARGET_ESP32S3
+    config BOARD_TYPE_ATOM_ECHOS3R
+        bool "AtomEchoS3R"
+        depends on IDF_TARGET_ESP32S3
     config BOARD_TYPE_ATOMMATRIX_ECHO_BASE
         bool "AtomMatrix + Echo Base"
         depends on IDF_TARGET_ESP32
+    config BOARD_TYPE_ESP32S3_AUDIO_BOARD
+        bool "Waveshare ESP32-S3-Audio-Board"
+        depends on IDF_TARGET_ESP32S3
     config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_8
         bool "Waveshare ESP32-S3-Touch-AMOLED-1.8"
         depends on IDF_TARGET_ESP32S3
@@ -422,15 +428,27 @@ endchoice
 choice DISPLAY_ESP32S3_KORVO2_V3
     depends on BOARD_TYPE_ESP32S3_KORVO2_V3
     prompt "ESP32S3_KORVO2_V3 LCD Type"
-    default LCD_ST7789
+    default ESP32S3_KORVO2_V3_LCD_ST7789
     help
         屏幕类型选择
-    config LCD_ST7789
+    config ESP32S3_KORVO2_V3_LCD_ST7789
         bool "ST7789, 分辨率240*280"
-    config LCD_ILI9341
+    config ESP32S3_KORVO2_V3_LCD_ILI9341
         bool "ILI9341, 分辨率240*320"
 endchoice
 
+choice DISPLAY_ESP32S3_AUDIO_BOARD
+    depends on BOARD_TYPE_ESP32S3_AUDIO_BOARD
+    prompt "ESP32S3_AUDIO_BOARD LCD Type"
+    default AUDIO_BOARD_LCD_JD9853
+    help
+        屏幕类型选择
+    config AUDIO_BOARD_LCD_JD9853
+        bool "JD9853, 分辨率320*172"
+    config AUDIO_BOARD_LCD_ST7789
+        bool "ST7789, 分辨率240*320"
+endchoice
+
 config USE_WECHAT_MESSAGE_STYLE
     bool "Enable WeChat Message Style"
     default n
@@ -490,7 +508,10 @@ config USE_AUDIO_PROCESSOR
 config USE_DEVICE_AEC
     bool "Enable Device-Side AEC"
     default n
-        depends on USE_AUDIO_PROCESSOR && (BOARD_TYPE_ESP_BOX_3 || BOARD_TYPE_ESP_BOX || BOARD_TYPE_ESP_BOX_LITE || BOARD_TYPE_LICHUANG_DEV || BOARD_TYPE_ESP32S3_KORVO2_V3 || BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75 || BOARD_TYPE_ESP32S3_Touch_AMOLED_2_06 || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_4B || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_XC || BOARD_TYPE_ESP_S3_LCD_EV_Board_2)
+        depends on USE_AUDIO_PROCESSOR && (BOARD_TYPE_ESP_BOX_3 || BOARD_TYPE_ESP_BOX || BOARD_TYPE_ESP_BOX_LITE || BOARD_TYPE_LICHUANG_DEV \
+            || BOARD_TYPE_ESP32S3_KORVO2_V3 || BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75 || BOARD_TYPE_ESP32S3_Touch_AMOLED_2_06 \
+            || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_4B || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_XC || BOARD_TYPE_ESP_S3_LCD_EV_Board_2 \
+            || BOARD_TYPE_ECHOEAR)
     help
         因为性能不够，不建议和微信聊天界面风格同时开启
 

main/application.cc

@@ -5,7 +5,6 @@
 #include "audio_codec.h"
 #include "mqtt_protocol.h"
 #include "websocket_protocol.h"
-#include "font_awesome_symbols.h"
 #include "assets/lang_config.h"
 #include "mcp_server.h"
 
@@ -14,6 +13,7 @@
 #include <cJSON.h>
 #include <driver/gpio.h>
 #include <arpa/inet.h>
+#include <font_awesome.h>
 
 #define TAG "Application"
 
@@ -49,7 +49,7 @@ Application::Application() {
     esp_timer_create_args_t clock_timer_args = {
         .callback = [](void* arg) {
             Application* app = (Application*)arg;
-            app->OnClockTimer();
+            xEventGroupSetBits(app->event_group_, MAIN_EVENT_CLOCK_TICK);
         },
         .arg = this,
         .dispatch_method = ESP_TIMER_TASK,
@@ -87,7 +87,7 @@ void Application::CheckNewVersion(Ota& ota) {
 
             char buffer[256];
             snprintf(buffer, sizeof(buffer), Lang::Strings::CHECK_NEW_VERSION_FAILED, retry_delay, ota.GetCheckVersionUrl().c_str());
-            Alert(Lang::Strings::ERROR, buffer, "sad", Lang::Sounds::OGG_EXCLAMATION);
+            Alert(Lang::Strings::ERROR, buffer, "cloud_slash", Lang::Sounds::OGG_EXCLAMATION);
 
             ESP_LOGW(TAG, "Check new version failed, retry in %d seconds (%d/%d)", retry_delay, retry_count, MAX_RETRY);
             for (int i = 0; i < retry_delay; i++) {
@@ -103,13 +103,12 @@ void Application::CheckNewVersion(Ota& ota) {
         retry_delay = 10; // 重置重试延迟时间
 
         if (ota.HasNewVersion()) {
-            Alert(Lang::Strings::OTA_UPGRADE, Lang::Strings::UPGRADING, "happy", Lang::Sounds::OGG_UPGRADE);
+            Alert(Lang::Strings::OTA_UPGRADE, Lang::Strings::UPGRADING, "download", Lang::Sounds::OGG_UPGRADE);
 
             vTaskDelay(pdMS_TO_TICKS(3000));
 
             SetDeviceState(kDeviceStateUpgrading);
             
-            display->SetIcon(FONT_AWESOME_DOWNLOAD);
             std::string message = std::string(Lang::Strings::NEW_VERSION) + ota.GetFirmwareVersion();
             display->SetChatMessage("system", message.c_str());
 
@@ -130,7 +129,7 @@ void Application::CheckNewVersion(Ota& ota) {
                 ESP_LOGE(TAG, "Firmware upgrade failed, restarting audio service and continuing operation...");
                 audio_service_.Start(); // Restart audio service
                 board.SetPowerSaveMode(true); // Restore power save mode
-                Alert(Lang::Strings::ERROR, Lang::Strings::UPGRADE_FAILED, "sad", Lang::Sounds::OGG_EXCLAMATION);
+                Alert(Lang::Strings::ERROR, Lang::Strings::UPGRADE_FAILED, "circle_xmark", Lang::Sounds::OGG_EXCLAMATION);
                 vTaskDelay(pdMS_TO_TICKS(3000));
                 // Continue to normal operation (don't break, just fall through)
             } else {
@@ -195,7 +194,7 @@ void Application::ShowActivationCode(const std::string& code, const std::string&
     }};
 
     // This sentence uses 9KB of SRAM, so we need to wait for it to finish
-    Alert(Lang::Strings::ACTIVATION, message.c_str(), "happy", Lang::Sounds::OGG_ACTIVATION);
+    Alert(Lang::Strings::ACTIVATION, message.c_str(), "link", Lang::Sounds::OGG_ACTIVATION);
 
     for (const auto& digit : code) {
         auto it = std::find_if(digit_sounds.begin(), digit_sounds.end(),
@@ -207,7 +206,7 @@ void Application::ShowActivationCode(const std::string& code, const std::string&
 }
 
 void Application::Alert(const char* status, const char* message, const char* emotion, const std::string_view& sound) {
-    ESP_LOGW(TAG, "Alert %s: %s [%s]", status, message, emotion);
+    ESP_LOGW(TAG, "Alert [%s] %s: %s", emotion, status, message);
     auto display = Board::GetInstance().GetDisplay();
     display->SetStatus(status);
     display->SetEmotion(emotion);
@@ -333,6 +332,9 @@ void Application::Start() {
     /* Setup the display */
     auto display = board.GetDisplay();
 
+    // Print board name/version info
+    display->SetChatMessage("system", SystemInfo::GetUserAgent().c_str());
+
     /* Setup the audio service */
     auto codec = board.GetAudioCodec();
     audio_service_.Initialize(codec);
@@ -350,6 +352,12 @@ void Application::Start() {
     };
     audio_service_.SetCallbacks(callbacks);
 
+    // Start the main event loop task with priority 3
+    xTaskCreate([](void* arg) {
+        ((Application*)arg)->MainEventLoop();
+        vTaskDelete(NULL);
+    }, "main_event_loop", 2048 * 4, this, 3, &main_event_loop_task_handle_);
+
     /* Start the clock timer to update the status bar */
     esp_timer_start_periodic(clock_timer_handle_, 1000000);
 
@@ -378,6 +386,10 @@ void Application::Start() {
         protocol_ = std::make_unique<MqttProtocol>();
     }
 
+    protocol_->OnConnected([this]() {
+        DismissAlert();
+    });
+
     protocol_->OnNetworkError([this](const std::string& message) {
         last_error_message_ = message;
         xEventGroupSetBits(event_group_, MAIN_EVENT_ERROR);
@@ -493,6 +505,8 @@ void Application::Start() {
     });
     bool protocol_started = protocol_->Start();
 
+    // Print heap stats
+    SystemInfo::PrintHeapStats();
     SetDeviceState(kDeviceStateIdle);
 
     has_server_time_ = ota.HasServerTime();
@@ -503,23 +517,6 @@ void Application::Start() {
         // Play the success sound to indicate the device is ready
         audio_service_.PlaySound(Lang::Sounds::OGG_SUCCESS);
     }
-
-    // Print heap stats
-    SystemInfo::PrintHeapStats();
-}
-
-void Application::OnClockTimer() {
-    clock_ticks_++;
-
-    auto display = Board::GetInstance().GetDisplay();
-    display->UpdateStatusBar();
-
-    // Print the debug info every 10 seconds
-    if (clock_ticks_ % 10 == 0) {
-        // SystemInfo::PrintTaskCpuUsage(pdMS_TO_TICKS(1000));
-        // SystemInfo::PrintTaskList();
-        SystemInfo::PrintHeapStats();
-    }
 }
 
 // Add a async task to MainLoop
@@ -535,18 +532,17 @@ void Application::Schedule(std::function<void()> callback) {
 // If other tasks need to access the websocket or chat state,
 // they should use Schedule to call this function
 void Application::MainEventLoop() {
-    // Raise the priority of the main event loop to avoid being interrupted by background tasks (which has priority 2)
-    vTaskPrioritySet(NULL, 3);
-
     while (true) {
         auto bits = xEventGroupWaitBits(event_group_, MAIN_EVENT_SCHEDULE |
             MAIN_EVENT_SEND_AUDIO |
             MAIN_EVENT_WAKE_WORD_DETECTED |
             MAIN_EVENT_VAD_CHANGE |
+            MAIN_EVENT_CLOCK_TICK |
             MAIN_EVENT_ERROR, pdTRUE, pdFALSE, portMAX_DELAY);
+
         if (bits & MAIN_EVENT_ERROR) {
             SetDeviceState(kDeviceStateIdle);
-            Alert(Lang::Strings::ERROR, last_error_message_.c_str(), "sad", Lang::Sounds::OGG_EXCLAMATION);
+            Alert(Lang::Strings::ERROR, last_error_message_.c_str(), "circle_xmark", Lang::Sounds::OGG_EXCLAMATION);
         }
 
         if (bits & MAIN_EVENT_SEND_AUDIO) {
@@ -576,6 +572,19 @@ void Application::MainEventLoop() {
                 task();
             }
         }
+
+        if (bits & MAIN_EVENT_CLOCK_TICK) {
+            clock_ticks_++;
+            auto display = Board::GetInstance().GetDisplay();
+            display->UpdateStatusBar();
+        
+            // Print the debug info every 10 seconds
+            if (clock_ticks_ % 10 == 0) {
+                // SystemInfo::PrintTaskCpuUsage(pdMS_TO_TICKS(1000));
+                // SystemInfo::PrintTaskList();
+                SystemInfo::PrintHeapStats();
+            }
+        }
     }
 }
 
@@ -734,11 +743,20 @@ bool Application::CanEnterSleepMode() {
 }
 
 void Application::SendMcpMessage(const std::string& payload) {
-    Schedule([this, payload]() {
-        if (protocol_) {
+    if (protocol_ == nullptr) {
+        return;
+    }
+
+    // Make sure you are using main thread to send MCP message
+    if (xTaskGetCurrentTaskHandle() == main_event_loop_task_handle_) {
+        ESP_LOGI(TAG, "Send MCP message in main thread");
+        protocol_->SendMcpMessage(payload);
+    } else {
+        ESP_LOGI(TAG, "Send MCP message in sub thread");
+        Schedule([this, payload = std::move(payload)]() {
             protocol_->SendMcpMessage(payload);
-        }
-    });
+        });
+    }
 }
 
 void Application::SetAecMode(AecMode mode) {

main/application.h

@@ -9,7 +9,6 @@
 #include <string>
 #include <mutex>
 #include <deque>
-#include <vector>
 #include <memory>
 
 #include "protocol.h"
@@ -17,12 +16,15 @@
 #include "audio_service.h"
 #include "device_state_event.h"
 
+
 #define MAIN_EVENT_SCHEDULE (1 << 0)
 #define MAIN_EVENT_SEND_AUDIO (1 << 1)
 #define MAIN_EVENT_WAKE_WORD_DETECTED (1 << 2)
 #define MAIN_EVENT_VAD_CHANGE (1 << 3)
 #define MAIN_EVENT_ERROR (1 << 4)
 #define MAIN_EVENT_CHECK_NEW_VERSION_DONE (1 << 5)
+#define MAIN_EVENT_CLOCK_TICK (1 << 6)
+
 
 enum AecMode {
     kAecOff,
@@ -80,12 +82,27 @@ private:
     bool aborted_ = false;
     int clock_ticks_ = 0;
     TaskHandle_t check_new_version_task_handle_ = nullptr;
+    TaskHandle_t main_event_loop_task_handle_ = nullptr;
 
     void OnWakeWordDetected();
     void CheckNewVersion(Ota& ota);
     void ShowActivationCode(const std::string& code, const std::string& message);
-    void OnClockTimer();
     void SetListeningMode(ListeningMode mode);
 };
 
+
+class TaskPriorityReset {
+public:
+    TaskPriorityReset(BaseType_t priority) {
+        original_priority_ = uxTaskPriorityGet(NULL);
+        vTaskPrioritySet(NULL, priority);
+    }
+    ~TaskPriorityReset() {
+        vTaskPrioritySet(NULL, original_priority_);
+    }
+
+private:
+    BaseType_t original_priority_;
+};
+
 #endif // _APPLICATION_H_

main/audio/audio_service.cc

@@ -100,18 +100,18 @@ void AudioService::Start() {
 
 #if CONFIG_USE_AUDIO_PROCESSOR
     /* Start the audio input task */
-    xTaskCreatePinnedToCore([](void* arg) {
+    xTaskCreate([](void* arg) {
         AudioService* audio_service = (AudioService*)arg;
         audio_service->AudioInputTask();
         vTaskDelete(NULL);
-    }, "audio_input", 2048 * 3, this, 8, &audio_input_task_handle_, 1);
+    }, "audio_input", 2048 * 3, this, 8, &audio_input_task_handle_);
 
     /* Start the audio output task */
     xTaskCreate([](void* arg) {
         AudioService* audio_service = (AudioService*)arg;
         audio_service->AudioOutputTask();
         vTaskDelete(NULL);
-    }, "audio_output", 2048 * 2, this, 3, &audio_output_task_handle_);
+    }, "audio_output", 2048 * 2, this, 4, &audio_output_task_handle_);
 #else
     /* Start the audio input task */
     xTaskCreate([](void* arg) {
@@ -125,7 +125,7 @@ void AudioService::Start() {
         AudioService* audio_service = (AudioService*)arg;
         audio_service->AudioOutputTask();
         vTaskDelete(NULL);
-    }, "audio_output", 2048, this, 3, &audio_output_task_handle_);
+    }, "audio_output", 2048, this, 4, &audio_output_task_handle_);
 #endif
 
     /* Start the opus codec task */

main/boards/atom-echos3r/README.md

@@ -0,0 +1,45 @@
+# AtomEchoS3R
+## 简介
+
+AtomEchoS3R 是 M5Stack 推出的基于 ESP32-S3-PICO-1-N8R8 的物联网可编程控制器，采用了 ES8311 单声道音频解码器、MEMS 麦克风和 NS4150B 功率放大器的集成方案。
+
+开发版**不带屏幕、不带额外按键**，需要使用语音唤醒。必要时，需要使用 `idf.py monitor` 查看 log 以确定运行状态。
+
+## 配置、编译命令
+
+**配置编译目标为 ESP32S3**
+
+```bash
+idf.py set-target esp32s3
+```
+
+**打开 menuconfig 并配置**
+
+```bash
+idf.py menuconfig
+```
+
+分别配置如下选项：
+
+- `Xiaozhi Assistant` → `Board Type` → 选择 `AtomEchoS3R`
+- `Partition Table` → `Custom partition CSV file` → 删除原有内容，输入 `partitions/v1/8m.csv`
+- `Serial flasher config` → `Flash size` → 选择 `8 MB`
+- `Component config` → `ESP PSRAM` → `Support for external, SPI-connected RAM` → `SPI RAM config` → 选择 `Octal Mode PSRAM`
+
+按 `S` 保存，按 `Q` 退出。
+
+**编译**
+
+```bash
+idf.py build
+```
+
+**烧录**
+
+将 AtomEchoS3R 连接到电脑，按住侧面 RESET 按键，直到 RESET 按键下方绿灯闪烁。
+
+```bash
+idf.py flash
+```
+
+烧录完毕后，按一下 RESET 按钮重启设备。

main/boards/atom-echos3r/atom_echos3r.cc

@@ -0,0 +1,92 @@
+#include "wifi_board.h"
+#include "codecs/es8311_audio_codec.h"
+#include "application.h"
+#include "button.h"
+#include "config.h"
+#include "i2c_device.h"
+#include "assets/lang_config.h"
+
+#include <esp_log.h>
+#include <driver/i2c_master.h>
+#include <wifi_station.h>
+
+#define TAG "AtomEchoS3R"
+
+ 
+class AtomEchoS3rBaseBoard : public WifiBoard {
+private:
+    i2c_master_bus_handle_t i2c_bus_;
+    Button boot_button_;
+    void InitializeI2c() {
+        // Initialize I2C peripheral
+        i2c_master_bus_config_t i2c_bus_cfg = {
+            .i2c_port = I2C_NUM_0,
+            .sda_io_num = AUDIO_CODEC_I2C_SDA_PIN,
+            .scl_io_num = AUDIO_CODEC_I2C_SCL_PIN,
+            .clk_source = I2C_CLK_SRC_DEFAULT,
+            .glitch_ignore_cnt = 7,
+            .intr_priority = 0,
+            .trans_queue_depth = 0,
+            .flags = {
+                .enable_internal_pullup = 1,
+            },
+        };
+        ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &i2c_bus_));
+    }
+
+    void I2cDetect() {
+        uint8_t address;
+        printf("     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f\r\n");
+        for (int i = 0; i < 128; i += 16) {
+            printf("%02x: ", i);
+            for (int j = 0; j < 16; j++) {
+                fflush(stdout);
+                address = i + j;
+                esp_err_t ret = i2c_master_probe(i2c_bus_, address, pdMS_TO_TICKS(200));
+                if (ret == ESP_OK) {
+                    printf("%02x ", address);
+                } else if (ret == ESP_ERR_TIMEOUT) {
+                    printf("UU ");
+                } else {
+                    printf("-- ");
+                }
+            }
+            printf("\r\n");
+        }
+    }
+
+    void InitializeButtons() {
+        boot_button_.OnClick([this]() {
+            auto& app = Application::GetInstance();
+            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
+                ResetWifiConfiguration();
+            }
+            app.ToggleChatState();
+        });
+    }
+public:
+    AtomEchoS3rBaseBoard() : boot_button_(USER_BUTTON_GPIO) {
+        InitializeI2c();
+        I2cDetect();
+        InitializeButtons();
+    }
+
+    virtual AudioCodec* GetAudioCodec() override {
+        static Es8311AudioCodec audio_codec(
+            i2c_bus_, 
+            I2C_NUM_0, 
+            AUDIO_INPUT_SAMPLE_RATE, 
+            AUDIO_OUTPUT_SAMPLE_RATE,
+            AUDIO_I2S_GPIO_MCLK, 
+            AUDIO_I2S_GPIO_BCLK, 
+            AUDIO_I2S_GPIO_WS, 
+            AUDIO_I2S_GPIO_DOUT, 
+            AUDIO_I2S_GPIO_DIN,
+            AUDIO_CODEC_GPIO_PA, 
+            AUDIO_CODEC_ES8311_ADDR, 
+            false);
+        return &audio_codec;
+    }
+};
+
+DECLARE_BOARD(AtomEchoS3rBaseBoard);

main/boards/atom-echos3r/config.h

@@ -0,0 +1,29 @@
+#ifndef _BOARD_CONFIG_H_
+#define _BOARD_CONFIG_H_
+
+// AtomEchoS3R Board configuration
+
+#include <driver/gpio.h>
+
+#define AUDIO_INPUT_REFERENCE    true
+#define AUDIO_INPUT_SAMPLE_RATE  24000
+#define AUDIO_OUTPUT_SAMPLE_RATE 24000
+
+#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_11
+#define AUDIO_I2S_GPIO_WS   GPIO_NUM_3
+#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_17
+#define AUDIO_I2S_GPIO_DIN  GPIO_NUM_4
+#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_48
+
+#define AUDIO_CODEC_I2C_SDA_PIN  GPIO_NUM_45
+#define AUDIO_CODEC_I2C_SCL_PIN  GPIO_NUM_0
+#define AUDIO_CODEC_ES8311_ADDR  ES8311_CODEC_DEFAULT_ADDR
+#define AUDIO_CODEC_GPIO_PA      GPIO_NUM_18
+
+#define BUILTIN_LED_GPIO        GPIO_NUM_NC
+#define USER_BUTTON_GPIO        GPIO_NUM_41
+#define VOLUME_UP_BUTTON_GPIO   GPIO_NUM_NC
+#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_NC
+
+
+#endif // _BOARD_CONFIG_H_

main/boards/atom-echos3r/config.json

@@ -0,0 +1,12 @@
+{
+    "target": "esp32s3",
+    "builds": [
+        {
+            "name": "atom-echos3r",
+            "sdkconfig_append": [
+                "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/8m.csv\""
+            ]
+        }
+    ]
+}

main/boards/atoms3-echo-base/atoms3_echo_base.cc

@@ -111,7 +111,7 @@ private:
         InitializeButtons();
         GetBacklight()->SetBrightness(100);
         display_->SetStatus(Lang::Strings::ERROR);
-        display_->SetEmotion("sad");
+        display_->SetEmotion("triangle_exclamation");
         display_->SetChatMessage("system", "Echo Base\nnot connected");
         
         while (1) {

main/boards/atoms3r-echo-base/atoms3r_echo_base.cc

@@ -177,7 +177,7 @@ private:
         InitializeButtons();
         GetBacklight()->SetBrightness(100);
         display_->SetStatus(Lang::Strings::ERROR);
-        display_->SetEmotion("sad");
+        display_->SetEmotion("triangle_exclamation");
         display_->SetChatMessage("system", "Echo Base\nnot connected");
         
         while (1) {

main/boards/common/adc_battery_monitor.cc

@@ -3,32 +3,42 @@
 AdcBatteryMonitor::AdcBatteryMonitor(adc_unit_t adc_unit, adc_channel_t adc_channel, float upper_resistor, float lower_resistor, gpio_num_t charging_pin)
     : charging_pin_(charging_pin) {
     
-    // Initialize charging pin
-    gpio_config_t gpio_cfg = {
-        .pin_bit_mask = 1ULL << charging_pin,
-        .mode = GPIO_MODE_INPUT,
-        .pull_up_en = GPIO_PULLUP_DISABLE,
-        .pull_down_en = GPIO_PULLDOWN_DISABLE,
-        .intr_type = GPIO_INTR_DISABLE,
-    };
-    ESP_ERROR_CHECK(gpio_config(&gpio_cfg));
+    // Initialize charging pin (only if it's not NC)
+    if (charging_pin_ != GPIO_NUM_NC) {
+        gpio_config_t gpio_cfg = {
+            .pin_bit_mask = 1ULL << charging_pin,
+            .mode = GPIO_MODE_INPUT,
+            .pull_up_en = GPIO_PULLUP_DISABLE,
+            .pull_down_en = GPIO_PULLDOWN_DISABLE,
+            .intr_type = GPIO_INTR_DISABLE,
+        };
+        ESP_ERROR_CHECK(gpio_config(&gpio_cfg));
+    }
 
     // Initialize ADC battery estimation
     adc_battery_estimation_t adc_cfg = {
         .internal = {
             .adc_unit = adc_unit,
-            .adc_bitwidth = ADC_BITWIDTH_12,
+            .adc_bitwidth = ADC_BITWIDTH_DEFAULT,
             .adc_atten = ADC_ATTEN_DB_12,
         },
         .adc_channel = adc_channel,
         .upper_resistor = upper_resistor,
         .lower_resistor = lower_resistor
     };
-    adc_cfg.charging_detect_cb = [](void *user_data) -> bool {
-        AdcBatteryMonitor *self = (AdcBatteryMonitor *)user_data;
-        return gpio_get_level(self->charging_pin_) == 1;
-    };
-    adc_cfg.charging_detect_user_data = this;
+
+    // 在ADC配置部分进行条件设置
+    if (charging_pin_ != GPIO_NUM_NC) {
+        adc_cfg.charging_detect_cb = [](void *user_data) -> bool {
+            AdcBatteryMonitor *self = (AdcBatteryMonitor *)user_data;
+            return gpio_get_level(self->charging_pin_) == 1;
+        };
+        adc_cfg.charging_detect_user_data = this;
+    } else {
+        // 不设置回调，让adc_battery_estimation库使用软件估算
+        adc_cfg.charging_detect_cb = nullptr;
+        adc_cfg.charging_detect_user_data = nullptr;
+    }
     adc_battery_estimation_handle_ = adc_battery_estimation_create(&adc_cfg);
 
     // Initialize timer
@@ -48,12 +58,29 @@ AdcBatteryMonitor::~AdcBatteryMonitor() {
     if (adc_battery_estimation_handle_) {
         ESP_ERROR_CHECK(adc_battery_estimation_destroy(adc_battery_estimation_handle_));
     }
+    
+    if (timer_handle_) {
+        esp_timer_stop(timer_handle_);
+        esp_timer_delete(timer_handle_);
+    }
 }
 
 bool AdcBatteryMonitor::IsCharging() {
-    bool is_charging = false;
-    ESP_ERROR_CHECK(adc_battery_estimation_get_charging_state(adc_battery_estimation_handle_, &is_charging));
-    return is_charging;
+    // 优先使用adc_battery_estimation库的功能
+    if (adc_battery_estimation_handle_ != nullptr) {
+        bool is_charging = false;
+        esp_err_t err = adc_battery_estimation_get_charging_state(adc_battery_estimation_handle_, &is_charging);
+        if (err == ESP_OK) {
+            return is_charging;
+        }
+    }
+    
+    // 回退到GPIO读取或返回默认值
+    if (charging_pin_ != GPIO_NUM_NC) {
+        return gpio_get_level(charging_pin_) == 1;
+    }
+    
+    return false;
 }
 
 bool AdcBatteryMonitor::IsDischarging() {
@@ -61,9 +88,17 @@ bool AdcBatteryMonitor::IsDischarging() {
 }
 
 uint8_t AdcBatteryMonitor::GetBatteryLevel() {
+    // 如果句柄无效，返回默认值
+    if (adc_battery_estimation_handle_ == nullptr) {
+        return 100;
+    }
+    
     float capacity = 0;
-    ESP_ERROR_CHECK(adc_battery_estimation_get_capacity(adc_battery_estimation_handle_, &capacity));
-    return capacity;
+    esp_err_t err = adc_battery_estimation_get_capacity(adc_battery_estimation_handle_, &capacity);
+    if (err != ESP_OK) {
+        return 100; // 出错时返回默认值
+    }
+    return (uint8_t)capacity;
 }
 
 void AdcBatteryMonitor::OnChargingStatusChanged(std::function<void(bool)> callback) {

main/boards/common/esp32_camera.cc

@@ -89,6 +89,7 @@ bool Esp32Camera::Capture() {
         encoder_thread_.join();
     }
 
+    auto start_time = esp_timer_get_time();
     int frames_to_get = 2;
     // Try to get a stable frame
     for (int i = 0; i < frames_to_get; i++) {
@@ -101,6 +102,8 @@ bool Esp32Camera::Capture() {
             return false;
         }
     }
+    auto end_time = esp_timer_get_time();
+    ESP_LOGI(TAG, "Camera captured %d frames in %d ms", frames_to_get, int((end_time - start_time) / 1000));
 
     // 如果预览图片 buffer 为空，则跳过预览
     // 但仍返回 true，因为此时图像可以上传至服务器

main/boards/common/ml307_board.cc

@@ -2,11 +2,11 @@
 
 #include "application.h"
 #include "display.h"
-#include "font_awesome_symbols.h"
 #include "assets/lang_config.h"
 
 #include <esp_log.h>
 #include <esp_timer.h>
+#include <font_awesome.h>
 #include <opus_encoder.h>
 
 static const char *TAG = "Ml307Board";
@@ -50,9 +50,9 @@ void Ml307Board::StartNetwork() {
     while (true) {
         auto result = modem_->WaitForNetworkReady();
         if (result == NetworkStatus::ErrorInsertPin) {
-            application.Alert(Lang::Strings::ERROR, Lang::Strings::PIN_ERROR, "sad", Lang::Sounds::OGG_ERR_PIN);
+            application.Alert(Lang::Strings::ERROR, Lang::Strings::PIN_ERROR, "triangle_exclamation", Lang::Sounds::OGG_ERR_PIN);
         } else if (result == NetworkStatus::ErrorRegistrationDenied) {
-            application.Alert(Lang::Strings::ERROR, Lang::Strings::REG_ERROR, "sad", Lang::Sounds::OGG_ERR_REG);
+            application.Alert(Lang::Strings::ERROR, Lang::Strings::REG_ERROR, "triangle_exclamation", Lang::Sounds::OGG_ERR_REG);
         } else {
             break;
         }
@@ -80,13 +80,13 @@ const char* Ml307Board::GetNetworkStateIcon() {
     if (csq == -1) {
         return FONT_AWESOME_SIGNAL_OFF;
     } else if (csq >= 0 && csq <= 14) {
-        return FONT_AWESOME_SIGNAL_1;
+        return FONT_AWESOME_SIGNAL_WEAK;
     } else if (csq >= 15 && csq <= 19) {
-        return FONT_AWESOME_SIGNAL_2;
+        return FONT_AWESOME_SIGNAL_FAIR;
     } else if (csq >= 20 && csq <= 24) {
-        return FONT_AWESOME_SIGNAL_3;
+        return FONT_AWESOME_SIGNAL_GOOD;
     } else if (csq >= 25 && csq <= 31) {
-        return FONT_AWESOME_SIGNAL_4;
+        return FONT_AWESOME_SIGNAL_STRONG;
     }
 
     ESP_LOGW(TAG, "Invalid CSQ: %d", csq);

main/boards/common/wifi_board.cc

@@ -3,7 +3,6 @@
 #include "display.h"
 #include "application.h"
 #include "system_info.h"
-#include "font_awesome_symbols.h"
 #include "settings.h"
 #include "assets/lang_config.h"
 
@@ -12,6 +11,7 @@
 #include <esp_network.h>
 #include <esp_log.h>
 
+#include <font_awesome.h>
 #include <wifi_station.h>
 #include <wifi_configuration_ap.h>
 #include <ssid_manager.h>
@@ -49,7 +49,7 @@ void WifiBoard::EnterWifiConfigMode() {
     hint += "\n\n";
     
     // 播报配置 WiFi 的提示
-    application.Alert(Lang::Strings::WIFI_CONFIG_MODE, hint.c_str(), "", Lang::Sounds::OGG_WIFICONFIG);
+    application.Alert(Lang::Strings::WIFI_CONFIG_MODE, hint.c_str(), "gear", Lang::Sounds::OGG_WIFICONFIG);
 
     #if CONFIG_USE_ACOUSTIC_WIFI_PROVISIONING
     auto display = Board::GetInstance().GetDisplay();
@@ -124,7 +124,7 @@ const char* WifiBoard::GetNetworkStateIcon() {
     }
     auto& wifi_station = WifiStation::GetInstance();
     if (!wifi_station.IsConnected()) {
-        return FONT_AWESOME_WIFI_OFF;
+        return FONT_AWESOME_WIFI_SLASH;
     }
     int8_t rssi = wifi_station.GetRssi();
     if (rssi >= -60) {

main/boards/df-k10/df_k10_board.cc

@@ -3,7 +3,6 @@
 #include "display/lcd_display.h"
 #include "esp_lcd_ili9341.h"
 #include "led_control.h"
-#include "font_awesome_symbols.h"
 #include "application.h"
 #include "button.h"
 #include "config.h"

main/boards/echoear/EchoEar.cc

@@ -519,12 +519,13 @@ private:
 
     void InitializeSpi()
     {
-        const spi_bus_config_t bus_config = TAIJIPI_ST77916_PANEL_BUS_QSPI_CONFIG(QSPI_PIN_NUM_LCD_PCLK,
-                                                                                  QSPI_PIN_NUM_LCD_DATA0,
-                                                                                  QSPI_PIN_NUM_LCD_DATA1,
-                                                                                  QSPI_PIN_NUM_LCD_DATA2,
-                                                                                  QSPI_PIN_NUM_LCD_DATA3,
-                                                                                  QSPI_LCD_H_RES * 80 * sizeof(uint16_t));
+        spi_bus_config_t bus_config = TAIJIPI_ST77916_PANEL_BUS_QSPI_CONFIG(QSPI_PIN_NUM_LCD_PCLK,
+                                                                            QSPI_PIN_NUM_LCD_DATA0,
+                                                                            QSPI_PIN_NUM_LCD_DATA1,
+                                                                            QSPI_PIN_NUM_LCD_DATA2,
+                                                                            QSPI_PIN_NUM_LCD_DATA3,
+                                                                            QSPI_LCD_H_RES * 80 * sizeof(uint16_t));
+        // bus_config.isr_cpu_id = ESP_INTR_CPU_AFFINITY_1;
         ESP_ERROR_CHECK(spi_bus_initialize(QSPI_LCD_HOST, &bus_config, SPI_DMA_CH_AUTO));
     }
 
@@ -562,11 +563,7 @@ private:
 
 #if USE_LVGL_DEFAULT
         display_ = new SpiLcdDisplay(panel_io, panel,
-        DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY, {
-            .text_font = &font_puhui_20_4,
-            .icon_font = &font_awesome_20_4,
-            .emoji_font = font_emoji_64_init(),
-        });
+            DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
 #else
         display_ = new anim::EmoteDisplay(panel, panel_io);
 #endif

main/boards/echoear/emote_display.cc

@@ -111,8 +111,8 @@ static void InitializeGraphics(esp_lcd_panel_handle_t panel, gfx_handle_t* engin
     };
 
     gfx_cfg.task.task_stack_caps = MALLOC_CAP_DEFAULT;
-    gfx_cfg.task.task_affinity = 0;
-    gfx_cfg.task.task_priority = 5;
+    gfx_cfg.task.task_affinity = 1;
+    gfx_cfg.task.task_priority = 1;
     gfx_cfg.task.task_stack = 20 * 1024;
 
     *engine_handle = gfx_emote_init(&gfx_cfg);
@@ -303,6 +303,7 @@ bool EmoteEngine::OnFlushIoReady(esp_lcd_panel_io_handle_t panel_io,
                                  esp_lcd_panel_io_event_data_t* edata,
                                  void* user_ctx)
 {
+    gfx_emote_flush_ready(user_ctx, true);
     return true;
 }
 
@@ -313,7 +314,6 @@ void EmoteEngine::OnFlush(gfx_handle_t handle, int x_start, int y_start,
     if (panel) {
         esp_lcd_panel_draw_bitmap(panel, x_start, y_start, x_end, y_end, color_data);
     }
-    gfx_emote_flush_ready(handle, true);
 }
 
 // EmoteDisplay implementation

main/boards/electron-bot/electron_emoji_display.cc

@@ -1,12 +1,12 @@
 #include "electron_emoji_display.h"
 
 #include <esp_log.h>
+#include <font_awesome.h>
 
 #include <algorithm>
 #include <cstring>
 #include <string>
 
-#include "font_awesome_symbols.h"
 
 #define TAG "ElectronEmojiDisplay"
 

main/boards/esp-box-3/esp_box3_board.cc

@@ -2,7 +2,6 @@
 #include "codecs/box_audio_codec.h"
 #include "display/lcd_display.h"
 #include "esp_lcd_ili9341.h"
-#include "font_awesome_symbols.h"
 #include "application.h"
 #include "button.h"
 #include "config.h"

main/boards/esp-box-lite/esp_box_lite_board.cc

@@ -2,7 +2,6 @@
 #include "box_audio_codec_lite.h"
 #include "display/lcd_display.h"
 #include "esp_lcd_ili9341.h"
-#include "font_awesome_symbols.h"
 #include "application.h"
 #include "button.h"
 #include "config.h"

main/boards/esp-box/esp_box_board.cc

@@ -2,7 +2,6 @@
 #include "codecs/box_audio_codec.h"
 #include "display/lcd_display.h"
 #include "esp_lcd_ili9341.h"
-#include "font_awesome_symbols.h"
 #include "application.h"
 #include "button.h"
 #include "config.h"

main/boards/esp-hi/adc_pdm_audio_codec.cc

@@ -1,6 +1,7 @@
 #include "adc_pdm_audio_codec.h"
 
 #include <esp_log.h>
+#include <esp_timer.h>
 #include <driver/i2c.h>
 #include <driver/i2c_master.h>
 #include <driver/i2s_tdm.h>
@@ -11,6 +12,7 @@
 #include "hal/rtc_io_hal.h"
 #include "hal/gpio_ll.h"
 #include "settings.h"
+#include "config.h"
 
 static const char TAG[] = "AdcPdmAudioCodec";
 
@@ -71,7 +73,7 @@ AdcPdmAudioCodec::AdcPdmAudioCodec(int input_sample_rate, int output_sample_rate
     ESP_ERROR_CHECK(i2s_new_channel(&chan_cfg, &tx_handle_, NULL));
 
     i2s_pdm_tx_config_t pdm_cfg_default = BSP_I2S_DUPLEX_MONO_CFG((uint32_t)output_sample_rate, pdm_speak_p);
-    pdm_cfg_default.clk_cfg.up_sample_fs = output_sample_rate / 100;
+    pdm_cfg_default.clk_cfg.up_sample_fs = AUDIO_PDM_UPSAMPLE_FS;
     pdm_cfg_default.slot_cfg.sd_scale = I2S_PDM_SIG_SCALING_MUL_4;
     pdm_cfg_default.slot_cfg.hp_scale = I2S_PDM_SIG_SCALING_MUL_4;
     pdm_cfg_default.slot_cfg.lp_scale = I2S_PDM_SIG_SCALING_MUL_4;
@@ -112,10 +114,27 @@ AdcPdmAudioCodec::AdcPdmAudioCodec(int input_sample_rate, int output_sample_rate
         esp_rom_gpio_connect_out_signal(pdm_speak_n, I2SO_SD_OUT_IDX, 1, 0); //反转输出 SD OUT 信号
         gpio_set_drive_capability(pdm_speak_n, GPIO_DRIVE_CAP_0);
     }
+
+    // 初始化输出定时器
+    esp_timer_create_args_t output_timer_args = {
+        .callback = &AdcPdmAudioCodec::OutputTimerCallback,
+        .arg = this,
+        .dispatch_method = ESP_TIMER_TASK,
+        .name = "output_timer"
+    };
+    ESP_ERROR_CHECK(esp_timer_create(&output_timer_args, &output_timer_));
+
     ESP_LOGI(TAG, "AdcPdmAudioCodec initialized");
 }
 
 AdcPdmAudioCodec::~AdcPdmAudioCodec() {
+    // 删除定时器
+    if (output_timer_) {
+        esp_timer_stop(output_timer_);
+        esp_timer_delete(output_timer_);
+        output_timer_ = nullptr;
+    }
+
     ESP_ERROR_CHECK(esp_codec_dev_close(output_dev_));
     esp_codec_dev_delete(output_dev_);
     ESP_ERROR_CHECK(esp_codec_dev_close(input_dev_));
@@ -161,11 +180,27 @@ void AdcPdmAudioCodec::EnableOutput(bool enable) {
         };
         ESP_ERROR_CHECK(esp_codec_dev_open(output_dev_, &fs));
         ESP_ERROR_CHECK(esp_codec_dev_set_out_vol(output_dev_, output_volume_));
+
+        // 强制按板卡配置重配PDM TX时钟，覆盖第三方库在set_fmt中的默认up_sample_fs
+        // 若通道已启用，先禁用再重配，最后再启用
+        ESP_ERROR_CHECK_WITHOUT_ABORT(i2s_channel_disable(tx_handle_));
+        i2s_pdm_tx_clk_config_t clk_cfg = I2S_PDM_TX_CLK_DEFAULT_CONFIG((uint32_t)output_sample_rate_);
+        clk_cfg.up_sample_fs = AUDIO_PDM_UPSAMPLE_FS;
+        ESP_ERROR_CHECK(i2s_channel_reconfig_pdm_tx_clock(tx_handle_, &clk_cfg));
+        ESP_ERROR_CHECK(i2s_channel_enable(tx_handle_));
         if(pa_ctrl_pin_ != GPIO_NUM_NC){
             gpio_set_level(pa_ctrl_pin_, 1);
         }
+        // 启用输出时启动定时器
+        if (output_timer_) {
+            esp_timer_start_once(output_timer_, TIMER_TIMEOUT_US);
+        }
 
     } else {
+        // 禁用输出时停止定时器
+        if (output_timer_) {
+            esp_timer_stop(output_timer_);
+        }
         if(pa_ctrl_pin_ != GPIO_NUM_NC){
             gpio_set_level(pa_ctrl_pin_, 0);
         }
@@ -183,6 +218,11 @@ int AdcPdmAudioCodec::Read(int16_t* dest, int samples) {
 int AdcPdmAudioCodec::Write(const int16_t* data, int samples) {
     if (output_enabled_) {
         ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)data, samples * sizeof(int16_t)));
+        // 重置输出定时器
+        if (output_timer_) {
+            esp_timer_stop(output_timer_);
+            esp_timer_start_once(output_timer_, TIMER_TIMEOUT_US);
+        }
     }
     return samples;
 }
@@ -195,9 +235,15 @@ void AdcPdmAudioCodec::Start() {
         output_volume_ = 10;
     }
 
-    ESP_ERROR_CHECK(i2s_channel_enable(tx_handle_));
-
     EnableInput(true);
     EnableOutput(true);
     ESP_LOGI(TAG, "Audio codec started");
 }
+
+// 定时器回调函数实现
+void AdcPdmAudioCodec::OutputTimerCallback(void* arg) {
+    AdcPdmAudioCodec* codec = static_cast<AdcPdmAudioCodec*>(arg);
+    if (codec && codec->output_enabled_) {
+        codec->EnableOutput(false);
+    }
+}

main/boards/esp-hi/adc_pdm_audio_codec.h

@@ -5,6 +5,7 @@
 
 #include <esp_codec_dev.h>
 #include <esp_codec_dev_defaults.h>
+#include <esp_timer.h>
 
 class AdcPdmAudioCodec : public AudioCodec {
 private:
@@ -12,6 +13,13 @@ private:
     esp_codec_dev_handle_t input_dev_ = nullptr;
     gpio_num_t pa_ctrl_pin_ = GPIO_NUM_NC;
 
+    // 定时器相关成员变量
+    esp_timer_handle_t output_timer_ = nullptr;
+    static constexpr uint64_t TIMER_TIMEOUT_US = 120000; // 120ms = 120000us
+
+    // 定时器回调函数
+    static void OutputTimerCallback(void* arg);
+
     virtual int Read(int16_t* dest, int samples) override;
     virtual int Write(const int16_t* data, int samples) override;
 

main/boards/esp-hi/config.h

@@ -6,6 +6,9 @@
 #define AUDIO_INPUT_SAMPLE_RATE  16000
 #define AUDIO_OUTPUT_SAMPLE_RATE 24000
 
+// 配置PDM上采样fs参数（取值范围<=480）。部分设备在441时表现更稳定
+#define AUDIO_PDM_UPSAMPLE_FS    441
+
 #define AUDIO_ADC_MIC_CHANNEL       2
 #define AUDIO_PDM_SPEAK_P_GPIO      GPIO_NUM_6
 #define AUDIO_PDM_SPEAK_N_GPIO      GPIO_NUM_7

main/boards/esp-hi/config.json

@@ -25,7 +25,6 @@
                 "CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2048",
                 "CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y",
                 "CONFIG_NEWLIB_NANO_FORMAT=y",
-                "CONFIG_MMAP_FILE_NAME_LENGTH=25",
                 "CONFIG_ESP_CONSOLE_NONE=y",
                 "CONFIG_USE_ESP_WAKE_WORD=y",
                 "CONFIG_COMPILER_OPTIMIZATION_SIZE=y"

main/boards/esp-hi/emoji_display.cc

@@ -48,6 +48,8 @@ EmojiPlayer::EmojiPlayer(esp_lcd_panel_handle_t panel, esp_lcd_panel_io_handle_t
         .task = ANIM_PLAYER_INIT_CONFIG()
     };
 
+    player_cfg.task.task_priority = 1;
+    player_cfg.task.task_stack = 4096;
     player_handle_ = anim_player_init(&player_cfg);
 
     const esp_lcd_panel_io_callbacks_t cbs = {

main/boards/esp-hi/emoji_display.h

@@ -38,6 +38,8 @@ public:
 
     virtual void SetEmotion(const char* emotion) override;
     virtual void SetStatus(const char* status) override;
+    virtual void SetChatMessage(const char* role, const char* content) override {}
+
     anim::EmojiPlayer* GetPlayer()
     {
         return player_.get();

main/boards/esp-hi/esp_hi.cc

@@ -397,11 +397,6 @@ public:
         InitializeSpi();
         InitializeLcdDisplay();
         InitializeTools();
-
-        DeviceStateEventManager::GetInstance().RegisterStateChangeCallback([this](DeviceState previous_state, DeviceState current_state) {
-            ESP_LOGD(TAG, "Device state changed from %d to %d", previous_state, current_state);
-            this->GetAudioCodec()->EnableOutput(current_state == kDeviceStateSpeaking);
-        });
     }
 
     virtual AudioCodec* GetAudioCodec() override

main/boards/esp-sparkbot/esp_sparkbot_board.cc

@@ -1,7 +1,6 @@
 #include "wifi_board.h"
 #include "codecs/es8311_audio_codec.h"
 #include "display/lcd_display.h"
-#include "font_awesome_symbols.h"
 #include "application.h"
 #include "button.h"
 #include "config.h"

main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc

@@ -1,7 +1,6 @@
 #include "wifi_board.h"
 #include "display/lcd_display.h"
 #include "esp_lcd_sh8601.h"
-#include "font_awesome_symbols.h"
 
 #include "codecs/es8311_audio_codec.h"
 #include "application.h"

main/boards/esp32s3-korvo2-v3/config.h

@@ -26,7 +26,7 @@
 #define VOLUME_UP_BUTTON_GPIO   GPIO_NUM_NC
 #define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_NC
 
-#ifdef CONFIG_LCD_ST7789
+#ifdef CONFIG_ESP32S3_KORVO2_V3_LCD_ST7789
 #define DISPLAY_SDA_PIN GPIO_NUM_NC
 #define DISPLAY_SCL_PIN GPIO_NUM_NC
 #define DISPLAY_WIDTH   280
@@ -40,7 +40,7 @@
 #define DISPLAY_OFFSET_Y  0
 #endif
 
-#ifdef CONFIG_LCD_ILI9341
+#ifdef CONFIG_ESP32S3_KORVO2_V3_LCD_ILI9341
 #define LCD_TYPE_ILI9341_SERIAL
 #define DISPLAY_SDA_PIN GPIO_NUM_NC
 #define DISPLAY_SCL_PIN GPIO_NUM_NC
@@ -78,4 +78,4 @@
 #define CAMERA_PIN_PCLK 11
 
 #define XCLK_FREQ_HZ 20000000
-#endif // _BOARD_CONFIG_H_
+#endif // _BOARD_CONFIG_H_

main/boards/esp32s3-korvo2-v3/esp32s3_korvo2_v3_board.cc

@@ -5,6 +5,7 @@
 #include "button.h"
 #include "config.h"
 #include "i2c_device.h"
+#include "assets/lang_config.h"
 
 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
@@ -16,6 +17,16 @@
 #include "esp32_camera.h"
 
 #define TAG "esp32s3_korvo2_v3"
+/* ADC Buttons */
+typedef enum {
+    BSP_ADC_BUTTON_REC,
+    BSP_ADC_BUTTON_VOL_MUTE,
+    BSP_ADC_BUTTON_PLAY,
+    BSP_ADC_BUTTON_SET,
+    BSP_ADC_BUTTON_VOL_DOWN,
+    BSP_ADC_BUTTON_VOL_UP,
+    BSP_ADC_BUTTON_NUM
+} bsp_adc_button_t;
 
 LV_FONT_DECLARE(font_puhui_20_4);
 LV_FONT_DECLARE(font_awesome_20_4);
@@ -45,6 +56,10 @@ static const ili9341_lcd_init_cmd_t vendor_specific_init[] = {
 class Esp32S3Korvo2V3Board : public WifiBoard {
 private:
     Button boot_button_;
+    Button* adc_button_[BSP_ADC_BUTTON_NUM];
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+    adc_oneshot_unit_handle_t bsp_adc_handle = NULL;
+#endif
     i2c_master_bus_handle_t i2c_bus_;
     LcdDisplay* display_;
     esp_io_expander_handle_t io_expander_ = NULL;
@@ -131,7 +146,103 @@ private:
         ESP_ERROR_CHECK(spi_bus_initialize(SPI3_HOST, &buscfg, SPI_DMA_CH_AUTO));
     }
 
+    void ChangeVol(int val) {
+        auto codec = GetAudioCodec();
+        auto volume = codec->output_volume() + val;
+        if (volume > 100) {
+            volume = 100;
+        }
+        if (volume < 0) {
+            volume = 0;
+        }
+        codec->SetOutputVolume(volume);
+        GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume));
+    }
+
+    void MuteVol() {
+        auto codec = GetAudioCodec();
+        auto volume = codec->output_volume();
+        if (volume > 1) {
+            volume = 0;
+        } else  {
+            volume = 50;
+        }
+        codec->SetOutputVolume(volume);
+        GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume));
+    }
+
     void InitializeButtons() {
+         button_adc_config_t adc_cfg = {};
+        adc_cfg.adc_channel = ADC_CHANNEL_4; // ADC1 channel 0 is GPIO5
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+        const adc_oneshot_unit_init_cfg_t init_config1 = {
+            .unit_id = ADC_UNIT_1,
+        };
+        adc_oneshot_new_unit(&init_config1, &bsp_adc_handle);
+        adc_cfg.adc_handle = &bsp_adc_handle;
+#endif
+        adc_cfg.button_index = BSP_ADC_BUTTON_REC;
+        adc_cfg.min = 2310; // middle is 2410mV
+        adc_cfg.max = 2510;
+        adc_button_[0] = new AdcButton(adc_cfg);
+
+        adc_cfg.button_index = BSP_ADC_BUTTON_VOL_MUTE;
+        adc_cfg.min = 1880; // middle is 1980mV
+        adc_cfg.max = 2080;
+        adc_button_[1] = new AdcButton(adc_cfg);
+
+        adc_cfg.button_index = BSP_ADC_BUTTON_PLAY;
+        adc_cfg.min = 1550; // middle is 1650mV
+        adc_cfg.max = 1750;
+        adc_button_[2] = new AdcButton(adc_cfg);
+
+        adc_cfg.button_index = BSP_ADC_BUTTON_SET;
+        adc_cfg.min = 1015; // middle is 1115mV
+        adc_cfg.max = 1215;
+        adc_button_[3] = new AdcButton(adc_cfg);
+
+        adc_cfg.button_index = BSP_ADC_BUTTON_VOL_DOWN;
+        adc_cfg.min = 720; // middle is 820mV
+        adc_cfg.max = 920;
+        adc_button_[4] = new AdcButton(adc_cfg);
+
+        adc_cfg.button_index = BSP_ADC_BUTTON_VOL_UP;
+        adc_cfg.min = 280; // middle is 380mV
+        adc_cfg.max = 480;
+        adc_button_[5] = new AdcButton(adc_cfg);
+
+        auto volume_up_button = adc_button_[BSP_ADC_BUTTON_VOL_UP];
+        volume_up_button->OnClick([this]() {ChangeVol(10);});
+        volume_up_button->OnLongPress([this]() {
+            GetAudioCodec()->SetOutputVolume(100);
+            GetDisplay()->ShowNotification(Lang::Strings::MAX_VOLUME);
+        });
+
+        auto volume_down_button = adc_button_[BSP_ADC_BUTTON_VOL_DOWN];
+        volume_down_button->OnClick([this]() {ChangeVol(-10);});
+        volume_down_button->OnLongPress([this]() {
+            GetAudioCodec()->SetOutputVolume(0);
+            GetDisplay()->ShowNotification(Lang::Strings::MUTED);
+        });
+
+        auto volume_mute_button = adc_button_[BSP_ADC_BUTTON_VOL_MUTE];
+        volume_mute_button->OnClick([this]() {MuteVol();});
+
+        auto play_button = adc_button_[BSP_ADC_BUTTON_PLAY];
+        play_button->OnClick([this]() {
+             ESP_LOGI(TAG, " TODO %s:%d\n", __func__, __LINE__);
+        });
+
+        auto set_button = adc_button_[BSP_ADC_BUTTON_SET];
+        set_button->OnClick([this]() {
+             ESP_LOGI(TAG, "TODO %s:%d\n", __func__, __LINE__);
+        });
+
+        auto rec_button = adc_button_[BSP_ADC_BUTTON_REC];
+        rec_button->OnClick([this]() {
+             ESP_LOGI(TAG, "TODO %s:%d\n", __func__, __LINE__);
+        });
+        boot_button_.OnClick([this]() {});
         boot_button_.OnClick([this]() {
             auto& app = Application::GetInstance();
             if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {

main/boards/lichuang-dev/lichuang_dev_board.cc

@@ -173,8 +173,8 @@ private:
     {
         esp_lcd_touch_handle_t tp;
         esp_lcd_touch_config_t tp_cfg = {
-            .x_max = DISPLAY_WIDTH,
-            .y_max = DISPLAY_HEIGHT,
+            .x_max = DISPLAY_HEIGHT,
+            .y_max = DISPLAY_WIDTH,
             .rst_gpio_num = GPIO_NUM_NC, // Shared with LCD reset
             .int_gpio_num = GPIO_NUM_NC, 
             .levels = {

main/boards/m5stack-tab5/m5stack_tab5.cc

@@ -2,7 +2,6 @@
 #include "tab5_audio_codec.h"
 #include "display/lcd_display.h"
 #include "esp_lcd_ili9881c.h"
-#include "font_awesome_symbols.h"
 #include "font_emoji.h"
 #include "application.h"
 #include "button.h"

main/boards/magiclick-2p4/magiclick_2p4_board.cc

@@ -5,7 +5,6 @@
 #include "button.h"
 #include "led/circular_strip.h"
 #include "config.h"
-#include "font_awesome_symbols.h"
 #include "assets/lang_config.h"
 
 #include <esp_lcd_panel_vendor.h>

main/boards/magiclick-2p5/magiclick_2p5_board.cc

@@ -6,7 +6,6 @@
 #include "led/circular_strip.h"
 #include "config.h"
 #include "assets/lang_config.h"
-#include "font_awesome_symbols.h"
 
 #include <esp_lcd_panel_vendor.h>
 #include <wifi_station.h>

main/boards/magiclick-c3-v2/magiclick_c3_v2_board.cc

@@ -6,7 +6,6 @@
 #include "led/single_led.h"
 #include "config.h"
 #include "power_save_timer.h"
-#include "font_awesome_symbols.h"
 
 #include <wifi_station.h>
 #include <esp_log.h>

main/boards/magiclick-c3/magiclick_c3_board.cc

@@ -6,7 +6,6 @@
 #include "led/single_led.h"
 #include "config.h"
 #include "power_save_timer.h"
-#include "font_awesome_symbols.h"
 
 #include <wifi_station.h>
 #include <esp_log.h>

main/boards/otto-robot/otto_emoji_display.cc

@@ -1,13 +1,13 @@
 #include "otto_emoji_display.h"
 
 #include <esp_log.h>
+#include <font_awesome.h>
 
 #include <algorithm>
 #include <cstring>
 #include <string>
 
 #include "display/lcd_display.h"
-#include "font_awesome_symbols.h"
 
 #define TAG "OttoEmojiDisplay"
 

main/boards/otto-robot/otto_movements.cc

@@ -389,7 +389,7 @@ void Otto::ShakeLeg(int steps, int period, int dir) {
     int homes[SERVO_COUNT] = {90, 90, 90, 90, HAND_HOME_POSITION, 180 - HAND_HOME_POSITION};
 
     // Changes in the parameters if left leg is chosen
-    if (dir == -1) {
+    if (dir == 1) {
         shake_leg1[2] = 180 - 35;
         shake_leg1[3] = 180 - 58;
         shake_leg2[2] = 180 - 120;

main/boards/sensecap-watcher/sensecap_watcher.cc

@@ -3,7 +3,6 @@
 #include "wifi_board.h"
 #include "sensecap_audio_codec.h"
 #include "display/lcd_display.h"
-#include "font_awesome_symbols.h"
 #include "application.h"
 #include "knob.h"
 #include "config.h"

main/boards/surfer-c3-1.14tft/surfer-c3-1.14tft.cc

@@ -21,8 +21,8 @@
 
 #define TAG "SURFERC3114TFT"
 
-LV_FONT_DECLARE(font_puhui_16_4);
-LV_FONT_DECLARE(font_awesome_16_4);
+LV_FONT_DECLARE(font_puhui_20_4);
+LV_FONT_DECLARE(font_awesome_20_4);
 
 class SurferC3114TFT : public WifiBoard {
 private:
@@ -148,8 +148,8 @@ private:
         display_ = new SpiLcdDisplay(panel_io_, panel_,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
                                     {
-                                        .text_font = &font_puhui_16_4,
-                                        .icon_font = &font_awesome_16_4,
+                                        .text_font = &font_puhui_20_4,
+                                        .icon_font = &font_awesome_20_4,
                                         .emoji_font = font_emoji_32_init(),
                                     });
     }

main/boards/tudouzi/kevin_box_board.cc

@@ -8,7 +8,6 @@
 #include "power_save_timer.h"
 #include "axp2101.h"
 #include "assets/lang_config.h"
-#include "font_awesome_symbols.h"
 
 #include <esp_log.h>
 #include <driver/gpio.h>

main/boards/waveshare-s3-audio-board/README.md

@@ -0,0 +1,3 @@
+新增 微雪 开发板: ESP32-S3-AUDIO-Board
+产品链接：
+https://www.waveshare.net/shop/ESP32-S3-AUDIO-Board.htm

main/boards/waveshare-s3-audio-board/config.h

@@ -0,0 +1,95 @@
+#ifndef _BOARD_CONFIG_H_
+#define _BOARD_CONFIG_H_
+
+#include <driver/gpio.h>
+#include <driver/spi_master.h>
+
+#define AUDIO_INPUT_SAMPLE_RATE     24000
+#define AUDIO_OUTPUT_SAMPLE_RATE    24000
+
+#define BOOT_BUTTON_GPIO            GPIO_NUM_0
+#define BUILTIN_LED_GPIO            GPIO_NUM_38
+
+#define AUDIO_I2S_GPIO_MCLK         GPIO_NUM_12
+#define AUDIO_I2S_GPIO_BCLK         GPIO_NUM_13
+#define AUDIO_I2S_GPIO_WS           GPIO_NUM_14
+#define AUDIO_I2S_GPIO_DIN          GPIO_NUM_15
+#define AUDIO_I2S_GPIO_DOUT         GPIO_NUM_16
+#define AUDIO_CODEC_PA_PIN          GPIO_NUM_NC
+#define AUDIO_INPUT_REFERENCE       true
+#define AUDIO_CODEC_ES8311_ADDR     ES8311_CODEC_DEFAULT_ADDR
+#define AUDIO_CODEC_ES7210_ADDR     ES7210_CODEC_DEFAULT_ADDR
+
+#define I2C_SCL_IO                  GPIO_NUM_10       
+#define I2C_SDA_IO                  GPIO_NUM_11        
+
+#define I2C_ADDRESS                 ESP_IO_EXPANDER_I2C_TCA9555_ADDRESS_000
+
+#define DISPLAY_SDA_PIN             I2C_SDA_IO
+#define DISPLAY_SCL_PIN             I2C_SCL_IO
+
+#define DISPLAY_MISO_PIN            GPIO_NUM_8
+#define DISPLAY_MOSI_PIN            GPIO_NUM_9
+#define DISPLAY_SCLK_PIN            GPIO_NUM_4
+#define DISPLAY_CS_PIN              GPIO_NUM_3
+#define DISPLAY_DC_PIN              GPIO_NUM_7
+#define DISPLAY_RESET_PIN           GPIO_NUM_NC
+#define DISPLAY_BACKLIGHT_PIN       GPIO_NUM_5
+
+#define DISPLAY_SPI_SCLK_HZ         (20 * 1000 * 1000)
+
+/* Camera pins */
+#define CAMERA_PIN_PWDN     -1
+#define CAMERA_PIN_RESET    -1
+#define CAMERA_PIN_XCLK     43
+#define CAMERA_PIN_SIOD     -1
+#define CAMERA_PIN_SIOC     -1
+
+#define CAMERA_PIN_D7       48
+#define CAMERA_PIN_D6       47
+#define CAMERA_PIN_D5       46
+#define CAMERA_PIN_D4       45
+#define CAMERA_PIN_D3       39
+#define CAMERA_PIN_D2       18
+#define CAMERA_PIN_D1       17
+#define CAMERA_PIN_D0       2
+#define CAMERA_PIN_VSYNC    21
+#define CAMERA_PIN_HREF     1
+#define CAMERA_PIN_PCLK     44
+
+#define XCLK_FREQ_HZ 20000000
+
+
+
+
+#ifdef CONFIG_AUDIO_BOARD_LCD_JD9853
+#define LCD_TYPE_JD9853_SERIAL
+#define DISPLAY_WIDTH   320
+#define DISPLAY_HEIGHT  172
+
+#define DISPLAY_SWAP_XY true
+#define DISPLAY_MIRROR_X false
+#define DISPLAY_MIRROR_Y true
+#define DISPLAY_INVERT_COLOR    true
+#define BACKLIGHT_INVERT false
+#define DISPLAY_OFFSET_X  0
+#define DISPLAY_OFFSET_Y  0
+#endif
+
+#ifdef CONFIG_AUDIO_BOARD_LCD_ST7789
+#define LCD_TYPE_ST7789_SERIAL
+#define DISPLAY_WIDTH   240
+#define DISPLAY_HEIGHT  320
+
+#define DISPLAY_SWAP_XY false
+#define DISPLAY_MIRROR_X false
+#define DISPLAY_MIRROR_Y false
+#define DISPLAY_INVERT_COLOR    true
+#define BACKLIGHT_INVERT false
+#define DISPLAY_OFFSET_X  0
+#define DISPLAY_OFFSET_Y  0
+#endif
+
+
+
+#endif // _BOARD_CONFIG_H_

main/boards/waveshare-s3-audio-board/config.json

@@ -0,0 +1,9 @@
+{
+    "target": "esp32s3",
+    "builds": [
+        {
+            "name": "waveshare-s3-audio-board",
+            "sdkconfig_append": []
+        }
+    ]
+}

main/boards/waveshare-s3-audio-board/esp32-s3-audio_board.cc

@@ -0,0 +1,247 @@
+#include "wifi_board.h"
+#include "codecs/box_audio_codec.h"
+#include "display/lcd_display.h"
+#include "system_reset.h"
+#include "application.h"
+#include "button.h"
+#include "config.h"
+
+#include <esp_log.h>
+#include "i2c_device.h"
+#include <driver/i2c_master.h>
+#include <driver/ledc.h>
+#include <wifi_station.h>
+#include <esp_lcd_panel_io.h>
+#include <esp_lcd_panel_ops.h>
+#include <esp_lcd_st77916.h>
+#include <esp_timer.h>
+#include "esp_io_expander_tca95xx_16bit.h"
+#include "esp32_camera.h"
+#include "led/circular_strip.h"
+#include "esp_lcd_jd9853.h"
+
+#define TAG "waveshare_lcd_1_85c"
+
+#define LCD_OPCODE_WRITE_CMD        (0x02ULL)
+#define LCD_OPCODE_READ_CMD         (0x0BULL)
+#define LCD_OPCODE_WRITE_COLOR      (0x32ULL)
+
+LV_FONT_DECLARE(font_puhui_14_1);
+LV_FONT_DECLARE(font_awesome_14_1);
+
+
+
+
+class CustomBoard : public WifiBoard {
+private:
+    Button boot_button_;
+    i2c_master_bus_handle_t i2c_bus_;
+    esp_io_expander_handle_t io_expander = NULL;
+    LcdDisplay* display_;
+    Esp32Camera* camera_;
+
+    void InitializeI2c() {
+        // Initialize I2C peripheral
+        i2c_master_bus_config_t i2c_bus_cfg = {
+            .i2c_port = (i2c_port_t)0,
+            .sda_io_num = I2C_SDA_IO,
+            .scl_io_num = I2C_SCL_IO,
+            .clk_source = I2C_CLK_SRC_DEFAULT,
+        };
+        ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &i2c_bus_));
+    }
+    
+    void InitializeTca9555(void)
+    {
+        esp_err_t ret = esp_io_expander_new_i2c_tca95xx_16bit(i2c_bus_, I2C_ADDRESS, &io_expander);  
+        if(ret != ESP_OK)
+            ESP_LOGE(TAG, "TCA9554 create returned error");                                                                                  // 打印引脚状态
+
+        ret = esp_io_expander_set_dir(io_expander, IO_EXPANDER_PIN_NUM_0 | IO_EXPANDER_PIN_NUM_1 | IO_EXPANDER_PIN_NUM_8|IO_EXPANDER_PIN_NUM_5|IO_EXPANDER_PIN_NUM_6, IO_EXPANDER_OUTPUT);                 // 设置引脚 EXIO0 和 EXIO1 模式为输出
+        ESP_ERROR_CHECK(ret);
+        ret = esp_io_expander_set_level(io_expander, IO_EXPANDER_PIN_NUM_0 | IO_EXPANDER_PIN_NUM_1, 1);                                // 复位 LCD 与 TouchPad
+        ESP_ERROR_CHECK(ret);
+        vTaskDelay(pdMS_TO_TICKS(10));
+        ret = esp_io_expander_set_level(io_expander, IO_EXPANDER_PIN_NUM_0 | IO_EXPANDER_PIN_NUM_1, 0);                                // 复位 LCD 与 TouchPad
+        ESP_ERROR_CHECK(ret);
+        vTaskDelay(pdMS_TO_TICKS(10));
+        ret = esp_io_expander_set_level(io_expander, IO_EXPANDER_PIN_NUM_0 | IO_EXPANDER_PIN_NUM_1, 1);                                // 复位 LCD 与 TouchPad
+        ESP_ERROR_CHECK(ret);
+        ret = esp_io_expander_set_level(io_expander, IO_EXPANDER_PIN_NUM_8, 1);                                                         // 启用喇叭功放
+        ret = esp_io_expander_set_level(io_expander, IO_EXPANDER_PIN_NUM_5, false);                                                     // 复位摄像头
+        vTaskDelay(pdMS_TO_TICKS(5));
+        ret = esp_io_expander_set_level(io_expander, IO_EXPANDER_PIN_NUM_6, true); 
+        vTaskDelay(pdMS_TO_TICKS(5));
+        ESP_ERROR_CHECK(ret);
+    }
+
+    void InitializeSpi() {
+        spi_bus_config_t buscfg = {};
+        buscfg.mosi_io_num = DISPLAY_MOSI_PIN;
+        buscfg.miso_io_num = GPIO_NUM_NC;
+        buscfg.sclk_io_num = DISPLAY_SCLK_PIN;
+        buscfg.quadwp_io_num = GPIO_NUM_NC;
+        buscfg.quadhd_io_num = GPIO_NUM_NC;
+        buscfg.max_transfer_sz = DISPLAY_WIDTH * DISPLAY_HEIGHT * sizeof(uint16_t);
+        ESP_ERROR_CHECK(spi_bus_initialize(SPI2_HOST, &buscfg, SPI_DMA_CH_AUTO));
+    }
+
+    void InitializeSt7789Display() {
+        esp_lcd_panel_io_handle_t panel_io = nullptr;
+        esp_lcd_panel_handle_t panel = nullptr;
+        // 液晶屏控制IO初始化
+        ESP_LOGD(TAG, "Install panel IO");
+        esp_lcd_panel_io_spi_config_t io_config = {};
+        io_config.cs_gpio_num = DISPLAY_CS_PIN;
+        io_config.dc_gpio_num = DISPLAY_DC_PIN;
+        io_config.spi_mode = 0;
+        io_config.pclk_hz = DISPLAY_SPI_SCLK_HZ;
+        io_config.trans_queue_depth = 10;
+        io_config.lcd_cmd_bits = 8;
+        io_config.lcd_param_bits = 8;
+        ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI2_HOST, &io_config, &panel_io));
+
+        // 初始化液晶屏驱动芯片ST7789
+        ESP_LOGD(TAG, "Install LCD driver");
+        esp_lcd_panel_dev_config_t panel_config = {};
+        panel_config.reset_gpio_num = GPIO_NUM_NC;
+        panel_config.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB;
+        panel_config.bits_per_pixel = 16;
+        ESP_ERROR_CHECK(esp_lcd_new_panel_st7789(panel_io, &panel_config, &panel));
+        ESP_ERROR_CHECK(esp_lcd_panel_reset(panel));
+        ESP_ERROR_CHECK(esp_lcd_panel_init(panel));
+        ESP_ERROR_CHECK(esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY));
+        ESP_ERROR_CHECK(esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y));
+        ESP_ERROR_CHECK(esp_lcd_panel_invert_color(panel, DISPLAY_INVERT_COLOR));
+
+        display_ = new SpiLcdDisplay(panel_io, panel,
+                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
+                                     {
+                                         .text_font = &font_puhui_14_1,
+                                         .icon_font = &font_awesome_14_1,
+                                         .emoji_font = font_emoji_32_init(),
+                                     });
+    }
+
+    void InitializeJd9853Display() {
+        esp_lcd_panel_io_handle_t panel_io = nullptr;
+        esp_lcd_panel_handle_t panel = nullptr;
+        // 液晶屏控制IO初始化
+        ESP_LOGD(TAG, "Install panel IO");
+        esp_lcd_panel_io_spi_config_t io_config = {};
+        io_config.cs_gpio_num = DISPLAY_CS_PIN;
+        io_config.dc_gpio_num = DISPLAY_DC_PIN;
+        io_config.spi_mode = 0;
+        io_config.pclk_hz = DISPLAY_SPI_SCLK_HZ;
+        io_config.trans_queue_depth = 10;
+        io_config.lcd_cmd_bits = 8;
+        io_config.lcd_param_bits = 8;
+        ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI2_HOST, &io_config, &panel_io));
+
+        // 初始化液晶屏驱动芯片JD9853
+        ESP_LOGD(TAG, "Install LCD driver");
+        esp_lcd_panel_dev_config_t panel_config = {};
+        panel_config.reset_gpio_num = GPIO_NUM_NC;
+        panel_config.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB;
+        panel_config.bits_per_pixel = 16;
+        //ESP_ERROR_CHECK(esp_lcd_new_panel_st7789(panel_io, &panel_config, &panel));
+        ESP_ERROR_CHECK(esp_lcd_new_panel_jd9853(panel_io, &panel_config, &panel));
+        ESP_ERROR_CHECK(esp_lcd_panel_reset(panel));
+        ESP_ERROR_CHECK(esp_lcd_panel_init(panel));
+        ESP_ERROR_CHECK(esp_lcd_panel_invert_color(panel, true));
+        ESP_ERROR_CHECK(esp_lcd_panel_set_gap(panel, 0, 34));
+        ESP_ERROR_CHECK(esp_lcd_panel_mirror(panel, true, false));
+        ESP_ERROR_CHECK(esp_lcd_panel_swap_xy(panel, true));
+        display_ = new SpiLcdDisplay(panel_io, panel,
+                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
+                                     {
+                                         .text_font = &font_puhui_14_1,
+                                         .icon_font = &font_awesome_14_1,
+                                         .emoji_font = font_emoji_32_init(),
+                                     });
+    }
+
+    void InitializeButtons() {
+        boot_button_.OnClick([this]() {
+            auto& app = Application::GetInstance();
+            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
+                ResetWifiConfiguration();
+            }
+            app.ToggleChatState();
+        });
+    }
+
+    void InitializeCamera() {
+        camera_config_t config = {};
+        config.ledc_channel = LEDC_CHANNEL_2;   // LEDC通道选择  用于生成XCLK时钟 但是S3不用
+        config.ledc_timer = LEDC_TIMER_2;       // LEDC timer选择  用于生成XCLK时钟 但是S3不用
+        config.pin_d0 = CAMERA_PIN_D0;
+        config.pin_d1 = CAMERA_PIN_D1;
+        config.pin_d2 = CAMERA_PIN_D2;
+        config.pin_d3 = CAMERA_PIN_D3;
+        config.pin_d4 = CAMERA_PIN_D4;
+        config.pin_d5 = CAMERA_PIN_D5;
+        config.pin_d6 = CAMERA_PIN_D6;
+        config.pin_d7 = CAMERA_PIN_D7;
+        config.pin_xclk = CAMERA_PIN_XCLK;
+        config.pin_pclk = CAMERA_PIN_PCLK;
+        config.pin_vsync = CAMERA_PIN_VSYNC;
+        config.pin_href = CAMERA_PIN_HREF;
+        config.pin_sccb_sda = CAMERA_PIN_SIOD;  // 这里如果写-1 表示使用已经初始化的I2C接口
+        config.pin_sccb_scl = CAMERA_PIN_SIOC;
+        config.sccb_i2c_port = 0;               //  这里如果写1 默认使用I2C1
+        config.pin_pwdn = CAMERA_PIN_PWDN;
+        config.pin_reset = CAMERA_PIN_RESET;
+        config.xclk_freq_hz = XCLK_FREQ_HZ;
+        config.pixel_format = PIXFORMAT_RGB565;
+        config.frame_size = FRAMESIZE_QVGA;
+        config.jpeg_quality = 12;
+        config.fb_count = 1;
+        config.fb_location = CAMERA_FB_IN_PSRAM;
+        config.grab_mode = CAMERA_GRAB_WHEN_EMPTY;
+
+        camera_ = new Esp32Camera(config);
+        camera_->SetVFlip(1);
+    }
+public:
+    CustomBoard() :
+        boot_button_(BOOT_BUTTON_GPIO) {
+        InitializeI2c();
+        InitializeTca9555();
+        InitializeSpi();
+        InitializeButtons();
+        #ifdef LCD_TYPE_JD9853_SERIAL
+        InitializeJd9853Display(); 
+        #else
+        InitializeSt7789Display(); 
+        #endif
+        InitializeCamera();
+        GetBacklight()->RestoreBrightness();
+    }
+
+    virtual Led* GetLed() override {
+        static CircularStrip led(BUILTIN_LED_GPIO, 6);
+        return &led;
+    }
+
+    virtual AudioCodec* GetAudioCodec() override {
+        static BoxAudioCodec audio_codec(i2c_bus_, AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE,
+            AUDIO_I2S_GPIO_MCLK, AUDIO_I2S_GPIO_BCLK, AUDIO_I2S_GPIO_WS, AUDIO_I2S_GPIO_DOUT, AUDIO_I2S_GPIO_DIN, AUDIO_CODEC_PA_PIN, AUDIO_CODEC_ES8311_ADDR, AUDIO_CODEC_ES7210_ADDR, AUDIO_INPUT_REFERENCE);
+            return &audio_codec;
+    }
+
+    virtual Display* GetDisplay() override {
+        return display_;
+    }
+    
+    virtual Backlight* GetBacklight() override {
+        static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, BACKLIGHT_INVERT);
+        return &backlight;
+    }
+
+    virtual Camera* GetCamera() override {
+        return camera_;
+    }
+};
+
+DECLARE_BOARD(CustomBoard);

main/boards/waveshare-s3-audio-board/esp_lcd_jd9853.c

@@ -0,0 +1,460 @@
+#include <stdio.h>
+#include "esp_lcd_jd9853.h"
+/*
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdlib.h>
+#include <sys/cdefs.h>
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "esp_lcd_panel_interface.h"
+#include "esp_lcd_panel_io.h"
+#include "esp_lcd_panel_vendor.h"
+#include "esp_lcd_panel_ops.h"
+#include "esp_lcd_panel_commands.h"
+#include "driver/gpio.h"
+#include "esp_log.h"
+#include "esp_check.h"
+
+static const char *TAG = "JD9853";
+
+static esp_err_t panel_jd9853_del(esp_lcd_panel_t *panel);
+static esp_err_t panel_jd9853_reset(esp_lcd_panel_t *panel);
+static esp_err_t panel_jd9853_init(esp_lcd_panel_t *panel);
+static esp_err_t panel_jd9853_draw_bitmap(esp_lcd_panel_t *panel, int x_start, int y_start, int x_end, int y_end, const void *color_data);
+static esp_err_t panel_jd9853_invert_color(esp_lcd_panel_t *panel, bool invert_color_data);
+static esp_err_t panel_jd9853_mirror(esp_lcd_panel_t *panel, bool mirror_x, bool mirror_y);
+static esp_err_t panel_jd9853_swap_xy(esp_lcd_panel_t *panel, bool swap_axes);
+static esp_err_t panel_jd9853_set_gap(esp_lcd_panel_t *panel, int x_gap, int y_gap);
+static esp_err_t panel_jd9853_disp_on_off(esp_lcd_panel_t *panel, bool off);
+
+typedef struct
+{
+    esp_lcd_panel_t base;
+    esp_lcd_panel_io_handle_t io;
+    int reset_gpio_num;
+    bool reset_level;
+    int x_gap;
+    int y_gap;
+    uint8_t fb_bits_per_pixel;
+    uint8_t madctl_val; // save current value of LCD_CMD_MADCTL register
+    uint8_t colmod_val; // save current value of LCD_CMD_COLMOD register
+    const jd9853_lcd_init_cmd_t *init_cmds;
+    uint16_t init_cmds_size;
+} jd9853_panel_t;
+
+esp_err_t esp_lcd_new_panel_jd9853(const esp_lcd_panel_io_handle_t io, const esp_lcd_panel_dev_config_t *panel_dev_config, esp_lcd_panel_handle_t *ret_panel)
+{
+    esp_err_t ret = ESP_OK;
+    jd9853_panel_t *jd9853 = NULL;
+    gpio_config_t io_conf = {0};
+
+    ESP_GOTO_ON_FALSE(io && panel_dev_config && ret_panel, ESP_ERR_INVALID_ARG, err, TAG, "invalid argument");
+    jd9853 = (jd9853_panel_t *)calloc(1, sizeof(jd9853_panel_t));
+    ESP_GOTO_ON_FALSE(jd9853, ESP_ERR_NO_MEM, err, TAG, "no mem for jd9853 panel");
+
+    if (panel_dev_config->reset_gpio_num >= 0)
+    {
+        io_conf.mode = GPIO_MODE_OUTPUT;
+        io_conf.pin_bit_mask = 1ULL << panel_dev_config->reset_gpio_num;
+        ESP_GOTO_ON_ERROR(gpio_config(&io_conf), err, TAG, "configure GPIO for RST line failed");
+    }
+
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
+    switch (panel_dev_config->color_space)
+    {
+    case ESP_LCD_COLOR_SPACE_RGB:
+        jd9853->madctl_val = 0;
+        break;
+    case ESP_LCD_COLOR_SPACE_BGR:
+        jd9853->madctl_val |= LCD_CMD_BGR_BIT;
+        break;
+    default:
+        ESP_GOTO_ON_FALSE(false, ESP_ERR_NOT_SUPPORTED, err, TAG, "unsupported color space");
+        break;
+    }
+#else
+    switch (panel_dev_config->rgb_endian)
+    {
+    case LCD_RGB_ENDIAN_RGB:
+        jd9853->madctl_val = 0;
+        break;
+    case LCD_RGB_ENDIAN_BGR:
+        jd9853->madctl_val |= LCD_CMD_BGR_BIT;
+        break;
+    default:
+        ESP_GOTO_ON_FALSE(false, ESP_ERR_NOT_SUPPORTED, err, TAG, "unsupported rgb endian");
+        break;
+    }
+#endif
+
+    switch (panel_dev_config->bits_per_pixel)
+    {
+    case 16: // RGB565
+        jd9853->colmod_val = 0x55;
+        jd9853->fb_bits_per_pixel = 16;
+        break;
+    case 18: // RGB666
+        jd9853->colmod_val = 0x66;
+        // each color component (R/G/B) should occupy the 6 high bits of a byte, which means 3 full bytes are required for a pixel
+        jd9853->fb_bits_per_pixel = 24;
+        break;
+    default:
+        ESP_GOTO_ON_FALSE(false, ESP_ERR_NOT_SUPPORTED, err, TAG, "unsupported pixel width");
+        break;
+    }
+
+    jd9853->io = io;
+    jd9853->reset_gpio_num = panel_dev_config->reset_gpio_num;
+    jd9853->reset_level = panel_dev_config->flags.reset_active_high;
+    if (panel_dev_config->vendor_config)
+    {
+        jd9853->init_cmds = ((jd9853_vendor_config_t *)panel_dev_config->vendor_config)->init_cmds;
+        jd9853->init_cmds_size = ((jd9853_vendor_config_t *)panel_dev_config->vendor_config)->init_cmds_size;
+    }
+    jd9853->base.del = panel_jd9853_del;
+    jd9853->base.reset = panel_jd9853_reset;
+    jd9853->base.init = panel_jd9853_init;
+    jd9853->base.draw_bitmap = panel_jd9853_draw_bitmap;
+    jd9853->base.invert_color = panel_jd9853_invert_color;
+    jd9853->base.set_gap = panel_jd9853_set_gap;
+    jd9853->base.mirror = panel_jd9853_mirror;
+    jd9853->base.swap_xy = panel_jd9853_swap_xy;
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
+    jd9853->base.disp_off = panel_jd9853_disp_on_off;
+#else
+    jd9853->base.disp_on_off = panel_jd9853_disp_on_off;
+#endif
+    *ret_panel = &(jd9853->base);
+    ESP_LOGD(TAG, "new jd9853 panel @%p", jd9853);
+
+    // ESP_LOGI(TAG, "LCD panel create success, version: %d.%d.%d", ESP_LCD_jd9853_VER_MAJOR, ESP_LCD_jd9853_VER_MINOR,
+    //          ESP_LCD_jd9853_VER_PATCH);
+
+    return ESP_OK;
+
+err:
+    if (jd9853)
+    {
+        if (panel_dev_config->reset_gpio_num >= 0)
+        {
+            gpio_reset_pin(panel_dev_config->reset_gpio_num);
+        }
+        free(jd9853);
+    }
+    return ret;
+}
+
+static esp_err_t panel_jd9853_del(esp_lcd_panel_t *panel)
+{
+    jd9853_panel_t *jd9853 = __containerof(panel, jd9853_panel_t, base);
+
+    if (jd9853->reset_gpio_num >= 0)
+    {
+        gpio_reset_pin(jd9853->reset_gpio_num);
+    }
+    ESP_LOGD(TAG, "del jd9853 panel @%p", jd9853);
+    free(jd9853);
+    return ESP_OK;
+}
+
+static esp_err_t panel_jd9853_reset(esp_lcd_panel_t *panel)
+{
+    jd9853_panel_t *jd9853 = __containerof(panel, jd9853_panel_t, base);
+    esp_lcd_panel_io_handle_t io = jd9853->io;
+
+    // perform hardware reset
+    if (jd9853->reset_gpio_num >= 0)
+    {
+        gpio_set_level(jd9853->reset_gpio_num, jd9853->reset_level);
+        vTaskDelay(pdMS_TO_TICKS(10));
+        gpio_set_level(jd9853->reset_gpio_num, !jd9853->reset_level);
+        vTaskDelay(pdMS_TO_TICKS(10));
+    }
+    else
+    { // perform software reset
+        ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, LCD_CMD_SWRESET, NULL, 0), TAG, "send command failed");
+        vTaskDelay(pdMS_TO_TICKS(20)); // spec, wait at least 5ms before sending new command
+    }
+
+    return ESP_OK;
+}
+
+typedef struct
+{
+    uint8_t cmd;
+    uint8_t data[16];
+    uint8_t data_bytes; // Length of data in above data array; 0xFF = end of cmds.
+} lcd_init_cmd_t;
+
+// static const jd9853_lcd_init_cmd_t vendor_specific_init_default[] = {
+// //  {cmd, { data }, data_size, delay_ms}
+//     /* Power contorl B, power control = 0, DC_ENA = 1 */
+//     {0xCF, (uint8_t []){0x00, 0xAA, 0XE0}, 3, 0},
+//     /* Power on sequence control,
+//      * cp1 keeps 1 frame, 1st frame enable
+//      * vcl = 0, ddvdh=3, vgh=1, vgl=2
+//      * DDVDH_ENH=1
+//      */
+//     {0xED, (uint8_t []){0x67, 0x03, 0X12, 0X81}, 4, 0},
+//     /* Driver timing control A,
+//      * non-overlap=default +1
+//      * EQ=default - 1, CR=default
+//      * pre-charge=default - 1
+//      */
+//     {0xE8, (uint8_t []){0x8A, 0x01, 0x78}, 3, 0},
+//     /* Power control A, Vcore=1.6V, DDVDH=5.6V */
+//     {0xCB, (uint8_t []){0x39, 0x2C, 0x00, 0x34, 0x02}, 5, 0},
+//     /* Pump ratio control, DDVDH=2xVCl */
+//     {0xF7, (uint8_t []){0x20}, 1, 0},
+
+//     {0xF7, (uint8_t []){0x20}, 1, 0},
+//     /* Driver timing control, all=0 unit */
+//     {0xEA, (uint8_t []){0x00, 0x00}, 2, 0},
+//     /* Power control 1, GVDD=4.75V */
+//     {0xC0, (uint8_t []){0x23}, 1, 0},
+//     /* Power control 2, DDVDH=VCl*2, VGH=VCl*7, VGL=-VCl*3 */
+//     {0xC1, (uint8_t []){0x11}, 1, 0},
+//     /* VCOM control 1, VCOMH=4.025V, VCOML=-0.950V */
+//     {0xC5, (uint8_t []){0x43, 0x4C}, 2, 0},
+//     /* VCOM control 2, VCOMH=VMH-2, VCOML=VML-2 */
+//     {0xC7, (uint8_t []){0xA0}, 1, 0},
+//     /* Frame rate control, f=fosc, 70Hz fps */
+//     {0xB1, (uint8_t []){0x00, 0x1B}, 2, 0},
+//     /* Enable 3G, disabled */
+//     {0xF2, (uint8_t []){0x00}, 1, 0},
+//     /* Gamma set, curve 1 */
+//     {0x26, (uint8_t []){0x01}, 1, 0},
+//     /* Positive gamma correction */
+//     {0xE0, (uint8_t []){0x1F, 0x36, 0x36, 0x3A, 0x0C, 0x05, 0x4F, 0X87, 0x3C, 0x08, 0x11, 0x35, 0x19, 0x13, 0x00}, 15, 0},
+//     /* Negative gamma correction */
+//     {0xE1, (uint8_t []){0x00, 0x09, 0x09, 0x05, 0x13, 0x0A, 0x30, 0x78, 0x43, 0x07, 0x0E, 0x0A, 0x26, 0x2C, 0x1F}, 15, 0},
+//     /* Entry mode set, Low vol detect disabled, normal display */
+//     {0xB7, (uint8_t []){0x07}, 1, 0},
+//     /* Display function control */
+//     {0xB6, (uint8_t []){0x08, 0x82, 0x27}, 3, 0},
+// };
+
+static const jd9853_lcd_init_cmd_t vendor_specific_init_default[] = {
+    {0x11, (uint8_t []){ 0x00 }, 0, 120},
+    {0xDF, (uint8_t[]){0x98, 0x53}, 2, 0},
+    {0xDF, (uint8_t[]){0x98, 0x53}, 2, 0},
+    {0xB2, (uint8_t[]){0x23}, 1, 0},
+    {0xB7, (uint8_t[]){0x00, 0x47, 0x00, 0x6F}, 4, 0},
+    {0xBB, (uint8_t[]){0x1C, 0x1A, 0x55, 0x73, 0x63, 0xF0}, 6, 0},
+    {0xC0, (uint8_t[]){0x44, 0xA4}, 2, 0},
+    {0xC1, (uint8_t[]){0x16}, 1, 0},
+    {0xC3, (uint8_t[]){0x7D, 0x07, 0x14, 0x06, 0xCF, 0x71, 0x72, 0x77}, 8, 0},
+    {0xC4, (uint8_t[]){0x00, 0x00, 0xA0, 0x79, 0x0B, 0x0A, 0x16, 0x79, 0x0B, 0x0A, 0x16, 0x82}, 12, 0},                                                                                                                         // 00=60Hz 06=57Hz 08=51Hz, LN=320 Line
+    {0xC8, (uint8_t[]){0x3F, 0x32, 0x29, 0x29, 0x27, 0x2B, 0x27, 0x28, 0x28, 0x26, 0x25, 0x17, 0x12, 0x0D, 0x04, 0x00, 0x3F, 0x32, 0x29, 0x29, 0x27, 0x2B, 0x27, 0x28, 0x28, 0x26, 0x25, 0x17, 0x12, 0x0D, 0x04, 0x00}, 32, 0}, // SET_R_GAMMA
+    {0xD0, (uint8_t[]){0x04, 0x06, 0x6B, 0x0F, 0x00}, 5, 0},
+    {0xD7, (uint8_t[]){0x00, 0x30}, 2, 0},
+    {0xE6, (uint8_t[]){0x14}, 1, 0},
+    {0xDE, (uint8_t[]){0x01}, 1, 0},
+    {0xB7, (uint8_t[]){0x03, 0x13, 0xEF, 0x35, 0x35}, 5, 0},
+    {0xC1, (uint8_t[]){0x14, 0x15, 0xC0}, 3, 0},
+    {0xC2, (uint8_t[]){0x06, 0x3A}, 2, 0},
+    {0xC4, (uint8_t[]){0x72, 0x12}, 2, 0},
+    {0xBE, (uint8_t[]){0x00}, 1, 0},
+    {0xDE, (uint8_t[]){0x02}, 1, 0},
+    {0xE5, (uint8_t[]){0x00, 0x02, 0x00}, 3, 0},
+    {0xE5, (uint8_t[]){0x01, 0x02, 0x00}, 3, 0},
+    {0xDE, (uint8_t[]){0x00}, 1, 0},
+    {0x35, (uint8_t[]){0x00}, 1, 0},
+    {0x3A, (uint8_t[]){0x05}, 1, 0},                   // 06=RGB666；05=RGB565
+    {0x2A, (uint8_t[]){0x00, 0x22, 0x00, 0xCD}, 4, 0}, // Start_X=34, End_X=205
+    {0x2B, (uint8_t[]){0x00, 0x00, 0x01, 0x3F}, 4, 0}, // Start_Y=0, End_Y=319
+    {0xDE, (uint8_t[]){0x02}, 1, 0},
+    {0xE5, (uint8_t[]){0x00, 0x02, 0x00}, 3, 0},
+    {0xDE, (uint8_t[]){0x00}, 1, 0},
+    {0x29, (uint8_t []){ 0x00 }, 0, 0},
+};
+
+static esp_err_t panel_jd9853_init(esp_lcd_panel_t *panel)
+{
+    jd9853_panel_t *jd9853 = __containerof(panel, jd9853_panel_t, base);
+    esp_lcd_panel_io_handle_t io = jd9853->io;
+
+    // LCD goes into sleep mode and display will be turned off after power on reset, exit sleep mode first
+    ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, LCD_CMD_SLPOUT, NULL, 0), TAG, "send command failed");
+    vTaskDelay(pdMS_TO_TICKS(100));
+    ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, LCD_CMD_MADCTL, (uint8_t[]){
+                                                                          jd9853->madctl_val,
+                                                                      },
+                                                  1),
+                        TAG, "send command failed");
+    ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, LCD_CMD_COLMOD, (uint8_t[]){
+                                                                          jd9853->colmod_val,
+                                                                      },
+                                                  1),
+                        TAG, "send command failed");
+
+    const jd9853_lcd_init_cmd_t *init_cmds = NULL;
+    uint16_t init_cmds_size = 0;
+    if (jd9853->init_cmds)
+    {
+        init_cmds = jd9853->init_cmds;
+        init_cmds_size = jd9853->init_cmds_size;
+    }
+    else
+    {
+        init_cmds = vendor_specific_init_default;
+        init_cmds_size = sizeof(vendor_specific_init_default) / sizeof(jd9853_lcd_init_cmd_t);
+    }
+
+    bool is_cmd_overwritten = false;
+    for (int i = 0; i < init_cmds_size; i++)
+    {
+        // Check if the command has been used or conflicts with the internal
+        switch (init_cmds[i].cmd)
+        {
+        case LCD_CMD_MADCTL:
+            is_cmd_overwritten = true;
+            jd9853->madctl_val = ((uint8_t *)init_cmds[i].data)[0];
+            break;
+        case LCD_CMD_COLMOD:
+            is_cmd_overwritten = true;
+            jd9853->colmod_val = ((uint8_t *)init_cmds[i].data)[0];
+            break;
+        default:
+            is_cmd_overwritten = false;
+            break;
+        }
+
+        if (is_cmd_overwritten)
+        {
+            ESP_LOGW(TAG, "The %02Xh command has been used and will be overwritten by external initialization sequence", init_cmds[i].cmd);
+        }
+
+        ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, init_cmds[i].cmd, init_cmds[i].data, init_cmds[i].data_bytes), TAG, "send command failed");
+        vTaskDelay(pdMS_TO_TICKS(init_cmds[i].delay_ms));
+    }
+    ESP_LOGD(TAG, "send init commands success");
+
+    return ESP_OK;
+}
+
+static esp_err_t panel_jd9853_draw_bitmap(esp_lcd_panel_t *panel, int x_start, int y_start, int x_end, int y_end, const void *color_data)
+{
+    jd9853_panel_t *jd9853 = __containerof(panel, jd9853_panel_t, base);
+    assert((x_start < x_end) && (y_start < y_end) && "start position must be smaller than end position");
+    esp_lcd_panel_io_handle_t io = jd9853->io;
+
+    x_start += jd9853->x_gap;
+    x_end += jd9853->x_gap;
+    y_start += jd9853->y_gap;
+    y_end += jd9853->y_gap;
+
+    // define an area of frame memory where MCU can access
+    ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, LCD_CMD_CASET, (uint8_t[]){
+                                                                         (x_start >> 8) & 0xFF,
+                                                                         x_start & 0xFF,
+                                                                         ((x_end - 1) >> 8) & 0xFF,
+                                                                         (x_end - 1) & 0xFF,
+                                                                     },
+                                                  4),
+                        TAG, "send command failed");
+    ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, LCD_CMD_RASET, (uint8_t[]){
+                                                                         (y_start >> 8) & 0xFF,
+                                                                         y_start & 0xFF,
+                                                                         ((y_end - 1) >> 8) & 0xFF,
+                                                                         (y_end - 1) & 0xFF,
+                                                                     },
+                                                  4),
+                        TAG, "send command failed");
+    // transfer frame buffer
+    size_t len = (x_end - x_start) * (y_end - y_start) * jd9853->fb_bits_per_pixel / 8;
+    esp_lcd_panel_io_tx_color(io, LCD_CMD_RAMWR, color_data, len);
+
+    return ESP_OK;
+}
+
+static esp_err_t panel_jd9853_invert_color(esp_lcd_panel_t *panel, bool invert_color_data)
+{
+    jd9853_panel_t *jd9853 = __containerof(panel, jd9853_panel_t, base);
+    esp_lcd_panel_io_handle_t io = jd9853->io;
+    int command = 0;
+    if (invert_color_data)
+    {
+        command = LCD_CMD_INVON;
+    }
+    else
+    {
+        command = LCD_CMD_INVOFF;
+    }
+    ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, command, NULL, 0), TAG, "send command failed");
+    return ESP_OK;
+}
+
+static esp_err_t panel_jd9853_mirror(esp_lcd_panel_t *panel, bool mirror_x, bool mirror_y)
+{
+    jd9853_panel_t *jd9853 = __containerof(panel, jd9853_panel_t, base);
+    esp_lcd_panel_io_handle_t io = jd9853->io;
+    if (mirror_x)
+    {
+        jd9853->madctl_val |= LCD_CMD_MX_BIT;
+    }
+    else
+    {
+        jd9853->madctl_val &= ~LCD_CMD_MX_BIT;
+    }
+    if (mirror_y)
+    {
+        jd9853->madctl_val |= LCD_CMD_MY_BIT;
+    }
+    else
+    {
+        jd9853->madctl_val &= ~LCD_CMD_MY_BIT;
+    }
+    ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, LCD_CMD_MADCTL, (uint8_t[]){jd9853->madctl_val}, 1), TAG, "send command failed");
+    return ESP_OK;
+}
+
+static esp_err_t panel_jd9853_swap_xy(esp_lcd_panel_t *panel, bool swap_axes)
+{
+    jd9853_panel_t *jd9853 = __containerof(panel, jd9853_panel_t, base);
+    esp_lcd_panel_io_handle_t io = jd9853->io;
+    if (swap_axes)
+    {
+        jd9853->madctl_val |= LCD_CMD_MV_BIT;
+    }
+    else
+    {
+        jd9853->madctl_val &= ~LCD_CMD_MV_BIT;
+    }
+    ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, LCD_CMD_MADCTL, (uint8_t[]){jd9853->madctl_val}, 1), TAG, "send command failed");
+    return ESP_OK;
+}
+
+static esp_err_t panel_jd9853_set_gap(esp_lcd_panel_t *panel, int x_gap, int y_gap)
+{
+    jd9853_panel_t *jd9853 = __containerof(panel, jd9853_panel_t, base);
+    jd9853->x_gap = x_gap;
+    jd9853->y_gap = y_gap;
+    return ESP_OK;
+}
+
+static esp_err_t panel_jd9853_disp_on_off(esp_lcd_panel_t *panel, bool on_off)
+{
+    jd9853_panel_t *jd9853 = __containerof(panel, jd9853_panel_t, base);
+    esp_lcd_panel_io_handle_t io = jd9853->io;
+    int command = 0;
+
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
+    on_off = !on_off;
+#endif
+
+    if (on_off)
+    {
+        command = LCD_CMD_DISPON;
+    }
+    else
+    {
+        command = LCD_CMD_DISPOFF;
+    }
+    ESP_RETURN_ON_ERROR(esp_lcd_panel_io_tx_param(io, command, NULL, 0), TAG, "send command failed");
+    return ESP_OK;
+}

main/boards/waveshare-s3-audio-board/esp_lcd_jd9853.h

@@ -0,0 +1,102 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * @file
+ * @brief ESP LCD: jd9853
+ */
+
+#pragma once
+
+#include "hal/spi_ll.h"
+#include "esp_lcd_panel_vendor.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief LCD panel initialization commands.
+ *
+ */
+typedef struct {
+    int cmd;                /*<! The specific LCD command */
+    const void *data;       /*<! Buffer that holds the command specific data */
+    size_t data_bytes;      /*<! Size of `data` in memory, in bytes */
+    unsigned int delay_ms;  /*<! Delay in milliseconds after this command */
+} jd9853_lcd_init_cmd_t;
+
+/**
+ * @brief LCD panel vendor configuration.
+ *
+ * @note  This structure needs to be passed to the `vendor_config` field in `esp_lcd_panel_dev_config_t`.
+ *
+ */
+typedef struct {
+    const jd9853_lcd_init_cmd_t *init_cmds;     /*!< Pointer to initialization commands array. Set to NULL if using default commands.
+                                                 *   The array should be declared as `static const` and positioned outside the function.
+                                                 *   Please refer to `vendor_specific_init_default` in source file.
+                                                 */
+    uint16_t init_cmds_size;                    /*<! Number of commands in above array */
+} jd9853_vendor_config_t;
+
+/**
+ * @brief Create LCD panel for model jd9853
+ *
+ * @note  Vendor specific initialization can be different between manufacturers, should consult the LCD supplier for initialization sequence code.
+ *
+ * @param[in] io LCD panel IO handle
+ * @param[in] panel_dev_config general panel device configuration
+ * @param[out] ret_panel Returned LCD panel handle
+ * @return
+ *          - ESP_ERR_INVALID_ARG   if parameter is invalid
+ *          - ESP_ERR_NO_MEM        if out of memory
+ *          - ESP_OK                on success
+ */
+esp_err_t esp_lcd_new_panel_jd9853(const esp_lcd_panel_io_handle_t io, const esp_lcd_panel_dev_config_t *panel_dev_config, esp_lcd_panel_handle_t *ret_panel);
+
+/**
+ * @brief LCD panel bus configuration structure
+ *
+ * @param[in] sclk SPI clock pin number
+ * @param[in] mosi SPI MOSI pin number
+ * @param[in] max_trans_sz Maximum transfer size in bytes
+ *
+ */
+#define JD9853_PANEL_BUS_SPI_CONFIG(sclk, mosi, max_trans_sz)  \
+    {                                                           \
+        .sclk_io_num = sclk,                                    \
+        .mosi_io_num = mosi,                                    \
+        .miso_io_num = -1,                                      \
+        .quadhd_io_num = -1,                                    \
+        .quadwp_io_num = -1,                                    \
+        .max_transfer_sz = max_trans_sz,                        \
+    }
+
+/**
+ * @brief LCD panel IO configuration structure
+ *
+ * @param[in] cs SPI chip select pin number
+ * @param[in] dc SPI data/command pin number
+ * @param[in] cb Callback function when SPI transfer is done
+ * @param[in] cb_ctx Callback function context
+ *
+ */
+#define JD9853_PANEL_IO_SPI_CONFIG(cs, dc, callback, callback_ctx) \
+    {                                                               \
+        .cs_gpio_num = cs,                                          \
+        .dc_gpio_num = dc,                                          \
+        .spi_mode = 0,                                              \
+        .pclk_hz = 40 * 1000 * 1000,                                \
+        .trans_queue_depth = 10,                                    \
+        .on_color_trans_done = callback,                            \
+        .user_ctx = callback_ctx,                                   \
+        .lcd_cmd_bits = 8,                                          \
+        .lcd_param_bits = 8,                                        \
+    }
+
+#ifdef __cplusplus
+}
+#endif

main/boards/waveshare-s3-touch-amoled-1.75/esp32-s3-touch-amoled-1.75.cc

@@ -1,7 +1,6 @@
 #include "wifi_board.h"
 #include "display/lcd_display.h"
 #include "esp_lcd_sh8601.h"
-#include "font_awesome_symbols.h"
 
 #include "codecs/box_audio_codec.h"
 #include "application.h"

main/boards/waveshare-s3-touch-amoled-2.06/esp32-s3-touch-amoled-2.06.cc

@@ -1,7 +1,6 @@
 #include "wifi_board.h"
 #include "display/lcd_display.h"
 #include "esp_lcd_sh8601.h"
-#include "font_awesome_symbols.h"
 
 #include "codecs/box_audio_codec.h"
 #include "application.h"

main/boards/waveshare-s3-touch-lcd-3.5b/custom_lcd_display.cc

@@ -3,7 +3,6 @@
 #include "lcd_display.h"
 
 #include <vector>
-#include <font_awesome_symbols.h>
 #include <esp_log.h>
 #include <esp_err.h>
 #include <esp_lvgl_port.h>
@@ -350,4 +349,4 @@ CustomLcdDisplay::CustomLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_p
     }
 
     SetupUI();
-}
+}

main/boards/xmini-c3-4g/xmini_c3_4g_board.cc

@@ -8,7 +8,6 @@
 #include "settings.h"
 #include "config.h"
 #include "sleep_timer.h"
-#include "font_awesome_symbols.h"
 #include "adc_battery_monitor.h"
 #include "press_to_talk_mcp_tool.h"
 

main/boards/xmini-c3-v3/xmini_c3_board.cc

@@ -8,7 +8,6 @@
 #include "settings.h"
 #include "config.h"
 #include "power_save_timer.h"
-#include "font_awesome_symbols.h"
 #include "adc_battery_monitor.h"
 #include "press_to_talk_mcp_tool.h"
 

main/boards/xmini-c3/xmini_c3_board.cc

@@ -8,7 +8,6 @@
 #include "settings.h"
 #include "config.h"
 #include "power_save_timer.h"
-#include "font_awesome_symbols.h"
 #include "press_to_talk_mcp_tool.h"
 
 #include <wifi_station.h>

main/display/display.cc

@@ -3,11 +3,11 @@
 #include <string>
 #include <cstdlib>
 #include <cstring>
+#include <font_awesome.h>
 
 #include "display.h"
 #include "board.h"
 #include "application.h"
-#include "font_awesome_symbols.h"
 #include "audio_codec.h"
 #include "settings.h"
 #include "assets/lang_config.h"
@@ -105,7 +105,7 @@ void Display::UpdateStatusBar(bool update_all) {
         // 如果静音状态改变，则更新图标
         if (codec->output_volume() == 0 && !muted_) {
             muted_ = true;
-            lv_label_set_text(mute_label_, FONT_AWESOME_VOLUME_MUTE);
+            lv_label_set_text(mute_label_, FONT_AWESOME_VOLUME_XMARK);
         } else if (codec->output_volume() > 0 && muted_) {
             muted_ = false;
             lv_label_set_text(mute_label_, "");
@@ -136,13 +136,13 @@ void Display::UpdateStatusBar(bool update_all) {
     const char* icon = nullptr;
     if (board.GetBatteryLevel(battery_level, charging, discharging)) {
         if (charging) {
-            icon = FONT_AWESOME_BATTERY_CHARGING;
+            icon = FONT_AWESOME_BATTERY_BOLT;
         } else {
             const char* levels[] = {
                 FONT_AWESOME_BATTERY_EMPTY, // 0-19%
-                FONT_AWESOME_BATTERY_1,    // 20-39%
-                FONT_AWESOME_BATTERY_2,    // 40-59%
-                FONT_AWESOME_BATTERY_3,    // 60-79%
+                FONT_AWESOME_BATTERY_QUARTER,    // 20-39%
+                FONT_AWESOME_BATTERY_HALF,    // 40-59%
+                FONT_AWESOME_BATTERY_THREE_QUARTERS,    // 60-79%
                 FONT_AWESOME_BATTERY_FULL, // 80-99%
                 FONT_AWESOME_BATTERY_FULL, // 100%
             };
@@ -196,50 +196,11 @@ void Display::UpdateStatusBar(bool update_all) {
 
 
 void Display::SetEmotion(const char* emotion) {
-    struct Emotion {
-        const char* icon;
-        const char* text;
-    };
-
-    static const std::vector<Emotion> emotions = {
-        {FONT_AWESOME_EMOJI_NEUTRAL, "neutral"},
-        {FONT_AWESOME_EMOJI_HAPPY, "happy"},
-        {FONT_AWESOME_EMOJI_LAUGHING, "laughing"},
-        {FONT_AWESOME_EMOJI_FUNNY, "funny"},
-        {FONT_AWESOME_EMOJI_SAD, "sad"},
-        {FONT_AWESOME_EMOJI_ANGRY, "angry"},
-        {FONT_AWESOME_EMOJI_CRYING, "crying"},
-        {FONT_AWESOME_EMOJI_LOVING, "loving"},
-        {FONT_AWESOME_EMOJI_EMBARRASSED, "embarrassed"},
-        {FONT_AWESOME_EMOJI_SURPRISED, "surprised"},
-        {FONT_AWESOME_EMOJI_SHOCKED, "shocked"},
-        {FONT_AWESOME_EMOJI_THINKING, "thinking"},
-        {FONT_AWESOME_EMOJI_WINKING, "winking"},
-        {FONT_AWESOME_EMOJI_COOL, "cool"},
-        {FONT_AWESOME_EMOJI_RELAXED, "relaxed"},
-        {FONT_AWESOME_EMOJI_DELICIOUS, "delicious"},
-        {FONT_AWESOME_EMOJI_KISSY, "kissy"},
-        {FONT_AWESOME_EMOJI_CONFIDENT, "confident"},
-        {FONT_AWESOME_EMOJI_SLEEPY, "sleepy"},
-        {FONT_AWESOME_EMOJI_SILLY, "silly"},
-        {FONT_AWESOME_EMOJI_CONFUSED, "confused"}
-    };
-    
-    // 查找匹配的表情
-    std::string_view emotion_view(emotion);
-    auto it = std::find_if(emotions.begin(), emotions.end(),
-        [&emotion_view](const Emotion& e) { return e.text == emotion_view; });
-    
-    DisplayLockGuard lock(this);
-    if (emotion_label_ == nullptr) {
-        return;
-    }
-
-    // 如果找到匹配的表情就显示对应图标，否则显示默认的neutral表情
-    if (it != emotions.end()) {
-        lv_label_set_text(emotion_label_, it->icon);
+    const char* utf8 = font_awesome_get_utf8(emotion);
+    if (utf8 != nullptr) {
+        SetIcon(utf8);
     } else {
-        lv_label_set_text(emotion_label_, FONT_AWESOME_EMOJI_NEUTRAL);
+        SetIcon(FONT_AWESOME_NEUTRAL);
     }
 }
 

main/display/lcd_display.cc

@@ -1,15 +1,15 @@
 #include "lcd_display.h"
+#include "assets/lang_config.h"
+#include "settings.h"
 
 #include <vector>
 #include <algorithm>
-#include <font_awesome_symbols.h>
+#include <font_awesome.h>
 #include <esp_log.h>
 #include <esp_err.h>
 #include <esp_lvgl_port.h>
-#include <esp_heap_caps.h>
-#include "assets/lang_config.h"
+#include <esp_psram.h>
 #include <cstring>
-#include "settings.h"
 
 #include "board.h"
 
@@ -102,10 +102,24 @@ SpiLcdDisplay::SpiLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_h
     ESP_LOGI(TAG, "Initialize LVGL library");
     lv_init();
 
+#if CONFIG_SPIRAM
+    // lv image cache, currently only PNG is supported
+    size_t psram_size_mb = esp_psram_get_size() / 1024 / 1024;
+    if (psram_size_mb >= 8) {
+        lv_image_cache_resize(2 * 1024 * 1024, true);
+        ESP_LOGI(TAG, "Use 2MB of PSRAM for image cache");
+    } else if (psram_size_mb >= 2) {
+        lv_image_cache_resize(512 * 1024, true);
+        ESP_LOGI(TAG, "Use 512KB of PSRAM for image cache");
+    }
+#endif
+
     ESP_LOGI(TAG, "Initialize LVGL port");
     lvgl_port_cfg_t port_cfg = ESP_LVGL_PORT_INIT_CONFIG();
     port_cfg.task_priority = 1;
-    port_cfg.timer_period_ms = 40;
+#if CONFIG_SOC_CPU_CORES_NUM > 1
+    port_cfg.task_affinity = 1;
+#endif
     lvgl_port_init(&port_cfg);
 
     ESP_LOGI(TAG, "Adding LCD display");
@@ -167,7 +181,9 @@ RgbLcdDisplay::RgbLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_h
     ESP_LOGI(TAG, "Initialize LVGL port");
     lvgl_port_cfg_t port_cfg = ESP_LVGL_PORT_INIT_CONFIG();
     port_cfg.task_priority = 1;
-    port_cfg.timer_period_ms = 50;
+#if CONFIG_SOC_CPU_CORES_NUM > 1
+    port_cfg.task_affinity = 1;
+#endif
     lvgl_port_init(&port_cfg);
 
     ESP_LOGI(TAG, "Adding LCD display");
@@ -226,6 +242,10 @@ MipiLcdDisplay::MipiLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel
 
     ESP_LOGI(TAG, "Initialize LVGL port");
     lvgl_port_cfg_t port_cfg = ESP_LVGL_PORT_INIT_CONFIG();
+    port_cfg.task_priority = 1;
+#if CONFIG_SOC_CPU_CORES_NUM > 1
+    port_cfg.task_affinity = 1;
+#endif
     lvgl_port_init(&port_cfg);
 
     ESP_LOGI(TAG, "Adding LCD display");
@@ -367,7 +387,7 @@ void LcdDisplay::SetupUI() {
     emotion_label_ = lv_label_create(status_bar_);
     lv_obj_set_style_text_font(emotion_label_, &font_awesome_30_4, 0);
     lv_obj_set_style_text_color(emotion_label_, current_theme_.text, 0);
-    lv_label_set_text(emotion_label_, FONT_AWESOME_AI_CHIP);
+    lv_label_set_text(emotion_label_, FONT_AWESOME_MICROCHIP_AI);
     lv_obj_set_style_margin_right(emotion_label_, 5, 0); // 添加右边距，与后面的元素分隔
 
     notification_label_ = lv_label_create(status_bar_);
@@ -621,7 +641,7 @@ void LcdDisplay::SetPreviewImage(const lv_img_dsc_t* img_dsc) {
         
         // 设置自定义属性标记气泡类型
         lv_obj_set_user_data(img_bubble, (void*)"image");
-        
+
         // Create the image object inside the bubble
         lv_obj_t* preview_image = lv_image_create(img_bubble);
         
@@ -744,7 +764,7 @@ void LcdDisplay::SetupUI() {
     emotion_label_ = lv_label_create(content_);
     lv_obj_set_style_text_font(emotion_label_, &font_awesome_30_4, 0);
     lv_obj_set_style_text_color(emotion_label_, current_theme_.text, 0);
-    lv_label_set_text(emotion_label_, FONT_AWESOME_AI_CHIP);
+    lv_label_set_text(emotion_label_, FONT_AWESOME_MICROCHIP_AI);
 
     preview_image_ = lv_image_create(content_);
     lv_obj_set_size(preview_image_, width_ * 0.5, height_ * 0.5);
@@ -816,8 +836,10 @@ void LcdDisplay::SetPreviewImage(const lv_img_dsc_t* img_dsc) {
     if (img_dsc != nullptr) {
         // 设置图片源并显示预览图片
         lv_image_set_src(preview_image_, img_dsc);
-        // zoom factor 0.5
-        lv_image_set_scale(preview_image_, 128 * width_ / img_dsc->header.w);
+        if (img_dsc->header.w > 0) {
+            // zoom factor 0.5
+            lv_image_set_scale(preview_image_, 128 * width_ / img_dsc->header.w);
+        }
         lv_obj_remove_flag(preview_image_, LV_OBJ_FLAG_HIDDEN);
         // 隐藏emotion_label_
         if (emotion_label_ != nullptr) {
@@ -867,6 +889,13 @@ void LcdDisplay::SetEmotion(const char* emotion) {
     std::string_view emotion_view(emotion);
     auto it = std::find_if(emotions.begin(), emotions.end(),
         [&emotion_view](const Emotion& e) { return e.text == emotion_view; });
+    if (fonts_.emoji_font == nullptr || it == emotions.end()) {
+        const char* utf8 = font_awesome_get_utf8(emotion);
+        if (utf8 != nullptr) {
+            SetIcon(utf8);
+        }
+        return;
+    }
 
     DisplayLockGuard lock(this);
     if (emotion_label_ == nullptr) {

main/display/oled_display.cc

@@ -1,5 +1,4 @@
 #include "oled_display.h"
-#include "font_awesome_symbols.h"
 #include "assets/lang_config.h"
 
 #include <string>
@@ -8,6 +7,7 @@
 #include <esp_log.h>
 #include <esp_err.h>
 #include <esp_lvgl_port.h>
+#include <font_awesome.h>
 
 #define TAG "OledDisplay"
 
@@ -23,7 +23,9 @@ OledDisplay::OledDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handl
     lvgl_port_cfg_t port_cfg = ESP_LVGL_PORT_INIT_CONFIG();
     port_cfg.task_priority = 1;
     port_cfg.task_stack = 6144;
-    port_cfg.timer_period_ms = 40;
+#if CONFIG_SOC_CPU_CORES_NUM > 1
+    port_cfg.task_affinity = 1;
+#endif
     lvgl_port_init(&port_cfg);
 
     ESP_LOGI(TAG, "Adding OLED display");
@@ -157,7 +159,7 @@ void OledDisplay::SetupUI_128x64() {
 
     emotion_label_ = lv_label_create(content_left_);
     lv_obj_set_style_text_font(emotion_label_, &font_awesome_30_1, 0);
-    lv_label_set_text(emotion_label_, FONT_AWESOME_AI_CHIP);
+    lv_label_set_text(emotion_label_, FONT_AWESOME_MICROCHIP_AI);
     lv_obj_center(emotion_label_);
     lv_obj_set_style_pad_top(emotion_label_, 8, 0);
 
@@ -249,7 +251,7 @@ void OledDisplay::SetupUI_128x32() {
 
     emotion_label_ = lv_label_create(content_);
     lv_obj_set_style_text_font(emotion_label_, &font_awesome_30_1, 0);
-    lv_label_set_text(emotion_label_, FONT_AWESOME_AI_CHIP);
+    lv_label_set_text(emotion_label_, FONT_AWESOME_MICROCHIP_AI);
     lv_obj_center(emotion_label_);
 
     /* Right side */

main/idf_component.yml

@@ -13,10 +13,10 @@ dependencies:
   espressif/esp_io_expander_tca9554: ==2.0.0
   espressif/esp_lcd_panel_io_additions: ^1.0.1
   78/esp_lcd_nv3023: ~1.0.0
-  78/esp-wifi-connect: ~2.5.1
+  78/esp-wifi-connect: ~2.6.1
   78/esp-opus-encoder: ~2.4.1
-  78/esp-ml307: ~3.2.8
-  78/xiaozhi-fonts: ~1.4.0
+  78/esp-ml307: ~3.3.7
+  78/xiaozhi-fonts: ~1.5.2
   espressif/led_strip: ~3.0.1
   espressif/esp_codec_dev: ~1.4.0
   espressif/esp-sr: ~2.1.5
@@ -32,7 +32,7 @@ dependencies:
   esp_lvgl_port: ~2.6.0
   espressif/esp_io_expander_tca95xx_16bit: ^2.0.0
   espressif2022/image_player: ==1.1.0~1
-  espressif2022/esp_emote_gfx: ^1.0.0
+  espressif2022/esp_emote_gfx: ==1.0.0~2
   espressif/adc_mic: ^0.2.1
   espressif/esp_mmap_assets: '>=1.2'
   txp666/otto-emoji-gif-component: ~1.0.2

main/main.cc

@@ -27,5 +27,4 @@ extern "C" void app_main(void)
     // Launch the application
     auto& app = Application::GetInstance();
     app.Start();
-    app.MainEventLoop();
 }

main/mcp_server.cc

@@ -16,8 +16,6 @@
 
 #define TAG "MCP"
 
-#define DEFAULT_TOOLCALL_STACK_SIZE 6144
-
 McpServer::McpServer() {
 }
 
@@ -29,12 +27,17 @@ McpServer::~McpServer() {
 }
 
 void McpServer::AddCommonTools() {
-    // To speed up the response time, we add the common tools to the beginning of
+    // *Important* To speed up the response time, we add the common tools to the beginning of
     // the tools list to utilize the prompt cache.
+    // **重要** 为了提升响应速度，我们把常用的工具放在前面，利用 prompt cache 的特性。
+
     // Backup the original tools list and restore it after adding the common tools.
     auto original_tools = std::move(tools_);
     auto& board = Board::GetInstance();
 
+    // Do not add custom tools here.
+    // Custom tools must be added in the board's InitializeTools function.
+
     AddTool("self.get_device_status",
         "Provides the real-time information of the device, including the current status of the audio speaker, screen, battery, network, etc.\n"
         "Use this tool for: \n"
@@ -95,6 +98,9 @@ void McpServer::AddCommonTools() {
                 Property("question", kPropertyTypeString)
             }),
             [camera](const PropertyList& properties) -> ReturnValue {
+                // Lower the priority to do the camera capture
+                TaskPriorityReset priority_reset(1);
+
                 if (!camera->Capture()) {
                     return "{\"success\": false, \"message\": \"Failed to capture photo\"}";
                 }
@@ -122,6 +128,12 @@ void McpServer::AddTool(const std::string& name, const std::string& description,
     AddTool(new McpTool(name, description, properties, callback));
 }
 
+void McpServer::AddUserOnlyTool(const std::string& name, const std::string& description, const PropertyList& properties, std::function<ReturnValue(const PropertyList&)> callback) {
+    auto tool = new McpTool(name, description, properties, callback);
+    tool->set_user_only(true);
+    AddTool(tool);
+}
+
 void McpServer::ParseMessage(const std::string& message) {
     cJSON* json = cJSON_Parse(message.c_str());
     if (json == nullptr) {
@@ -224,13 +236,7 @@ void McpServer::ParseMessage(const cJSON* json) {
             ReplyError(id_int, "Invalid arguments");
             return;
         }
-        auto stack_size = cJSON_GetObjectItem(params, "stackSize");
-        if (stack_size != nullptr && !cJSON_IsNumber(stack_size)) {
-            ESP_LOGE(TAG, "tools/call: Invalid stackSize");
-            ReplyError(id_int, "Invalid stackSize");
-            return;
-        }
-        DoToolCall(id_int, std::string(tool_name->valuestring), tool_arguments, stack_size ? stack_size->valueint : DEFAULT_TOOLCALL_STACK_SIZE);
+        DoToolCall(id_int, std::string(tool_name->valuestring), tool_arguments);
     } else {
         ESP_LOGE(TAG, "Method not implemented: %s", method_str.c_str());
         ReplyError(id_int, "Method not implemented: " + method_str);
@@ -305,7 +311,7 @@ void McpServer::GetToolsList(int id, const std::string& cursor) {
     ReplyResult(id, json);
 }
 
-void McpServer::DoToolCall(int id, const std::string& tool_name, const cJSON* tool_arguments, int stack_size) {
+void McpServer::DoToolCall(int id, const std::string& tool_name, const cJSON* tool_arguments) {
     auto tool_iter = std::find_if(tools_.begin(), tools_.end(), 
                                  [&tool_name](const McpTool* tool) { 
                                      return tool->name() == tool_name; 
@@ -347,15 +353,9 @@ void McpServer::DoToolCall(int id, const std::string& tool_name, const cJSON* to
         return;
     }
 
-    // Start a task to receive data with stack size
-    esp_pthread_cfg_t cfg = esp_pthread_get_default_config();
-    cfg.thread_name = "tool_call";
-    cfg.stack_size = stack_size;
-    cfg.prio = 1;
-    esp_pthread_set_cfg(&cfg);
-
-    // Use a thread to call the tool to avoid blocking the main thread
-    tool_call_thread_ = std::thread([this, id, tool_iter, arguments = std::move(arguments)]() {
+    // Use main thread to call the tool
+    auto& app = Application::GetInstance();
+    app.Schedule([this, id, tool_iter, arguments = std::move(arguments)]() {
         try {
             ReplyResult(id, (*tool_iter)->Call(arguments));
         } catch (const std::exception& e) {
@@ -363,5 +363,4 @@ void McpServer::DoToolCall(int id, const std::string& tool_name, const cJSON* to
             ReplyError(id, e.what());
         }
     });
-    tool_call_thread_.detach();
 }

main/mcp_server.h

@@ -177,6 +177,7 @@ private:
     std::string description_;
     PropertyList properties_;
     std::function<ReturnValue(const PropertyList&)> callback_;
+    bool user_only_ = false;
 
 public:
     McpTool(const std::string& name, 
@@ -188,9 +189,11 @@ public:
         properties_(properties), 
         callback_(callback) {}
 
+    void set_user_only(bool user_only) { user_only_ = user_only; }
     inline const std::string& name() const { return name_; }
     inline const std::string& description() const { return description_; }
     inline const PropertyList& properties() const { return properties_; }
+    inline bool user_only() const { return user_only_; }
 
     std::string to_json() const {
         std::vector<std::string> required = properties_.GetRequired();
@@ -214,6 +217,15 @@ public:
         }
         
         cJSON_AddItemToObject(json, "inputSchema", input_schema);
+
+        // Add audience annotation if the tool is user only (invisible to AI)
+        if (user_only_) {
+            cJSON *annotations = cJSON_CreateObject();
+            cJSON *audience = cJSON_CreateArray();
+            cJSON_AddItemToArray(audience, cJSON_CreateString("user"));
+            cJSON_AddItemToObject(annotations, "audience", audience);
+            cJSON_AddItemToObject(json, "annotations", annotations);
+        }
         
         char *json_str = cJSON_PrintUnformatted(json);
         std::string result(json_str);
@@ -259,6 +271,7 @@ public:
     void AddCommonTools();
     void AddTool(McpTool* tool);
     void AddTool(const std::string& name, const std::string& description, const PropertyList& properties, std::function<ReturnValue(const PropertyList&)> callback);
+    void AddUserOnlyTool(const std::string& name, const std::string& description, const PropertyList& properties, std::function<ReturnValue(const PropertyList&)> callback);
     void ParseMessage(const cJSON* json);
     void ParseMessage(const std::string& message);
 
@@ -272,10 +285,9 @@ private:
     void ReplyError(int id, const std::string& message);
 
     void GetToolsList(int id, const std::string& cursor);
-    void DoToolCall(int id, const std::string& tool_name, const cJSON* tool_arguments, int stack_size);
+    void DoToolCall(int id, const std::string& tool_name, const cJSON* tool_arguments);
 
     std::vector<McpTool*> tools_;
-    std::thread tool_call_thread_;
 };
 
 #endif // MCP_SERVER_H

main/ota.cc

@@ -51,11 +51,9 @@ std::string Ota::GetCheckVersionUrl() {
 
 std::unique_ptr<Http> Ota::SetupHttp() {
     auto& board = Board::GetInstance();
-    auto app_desc = esp_app_get_description();
-
     auto network = board.GetNetwork();
     auto http = network->CreateHttp(0);
-    auto user_agent = std::string(BOARD_NAME "/") + app_desc->version;
+    auto user_agent = SystemInfo::GetUserAgent();
     http->SetHeader("Activation-Version", has_serial_number_ ? "2" : "1");
     http->SetHeader("Device-Id", SystemInfo::GetMacAddress().c_str());
     http->SetHeader("Client-Id", board.GetUuid());

main/protocols/mqtt_protocol.cc

@@ -12,11 +12,33 @@
 
 MqttProtocol::MqttProtocol() {
     event_group_handle_ = xEventGroupCreate();
+
+    // Initialize reconnect timer
+    esp_timer_create_args_t reconnect_timer_args = {
+        .callback = [](void* arg) {
+            MqttProtocol* protocol = (MqttProtocol*)arg;
+            auto& app = Application::GetInstance();
+            if (app.GetDeviceState() == kDeviceStateIdle) {
+                ESP_LOGI(TAG, "Reconnecting to MQTT server");
+                app.Schedule([protocol]() {
+                    protocol->StartMqttClient(false);
+                });
+            }
+        },
+        .arg = this,
+    };
+    esp_timer_create(&reconnect_timer_args, &reconnect_timer_);
 }
 
 MqttProtocol::~MqttProtocol() {
     ESP_LOGI(TAG, "MqttProtocol deinit");
-    vEventGroupDelete(event_group_handle_);
+    if (reconnect_timer_ != nullptr) {
+        esp_timer_stop(reconnect_timer_);
+        esp_timer_delete(reconnect_timer_);
+    }
+    if (event_group_handle_ != nullptr) {
+        vEventGroupDelete(event_group_handle_);
+    }
 }
 
 bool MqttProtocol::Start() {
@@ -50,7 +72,18 @@ bool MqttProtocol::StartMqttClient(bool report_error) {
     mqtt_->SetKeepAlive(keepalive_interval);
 
     mqtt_->OnDisconnected([this]() {
-        ESP_LOGI(TAG, "Disconnected from endpoint");
+        if (on_disconnected_ != nullptr) {
+            on_disconnected_();
+        }
+        ESP_LOGI(TAG, "MQTT disconnected, schedule reconnect in %d seconds", MQTT_RECONNECT_INTERVAL_MS / 1000);
+        esp_timer_start_once(reconnect_timer_, MQTT_RECONNECT_INTERVAL_MS * 1000);
+    });
+
+    mqtt_->OnConnected([this]() {
+        if (on_connected_ != nullptr) {
+            on_connected_();
+        }
+        esp_timer_stop(reconnect_timer_);
     });
 
     mqtt_->OnMessage([this](const std::string& topic, const std::string& payload) {

main/protocols/mqtt_protocol.h

@@ -9,6 +9,7 @@
 #include <mbedtls/aes.h>
 #include <freertos/FreeRTOS.h>
 #include <freertos/event_groups.h>
+#include <esp_timer.h>
 
 #include <functional>
 #include <string>
@@ -16,7 +17,7 @@
 #include <mutex>
 
 #define MQTT_PING_INTERVAL_SECONDS 90
-#define MQTT_RECONNECT_INTERVAL_MS 10000
+#define MQTT_RECONNECT_INTERVAL_MS 60000
 
 #define MQTT_PROTOCOL_SERVER_HELLO_EVENT (1 << 0)
 
@@ -45,6 +46,7 @@ private:
     int udp_port_;
     uint32_t local_sequence_;
     uint32_t remote_sequence_;
+    esp_timer_handle_t reconnect_timer_;
 
     bool StartMqttClient(bool report_error=false);
     void ParseServerHello(const cJSON* root);

main/protocols/protocol.cc

@@ -24,6 +24,14 @@ void Protocol::OnNetworkError(std::function<void(const std::string& message)> ca
     on_network_error_ = callback;
 }
 
+void Protocol::OnConnected(std::function<void()> callback) {
+    on_connected_ = callback;
+}
+
+void Protocol::OnDisconnected(std::function<void()> callback) {
+    on_disconnected_ = callback;
+}
+
 void Protocol::SetError(const std::string& message) {
     error_occurred_ = true;
     if (on_network_error_ != nullptr) {

main/protocols/protocol.h

@@ -60,6 +60,8 @@ public:
     void OnAudioChannelOpened(std::function<void()> callback);
     void OnAudioChannelClosed(std::function<void()> callback);
     void OnNetworkError(std::function<void(const std::string& message)> callback);
+    void OnConnected(std::function<void()> callback);
+    void OnDisconnected(std::function<void()> callback);
 
     virtual bool Start() = 0;
     virtual bool OpenAudioChannel() = 0;
@@ -78,6 +80,8 @@ protected:
     std::function<void()> on_audio_channel_opened_;
     std::function<void()> on_audio_channel_closed_;
     std::function<void(const std::string& message)> on_network_error_;
+    std::function<void()> on_connected_;
+    std::function<void()> on_disconnected_;
 
     int server_sample_rate_ = 24000;
     int server_frame_duration_ = 60;

main/system_info.cc

@@ -47,6 +47,12 @@ std::string SystemInfo::GetChipModelName() {
     return std::string(CONFIG_IDF_TARGET);
 }
 
+std::string SystemInfo::GetUserAgent() {
+    auto app_desc = esp_app_get_description();
+    auto user_agent = std::string(BOARD_NAME "/") + app_desc->version;
+    return user_agent;
+}
+
 esp_err_t SystemInfo::PrintTaskCpuUsage(TickType_t xTicksToWait) {
     #define ARRAY_SIZE_OFFSET 5
     TaskStatus_t *start_array = NULL, *end_array = NULL;

main/system_info.h

@@ -13,6 +13,7 @@ public:
     static size_t GetFreeHeapSize();
     static std::string GetMacAddress();
     static std::string GetChipModelName();
+    static std::string GetUserAgent();
     static esp_err_t PrintTaskCpuUsage(TickType_t xTicksToWait);
     static void PrintTaskList();
     static void PrintHeapStats();

partitions/v2/16m.csv

@@ -0,0 +1,9 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,    0x4000,
+otadata,  data, ota,     0xd000,    0x2000,
+phy_init, data, phy,     0xf000,    0x1000,
+model,    data, spiffs,  0x10000,   0xF0000,
+ota_0,    app,  ota_0,   0x100000,  4M,
+ota_1,    app,  ota_1,   0x500000,  4M,
+assets,   data, spiffs,  0x900000,  7M

partitions/v2/16m_c3.csv

@@ -0,0 +1,9 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,    0x4000,
+otadata,  data, ota,     0xd000,    0x2000,
+phy_init, data, phy,     0xf000,    0x1000,
+model,    data, spiffs,  0x10000,   0xF0000,
+ota_0,    app,  ota_0,   0x100000,  4M,
+ota_1,    app,  ota_1,   0x500000,  4M,
+assets,   data, spiffs,  0x900000,  4000K

partitions/v2/32m.csv

@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+nvsfactory, data,   nvs,        ,     200K,
+nvs,        data,   nvs,        ,     840K,
+otadata,    data,   ota,        ,     0x2000,
+phy_init,   data,   phy,        ,     0x1000,
+model,      data,   spiffs,     ,     0xF0000,
+ota_0,      app,    ota_0,      0x200000,     4M,
+ota_1,      app,    ota_1,      0x600000,     4M,
+assets,     data,   spiffs,     0xA00000,     16M

partitions/v2/8m.csv

@@ -0,0 +1,9 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,    0x4000,
+otadata,  data, ota,     0xd000,    0x2000,
+phy_init, data, phy,     0xf000,    0x1000,
+model,    data, spiffs,  0x10000,   0xF0000,
+ota_0,    app,  ota_0,   0x100000,  3M,
+ota_1,    app,  ota_1,   0x400000,  3M,
+assets,   data, spiffs,  0x700000,  1M

partitions/v2/README.md

@@ -0,0 +1,107 @@
+# Version 2 Partition Table
+
+This version introduces significant improvements over v1 by adding an `assets` partition to support network-loadable content and optimizing partition layouts for different flash sizes.
+
+## Key Changes from v1
+
+### Major Improvements
+1. **Added Assets Partition**: New `assets` partition for network-loadable content
+2. **Replaced Model Partition**: The old `model` partition (960KB) is replaced with a larger `assets` partition
+3. **Optimized App Partitions**: Reduced application partition sizes to accommodate assets
+4. **Enhanced Flexibility**: Support for dynamic content updates without reflashing
+
+### Assets Partition Features
+The `assets` partition stores:
+- **Wake word models**: Customizable wake word models that can be loaded from the network
+- **Theme files**: Complete theming system including:
+  - Fonts (text and icon fonts)
+  - Audio effects and sound files
+  - Background images and UI elements
+  - Custom emoji packs
+  - Language configuration files
+- **Dynamic Content**: All content can be updated over-the-air via HTTP downloads
+
+## Partition Layout Comparison
+
+### v1 Layout (16MB)
+- `nvs`: 16KB (non-volatile storage)
+- `otadata`: 8KB (OTA data)
+- `phy_init`: 4KB (PHY initialization data)
+- `model`: 960KB (model storage - fixed content)
+- `ota_0`: 6MB (application partition 0)
+- `ota_1`: 6MB (application partition 1)
+
+### v2 Layout (16MB)
+- `nvs`: 16KB (non-volatile storage)
+- `otadata`: 8KB (OTA data)
+- `phy_init`: 4KB (PHY initialization data)
+- `ota_0`: 4MB (application partition 0)
+- `ota_1`: 4MB (application partition 1)
+- `assets`: 8MB (network-loadable assets)
+
+## Available Configurations
+
+### 8MB Flash Devices (`8m.csv`)
+- `nvs`: 16KB
+- `otadata`: 8KB
+- `phy_init`: 4KB
+- `ota_0`: 3MB
+- `ota_1`: 3MB
+- `assets`: 2MB
+
+### 16MB Flash Devices (`16m.csv`) - Standard
+- `nvs`: 16KB
+- `otadata`: 8KB
+- `phy_init`: 4KB
+- `ota_0`: 4MB
+- `ota_1`: 4MB
+- `assets`: 8MB
+
+### 16MB Flash Devices (`16m_c3.csv`) - ESP32-C3 Optimized
+- `nvs`: 16KB
+- `otadata`: 8KB
+- `phy_init`: 4KB
+- `ota_0`: 4MB
+- `ota_1`: 4MB
+- `assets`: 4MB (4000K - limited by available mmap pages)
+
+### 32MB Flash Devices (`32m.csv`)
+- `nvsfactory`: 200KB
+- `nvs`: 840KB
+- `otadata`: 8KB
+- `phy_init`: 4KB
+- `ota_0`: 4MB
+- `ota_1`: 4MB
+- `assets`: 16MB
+
+## Benefits
+
+1. **Dynamic Content Management**: Users can download and update wake word models, themes, and other assets without reflashing the device
+2. **Reduced App Size**: Application partitions are optimized, allowing more space for dynamic content
+3. **Enhanced Customization**: Support for custom themes, wake words, and language packs enhances user experience
+4. **Network Flexibility**: Assets can be updated independently of the main application firmware
+5. **Better Resource Utilization**: Efficient use of flash memory with configurable asset storage
+6. **OTA Asset Updates**: Assets can be updated over-the-air via HTTP downloads
+
+## Technical Details
+
+- **Partition Type**: Assets partition uses `spiffs` subtype for SPIFFS filesystem compatibility
+- **Memory Mapping**: Assets are memory-mapped for efficient access during runtime
+- **Checksum Validation**: Built-in integrity checking ensures asset data validity
+- **Progressive Download**: Assets can be downloaded progressively with progress tracking
+- **Fallback Support**: Graceful fallback to default assets if network updates fail
+
+## Migration from v1
+
+When upgrading from v1 to v2:
+1. **Backup Important Data**: Ensure any important data in the old `model` partition is backed up
+2. **Flash New Partition Table**: Use the appropriate v2 partition table for your flash size
+3. **Download Assets**: The device will automatically download required assets on first boot
+4. **Verify Functionality**: Ensure all features work correctly with the new partition layout
+
+## Usage Notes
+
+- The `assets` partition size varies by configuration to optimize for different flash sizes
+- ESP32-C3 devices use a smaller assets partition (4MB) due to limited available mmap pages in the system
+- 32MB devices get the largest assets partition (16MB) for maximum content storage
+- All partition tables maintain proper alignment for optimal flash performance 

scripts/release.py

@@ -3,107 +3,186 @@ import os
 import json
 import zipfile
 import argparse
+from pathlib import Path
+from typing import Optional
 
-# 切换到项目根目录
-os.chdir(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+# Switch to project root directory
+os.chdir(Path(__file__).resolve().parent.parent)
 
-def get_board_type():
-    with open("build/compile_commands.json") as f:
+################################################################################
+# Common utility functions
+################################################################################
+
+def get_board_type_from_compile_commands() -> Optional[str]:
+    """Parse the current compiled BOARD_TYPE from build/compile_commands.json"""
+    compile_file = Path("build/compile_commands.json")
+    if not compile_file.exists():
+        return None
+    with compile_file.open() as f:
         data = json.load(f)
-        for item in data:
-            if not item["file"].endswith("main.cc"):
-                continue
-            command = item["command"]
-            # extract -DBOARD_TYPE=xxx
-            board_type = command.split("-DBOARD_TYPE=\\\"")[1].split("\\\"")[0].strip()
-            return board_type
+    for item in data:
+        if not item["file"].endswith("main.cc"):
+            continue
+        cmd = item["command"]
+        if "-DBOARD_TYPE=\\\"" in cmd:
+            return cmd.split("-DBOARD_TYPE=\\\"")[1].split("\\\"")[0].strip()
     return None
 
-def get_project_version():
-    with open("CMakeLists.txt") as f:
+
+def get_project_version() -> Optional[str]:
+    """Read set(PROJECT_VER "x.y.z") from root CMakeLists.txt"""
+    with Path("CMakeLists.txt").open() as f:
         for line in f:
             if line.startswith("set(PROJECT_VER"):
-                return line.split("\"")[1].split("\"")[0].strip()
+                return line.split("\"")[1]
     return None
 
-def merge_bin():
+
+def merge_bin() -> None:
     if os.system("idf.py merge-bin") != 0:
-        print("merge bin failed")
+        print("merge-bin failed", file=sys.stderr)
         sys.exit(1)
 
-def zip_bin(board_type, project_version):
-    if not os.path.exists("releases"):
-        os.makedirs("releases")
-    output_path = f"releases/v{project_version}_{board_type}.zip"
-    if os.path.exists(output_path):
-        os.remove(output_path)
-    with zipfile.ZipFile(output_path, 'w', compression=zipfile.ZIP_DEFLATED) as zipf:
+
+def zip_bin(name: str, version: str) -> None:
+    """Zip build/merged-binary.bin to releases/v{version}_{name}.zip"""
+    out_dir = Path("releases")
+    out_dir.mkdir(exist_ok=True)
+    output_path = out_dir / f"v{version}_{name}.zip"
+
+    if output_path.exists():
+        output_path.unlink()
+
+    with zipfile.ZipFile(output_path, "w", compression=zipfile.ZIP_DEFLATED) as zipf:
         zipf.write("build/merged-binary.bin", arcname="merged-binary.bin")
     print(f"zip bin to {output_path} done")
-    
 
-def release_current():
-    merge_bin()
-    board_type = get_board_type()
-    print("board type:", board_type)
-    project_version = get_project_version()
-    print("project version:", project_version)
-    zip_bin(board_type, project_version)
+################################################################################
+# board / variant related functions
+################################################################################
 
-def get_all_board_types():
-    board_configs = {}
-    with open("main/CMakeLists.txt", encoding='utf-8') as f:
-        lines = f.readlines()
-        for i, line in enumerate(lines):
-            # 查找 if(CONFIG_BOARD_TYPE_*) 行
-            if "if(CONFIG_BOARD_TYPE_" in line:
-                config_name = line.strip().split("if(")[1].split(")")[0]
-                # 查找下一行的 set(BOARD_TYPE "xxx") 
-                next_line = lines[i + 1].strip()
+_BOARDS_DIR = Path("main/boards")
+
+
+def _collect_variants(config_filename: str = "config.json") -> list[dict[str, str]]:
+    """Traverse all boards under main/boards, collect variant information.
+
+    Return example:
+        [{"board": "bread-compact-ml307", "name": "bread-compact-ml307"}, ...]
+    """
+    variants: list[dict[str, str]] = []
+    for board_path in _BOARDS_DIR.iterdir():
+        if not board_path.is_dir():
+            continue
+        if board_path.name == "common":
+            continue
+        cfg_path = board_path / config_filename
+        if not cfg_path.exists():
+            print(f"[WARN] {cfg_path} does not exist, skip", file=sys.stderr)
+            continue
+        try:
+            with cfg_path.open() as f:
+                cfg = json.load(f)
+            for build in cfg.get("builds", []):
+                variants.append({"board": board_path.name, "name": build["name"]})
+        except Exception as e:
+            print(f"[ERROR] 解析 {cfg_path} 失败: {e}", file=sys.stderr)
+    return variants
+
+
+def _parse_board_config_map() -> dict[str, str]:
+    """Build the mapping of CONFIG_BOARD_TYPE_xxx and board_type from main/CMakeLists.txt"""
+    cmake_file = Path("main/CMakeLists.txt")
+    mapping: dict[str, str] = {}
+    lines = cmake_file.read_text(encoding="utf-8").splitlines()
+    for idx, line in enumerate(lines):
+        if "if(CONFIG_BOARD_TYPE_" in line:
+            config_name = line.strip().split("if(")[1].split(")")[0]
+            if idx + 1 < len(lines):
+                next_line = lines[idx + 1].strip()
                 if next_line.startswith("set(BOARD_TYPE"):
                     board_type = next_line.split('"')[1]
-                    board_configs[config_name] = board_type
-    return board_configs
+                    mapping[config_name] = board_type
+    return mapping
 
-def release(board_type, board_config, config_filename="config.json"):
-    config_path = f"main/boards/{board_type}/{config_filename}"
-    if not os.path.exists(config_path):
-        print(f"跳过 {board_type} 因为 {config_filename} 不存在")
+
+def _find_board_config(board_type: str) -> Optional[str]:
+    """Find the corresponding CONFIG_BOARD_TYPE_xxx for the given board_type"""
+    for config, b_type in _parse_board_config_map().items():
+        if b_type == board_type:
+            return config
+    return None
+
+################################################################################
+# Check board_type in CMakeLists
+################################################################################
+
+def _board_type_exists(board_type: str) -> bool:
+    cmake_file = Path("main/CMakeLists.txt")
+    pattern = f'set(BOARD_TYPE "{board_type}")'
+    return pattern in cmake_file.read_text(encoding="utf-8")
+
+################################################################################
+# Compile implementation
+################################################################################
+
+def release(board_type: str, config_filename: str = "config.json", *, filter_name: Optional[str] = None) -> None:
+    """Compile and package all/specified variants of the specified board_type
+
+    Args:
+        board_type: directory name under main/boards
+        config_filename: config.json name (default: config.json)
+        filter_name: if specified, only compile the build["name"] that matches
+    """
+    cfg_path = _BOARDS_DIR / board_type / config_filename
+    if not cfg_path.exists():
+        print(f"[WARN] {cfg_path} 不存在，跳过 {board_type}")
         return
 
-    # Print Project Version
     project_version = get_project_version()
-    print(f"Project Version: {project_version}", config_path)
+    print(f"Project Version: {project_version} ({cfg_path})")
+
+    with cfg_path.open() as f:
+        cfg = json.load(f)
+    target = cfg["target"]
+
+    builds = cfg.get("builds", [])
+    if filter_name:
+        builds = [b for b in builds if b["name"] == filter_name]
+        if not builds:
+            print(f"[ERROR] 未在 {board_type} 的 {config_filename} 中找到变体 {filter_name}", file=sys.stderr)
+            sys.exit(1)
 
-    with open(config_path, "r") as f:
-        config = json.load(f)
-    target = config["target"]
-    builds = config["builds"]
-    
     for build in builds:
         name = build["name"]
         if not name.startswith(board_type):
-            raise ValueError(f"name {name} 必须以 {board_type} 开头")
-        output_path = f"releases/v{project_version}_{name}.zip"
-        if os.path.exists(output_path):
-            print(f"跳过 {board_type} 因为 {output_path} 已存在")
+            raise ValueError(f"build.name {name} 必须以 {board_type} 开头")
+
+        output_path = Path("releases") / f"v{project_version}_{name}.zip"
+        if output_path.exists():
+            print(f"跳过 {name} 因为 {output_path} 已存在")
             continue
 
-        sdkconfig_append = [f"{board_config}=y"]
-        for append in build.get("sdkconfig_append", []):
-            sdkconfig_append.append(append)
+        # Process sdkconfig_append
+        board_type_config = _find_board_config(board_type)
+        sdkconfig_append = [f"{board_type_config}=y"]
+        sdkconfig_append.extend(build.get("sdkconfig_append", []))
+
+        print("-" * 80)
         print(f"name: {name}")
         print(f"target: {target}")
-        for append in sdkconfig_append:
-            print(f"sdkconfig_append: {append}")
-        # unset IDF_TARGET
+        for item in sdkconfig_append:
+            print(f"sdkconfig_append: {item}")
+
         os.environ.pop("IDF_TARGET", None)
+
         # Call set-target
         if os.system(f"idf.py set-target {target}") != 0:
-            print("set-target failed")
+            print("set-target failed", file=sys.stderr)
             sys.exit(1)
+
         # Append sdkconfig
-        with open("sdkconfig", "a") as f:
+        with Path("sdkconfig").open("a") as f:
             f.write("\n")
             for append in sdkconfig_append:
                 f.write(f"{append}\n")
@@ -111,43 +190,72 @@ def release(board_type, board_config, config_filename="config.json"):
         if os.system(f"idf.py -DBOARD_NAME={name} build") != 0:
             print("build failed")
             sys.exit(1)
-        # Call merge-bin
-        if os.system("idf.py merge-bin") != 0:
-            print("merge-bin failed")
-            sys.exit(1)
-        # Zip bin
+
+        # merge-bin
+        merge_bin()
+
+        # Zip
         zip_bin(name, project_version)
-        print("-" * 80)
+
+################################################################################
+# CLI entry
+################################################################################
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("board", nargs="?", default=None, help="板子类型或 all")
     parser.add_argument("-c", "--config", default="config.json", help="指定 config 文件名，默认 config.json")
-    parser.add_argument("--list-boards", action="store_true", help="列出所有支持的 board 列表")
+    parser.add_argument("--list-boards", action="store_true", help="列出所有支持的 board 及变体列表")
     parser.add_argument("--json", action="store_true", help="配合 --list-boards，JSON 格式输出")
+    parser.add_argument("--name", help="指定变体名称，仅编译匹配的变体")
+
     args = parser.parse_args()
 
+    # List mode
     if args.list_boards:
-        board_configs = get_all_board_types()
-        boards = list(board_configs.values())
+        variants = _collect_variants(config_filename=args.config)
         if args.json:
-            print(json.dumps(boards))
+            print(json.dumps(variants))
         else:
-            for board in boards:
-                print(board)
+            for v in variants:
+                print(f"{v['board']}: {v['name']}")
         sys.exit(0)
 
-    if args.board:
-        board_configs = get_all_board_types()
-        found = False
-        for board_config, board_type in board_configs.items():
-            if args.board == 'all' or board_type == args.board:
-                release(board_type, board_config, config_filename=args.config)
-                found = True
-        if not found:
-            print(f"未找到板子类型: {args.board}")
-            print("可用的板子类型:")
-            for board_type in board_configs.values():
-                print(f"  {board_type}")
+    # Current directory firmware packaging mode
+    if args.board is None:
+        merge_bin()
+        curr_board_type = get_board_type_from_compile_commands()
+        if curr_board_type is None:
+            print("未能从 compile_commands.json 解析 board_type", file=sys.stderr)
+            sys.exit(1)
+        project_ver = get_project_version()
+        zip_bin(curr_board_type, project_ver)
+        sys.exit(0)
+
+    # Compile mode
+    board_type_input: str = args.board
+    name_filter: str | None = args.name
+
+    # Check board_type in CMakeLists
+    if board_type_input != "all" and not _board_type_exists(board_type_input):
+        print(f"[ERROR] main/CMakeLists.txt 中未找到 board_type {board_type_input}", file=sys.stderr)
+        sys.exit(1)
+
+    variants_all = _collect_variants(config_filename=args.config)
+
+    # Filter board_type list
+    target_board_types: set[str]
+    if board_type_input == "all":
+        target_board_types = {v["board"] for v in variants_all}
     else:
-        release_current()
+        target_board_types = {board_type_input}
+
+    for bt in sorted(target_board_types):
+        if not _board_type_exists(bt):
+            print(f"[ERROR] main/CMakeLists.txt 中未找到 board_type {bt}", file=sys.stderr)
+            sys.exit(1)
+        cfg_path = _BOARDS_DIR / bt / args.config
+        if bt == board_type_input and not cfg_path.exists():
+            print(f"开发板 {bt} 未定义 {args.config} 配置文件，跳过")
+            sys.exit(0)
+        release(bt, config_filename=args.config, filter_name=name_filter if bt == board_type_input else None)

sdkconfig.defaults

@@ -39,6 +39,10 @@ CONFIG_UART_ISR_IN_IRAM=y
 # Fix ESP_SSL error
 CONFIG_MBEDTLS_SSL_RENEGOTIATION=n
 
+# ESP32 Camera
+CONFIG_CAMERA_NO_AFFINITY=y
+CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX=8192
+
 # LVGL 9.2.2
 
 CONFIG_LV_OS_NONE=y
@@ -49,6 +53,7 @@ CONFIG_LV_USE_CLIB_SPRINTF=y
 CONFIG_LV_USE_IMGFONT=y
 CONFIG_LV_USE_ASSERT_STYLE=y
 CONFIG_LV_USE_GIF=y
+CONFIG_LV_USE_LODEPNG=y
 
 # Use compressed font
 CONFIG_LV_FONT_FMT_TXT_LARGE=y

sdkconfig.defaults.esp32s3

@@ -13,7 +13,6 @@ CONFIG_SPIRAM_MEMTEST=n
 CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
 
 CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB=y
-CONFIG_ESP32S3_DATA_CACHE_64KB=y
 CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y
 
 CONFIG_SR_WN_WN9_NIHAOXIAOZHI_TTS=y