Update esp-wifi-connect version and adjust partition sizes in 4m.csv

Update dependencies in idf_component.yml to latest versions: esp-ml307 to ~3.6.5, uart-eth-modem to ~0.3.4, esp32-camera to ^2.1.5, lvgl to ~9.5.0, esp_lvgl_port to ~2.7.2, esp_mmap_assets to ^1.3.2, and adc_battery_estimation to ^0.2.1.
fix(eda-robot-pro): Optimize gait algorithm (#1871 )
2026-07-03 02:04:42 +08:00 · 2026-03-22 12:00:40 +08:00 · 2026-03-22 12:00:40 +08:00 · 2026-03-22 07:03:10 +08:00 · 2026-03-22 06:23:58 +08:00 · 2026-03-20 19:00:43 +08:00
1314 changed files with 56964 additions and 15665 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -0,0 +1,126 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: ExceptShortType
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterClass: false
+  AfterControlStatement: false
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit: 100
+CommentPragmas: '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat: false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - cJSON_ArrayForEach
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex: '^<esp_.*\.h>'
+    Priority: 1
+  - Regex: '^<driver/.*\.h>'
+    Priority: 1
+  - Regex: '^<.*\.h>'
+    Priority: 2
+  - Regex: '^<.*'
+    Priority: 3
+  - Regex: '.*'
+    Priority: 4
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+RawStringFormats:
+  - Language: Cpp
+    Delimiters:
+      - cc
+      - CC
+      - cpp
+      - Cpp
+      - CPP
+      - 'c++'
+      - 'C++'
+    CanonicalDelimiter: ''
+    BasedOnStyle: google
+ReflowComments: true
+SortIncludes: true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Latest
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth: 4
+UseTab: Never
--- a/.clangd
+++ b/.clangd
@@ -1,2 +0,0 @@
-CompileFlags:
-    Remove: [-f*, -m*]
--- a/.github/workflows/build.yml
+++ b/.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,40 +71,41 @@ 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.full_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
+      image: espressif/idf:v5.5.2
    steps:
      - 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.full_name }}_${{ github.sha }}
          path: build/merged-binary.bin
-          if-no-files-found: error
+          if-no-files-found: error
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ tmp/
 components/
 managed_components/
 build/
+dist/
 .vscode/
 .devcontainer/
 sdkconfig.old
@@ -13,7 +14,7 @@ main/assets/lang_config.h
 main/mmap_generate_emoji.h
 .DS_Store
 .cache
-main/mmap_generate_emoji.h
 *.pyc
 *.bin
 mmap_generate_*.h
+.clangd
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,13 @@
-# For more information about build system see
-# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
-# The following five lines of boilerplate have to be in your project's
+# The following lines of boilerplate have to be in your project's
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(PROJECT_VER "1.8.5")
-
 # Add this line to disable the specific warning
 add_compile_options(-Wno-missing-field-initializers)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(xiaozhi)
+# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
+idf_build_set_property(MINIMAL_BUILD ON)

+set(PROJECT_VER "2.2.4")
+project(xiaozhi)
--- a/README.md
+++ b/README.md
@@ -1,74 +1,73 @@
-# An MCP-based Chatbot | 一个基于 MCP 的聊天机器人
+# An MCP-based Chatbot

-（中文 | [English](README_en.md) | [日本語](README_ja.md)）
+(English | [中文](README_zh.md) | [日本語](README_ja.md))

-## 视频
+## Introduction

-👉 [人类：给 AI 装摄像头 vs AI：当场发现主人三天没洗头【bilibili】](https://www.bilibili.com/video/BV1bpjgzKEhd/)
+👉 [Human: Give AI a camera vs AI: Instantly finds out the owner hasn't washed hair for three days【bilibili】](https://www.bilibili.com/video/BV1bpjgzKEhd/)

-👉 [手工打造你的 AI 女友，新手入门教程【bilibili】](https://www.bilibili.com/video/BV1XnmFYLEJN/)
+👉 [Handcraft your AI girlfriend, beginner's guide【bilibili】](https://www.bilibili.com/video/BV1XnmFYLEJN/)

-## 介绍
+As a voice interaction entry, the XiaoZhi AI chatbot leverages the AI capabilities of large models like Qwen / DeepSeek, and achieves multi-terminal control via the MCP protocol.

-这是一个由虾哥开源的 ESP32 项目，以 MIT 许可证发布，允许任何人免费使用，或用于商业用途。
+<img src="docs/mcp-based-graph.jpg" alt="Control everything via MCP" width="320">

-我们希望通过这个项目，能够帮助大家了解 AI 硬件开发，将当下飞速发展的大语言模型应用到实际的硬件设备中。
+## Version Notes

-如果你有任何想法或建议，请随时提出 Issues 或加入 QQ 群：1011329060
+The current v2 version is incompatible with the v1 partition table, so it is not possible to upgrade from v1 to v2 via OTA. For partition table details, see [partitions/v2/README.md](partitions/v2/README.md).

-### 基于 MCP 控制万物
+All hardware running v1 can be upgraded to v2 by manually flashing the firmware.

-小智 AI 聊天机器人作为一个语音交互入口，利用 Qwen / DeepSeek 等大模型的 AI 能力，通过 MCP 协议实现多端控制。
+The stable version of v1 is 1.9.2. You can switch to v1 by running `git checkout v1`. The v1 branch will be maintained until February 2026.

-![通过MCP控制万物](docs/mcp-based-graph.jpg)
-
-### 已实现功能
+### Features Implemented

 - Wi-Fi / ML307 Cat.1 4G
- 离线语音唤醒 [ESP-SR](https://github.com/espressif/esp-sr)
- 支持两种通信协议（[Websocket](docs/websocket.md) 或 MQTT+UDP）
- 采用 OPUS 音频编解码
- 基于流式 ASR + LLM + TTS 架构的语音交互
- 声纹识别，识别当前说话人的身份 [3D Speaker](https://github.com/modelscope/3D-Speaker)
- OLED / LCD 显示屏，支持表情显示
- 电量显示与电源管理
- 支持多语言（中文、英文、日文）
- 支持 ESP32-C3、ESP32-S3、ESP32-P4 芯片平台
- 通过设备端 MCP 实现设备控制（音量、灯光、电机、GPIO 等）
- 通过云端 MCP 扩展大模型能力（智能家居控制、PC桌面操作、知识搜索、邮件收发等）
+- Offline voice wake-up [ESP-SR](https://github.com/espressif/esp-sr)
+- Supports two communication protocols ([Websocket](docs/websocket.md) or MQTT+UDP)
+- Uses OPUS audio codec
+- Voice interaction based on streaming ASR + LLM + TTS architecture
+- Speaker recognition, identifies the current speaker [3D Speaker](https://github.com/modelscope/3D-Speaker)
+- OLED / LCD display, supports emoji display
+- Battery display and power management
+- Multi-language support (Chinese, English, Japanese)
+- Supports ESP32-C3, ESP32-S3, ESP32-P4 chip platforms
+- Device-side MCP for device control (Speaker, LED, Servo, GPIO, etc.)
+- Cloud-side MCP to extend large model capabilities (smart home control, PC desktop operation, knowledge search, email, etc.)
+- Customizable wake words, fonts, emojis, and chat backgrounds with online web-based editing ([Custom Assets Generator](https://github.com/78/xiaozhi-assets-generator))

-## 硬件
+## Hardware

-### 面包板手工制作实践
+### Breadboard DIY Practice

-详见飞书文档教程：
+See the Feishu document tutorial:

-👉 [《小智 AI 聊天机器人百科全书》](https://ccnphfhqs21z.feishu.cn/wiki/F5krwD16viZoF0kKkvDcrZNYnhb?from=from_copylink)
+👉 ["XiaoZhi AI Chatbot Encyclopedia"](https://ccnphfhqs21z.feishu.cn/wiki/F5krwD16viZoF0kKkvDcrZNYnhb?from=from_copylink)

-面包板效果图如下：
+Breadboard demo:

-![面包板效果图](docs/v1/wiring2.jpg)
+![Breadboard Demo](docs/v1/wiring2.jpg)

-### 支持 70 多个开源硬件（仅展示部分）
+### Supports 70+ Open Source Hardware (Partial List)

- <a href="https://oshwhub.com/li-chuang-kai-fa-ban/li-chuang-shi-zhan-pai-esp32-s3-kai-fa-ban" target="_blank" title="立创·实战派 ESP32-S3 开发板">立创·实战派 ESP32-S3 开发板</a>
- <a href="https://github.com/espressif/esp-box" target="_blank" title="乐鑫 ESP32-S3-BOX3">乐鑫 ESP32-S3-BOX3</a>
+- <a href="https://oshwhub.com/li-chuang-kai-fa-ban/li-chuang-shi-zhan-pai-esp32-s3-kai-fa-ban" target="_blank" title="LiChuang ESP32-S3 Development Board">LiChuang ESP32-S3 Development Board</a>
+- <a href="https://github.com/espressif/esp-box" target="_blank" title="Espressif ESP32-S3-BOX3">Espressif ESP32-S3-BOX3</a>
 - <a href="https://docs.m5stack.com/zh_CN/core/CoreS3" target="_blank" title="M5Stack CoreS3">M5Stack CoreS3</a>
 - <a href="https://docs.m5stack.com/en/atom/Atomic%20Echo%20Base" target="_blank" title="AtomS3R + Echo Base">M5Stack AtomS3R + Echo Base</a>
- <a href="https://gf.bilibili.com/item/detail/1108782064" target="_blank" title="神奇按钮 2.4">神奇按钮 2.4</a>
- <a href="https://www.waveshare.net/shop/ESP32-S3-Touch-AMOLED-1.8.htm" target="_blank" title="微雪电子 ESP32-S3-Touch-AMOLED-1.8">微雪电子 ESP32-S3-Touch-AMOLED-1.8</a>
+- <a href="https://gf.bilibili.com/item/detail/1108782064" target="_blank" title="Magic Button 2.4">Magic Button 2.4</a>
+- <a href="https://www.waveshare.net/shop/ESP32-S3-Touch-AMOLED-1.8.htm" target="_blank" title="Waveshare ESP32-S3-Touch-AMOLED-1.8">Waveshare ESP32-S3-Touch-AMOLED-1.8</a>
 - <a href="https://github.com/Xinyuan-LilyGO/T-Circle-S3" target="_blank" title="LILYGO T-Circle-S3">LILYGO T-Circle-S3</a>
- <a href="https://oshwhub.com/tenclass01/xmini_c3" target="_blank" title="虾哥 Mini C3">虾哥 Mini C3</a>
- <a href="https://oshwhub.com/movecall/cuican-ai-pendant-lights-up-y" target="_blank" title="Movecall CuiCan ESP32S3">璀璨·AI 吊坠</a>
- <a href="https://github.com/WMnologo/xingzhi-ai" target="_blank" title="无名科技Nologo-星智-1.54">无名科技 Nologo-星智-1.54TFT</a>
+- <a href="https://oshwhub.com/tenclass01/xmini_c3" target="_blank" title="XiaGe Mini C3">XiaGe Mini C3</a>
+- <a href="https://oshwhub.com/movecall/cuican-ai-pendant-lights-up-y" target="_blank" title="Movecall CuiCan ESP32S3">CuiCan AI Pendant</a>
+- <a href="https://github.com/WMnologo/xingzhi-ai" target="_blank" title="WMnologo-Xingzhi-1.54">WMnologo-Xingzhi-1.54TFT</a>
 - <a href="https://www.seeedstudio.com/SenseCAP-Watcher-W1-A-p-5979.html" target="_blank" title="SenseCAP Watcher">SenseCAP Watcher</a>
- <a href="https://www.bilibili.com/video/BV1BHJtz6E2S/" target="_blank" title="ESP-HI 超低成本机器狗">ESP-HI 超低成本机器狗</a>
+- <a href="https://www.bilibili.com/video/BV1BHJtz6E2S/" target="_blank" title="ESP-HI Low Cost Robot Dog">ESP-HI Low Cost Robot Dog</a>

 <div style="display: flex; justify-content: space-between;">
-  <a href="docs/v1/lichuang-s3.jpg" target="_blank" title="立创·实战派 ESP32-S3 开发板">
+  <a href="docs/v1/lichuang-s3.jpg" target="_blank" title="LiChuang ESP32-S3 Development Board">
    <img src="docs/v1/lichuang-s3.jpg" width="240" />
  </a>
-  <a href="docs/v1/espbox3.jpg" target="_blank" title="乐鑫 ESP32-S3-BOX3">
+  <a href="docs/v1/espbox3.jpg" target="_blank" title="Espressif ESP32-S3-BOX3">
    <img src="docs/v1/espbox3.jpg" width="240" />
  </a>
  <a href="docs/v1/m5cores3.jpg" target="_blank" title="M5Stack CoreS3">
@@ -77,78 +76,91 @@
  <a href="docs/v1/atoms3r.jpg" target="_blank" title="AtomS3R + Echo Base">
    <img src="docs/v1/atoms3r.jpg" width="240" />
  </a>
-  <a href="docs/v1/magiclick.jpg" target="_blank" title="神奇按钮 2.4">
+  <a href="docs/v1/magiclick.jpg" target="_blank" title="Magic Button 2.4">
    <img src="docs/v1/magiclick.jpg" width="240" />
  </a>
-  <a href="docs/v1/waveshare.jpg" target="_blank" title="微雪电子 ESP32-S3-Touch-AMOLED-1.8">
+  <a href="docs/v1/waveshare.jpg" target="_blank" title="Waveshare ESP32-S3-Touch-AMOLED-1.8">
    <img src="docs/v1/waveshare.jpg" width="240" />
  </a>
  <a href="docs/v1/lilygo-t-circle-s3.jpg" target="_blank" title="LILYGO T-Circle-S3">
    <img src="docs/v1/lilygo-t-circle-s3.jpg" width="240" />
  </a>
-  <a href="docs/v1/xmini-c3.jpg" target="_blank" title="虾哥 Mini C3">
+  <a href="docs/v1/xmini-c3.jpg" target="_blank" title="XiaGe Mini C3">
    <img src="docs/v1/xmini-c3.jpg" width="240" />
  </a>
  <a href="docs/v1/movecall-cuican-esp32s3.jpg" target="_blank" title="CuiCan">
    <img src="docs/v1/movecall-cuican-esp32s3.jpg" width="240" />
  </a>
-  <a href="docs/v1/wmnologo_xingzhi_1.54.jpg" target="_blank" title="无名科技Nologo-星智-1.54">
+  <a href="docs/v1/wmnologo_xingzhi_1.54.jpg" target="_blank" title="WMnologo-Xingzhi-1.54">
    <img src="docs/v1/wmnologo_xingzhi_1.54.jpg" width="240" />
  </a>
  <a href="docs/v1/sensecap_watcher.jpg" target="_blank" title="SenseCAP Watcher">
    <img src="docs/v1/sensecap_watcher.jpg" width="240" />
  </a>
-  <a href="docs/v1/esp-hi.jpg" target="_blank" title="ESP-HI 超低成本机器狗">
+  <a href="docs/v1/esp-hi.jpg" target="_blank" title="ESP-HI Low Cost Robot Dog">
    <img src="docs/v1/esp-hi.jpg" width="240" />
  </a>
 </div>

-## 软件
+## Software

-### 固件烧录
+### Firmware Flashing

-新手第一次操作建议先不要搭建开发环境，直接使用免开发环境烧录的固件。
+For beginners, it is recommended to use the firmware that can be flashed without setting up a development environment.

-固件默认接入 [xiaozhi.me](https://xiaozhi.me) 官方服务器，个人用户注册账号可以免费使用 Qwen 实时模型。
+The firmware connects to the official [xiaozhi.me](https://xiaozhi.me) server by default. Personal users can register an account to use the Qwen real-time model for free.

-👉 [新手烧录固件教程](https://ccnphfhqs21z.feishu.cn/wiki/Zpz4wXBtdimBrLk25WdcXzxcnNS)
+👉 [Beginner's Firmware Flashing Guide](https://ccnphfhqs21z.feishu.cn/wiki/Zpz4wXBtdimBrLk25WdcXzxcnNS)

-### 开发环境
+### Development Environment

- Cursor 或 VSCode
- 安装 ESP-IDF 插件，选择 SDK 版本 5.4 或以上
- Linux 比 Windows 更好，编译速度快，也免去驱动问题的困扰
- 本项目使用 Google C++ 代码风格，提交代码时请确保符合规范
+- Cursor or VSCode
+- Install ESP-IDF plugin, select SDK version 5.4 or above
+- Linux is better than Windows for faster compilation and fewer driver issues
+- This project uses Google C++ code style, please ensure compliance when submitting code

-### 开发者文档
+### Developer Documentation

- [自定义开发板指南](main/boards/README.md) - 学习如何为小智 AI 创建自定义开发板
- [MCP 协议物联网控制用法说明](docs/mcp-usage.md) - 了解如何通过 MCP 协议控制物联网设备
- [MCP 协议交互流程](docs/mcp-protocol.md) - 设备端 MCP 协议的实现方式
- [MQTT + UDP 混合通信协议文档](docs/mqtt-udp.md)
- [一份详细的 WebSocket 通信协议文档](docs/websocket.md)
+- [Custom Board Guide](docs/custom-board.md) - Learn how to create custom boards for XiaoZhi AI
+- [MCP Protocol IoT Control Usage](docs/mcp-usage.md) - Learn how to control IoT devices via MCP protocol
+- [MCP Protocol Interaction Flow](docs/mcp-protocol.md) - Device-side MCP protocol implementation
+- [MQTT + UDP Hybrid Communication Protocol Document](docs/mqtt-udp.md)
+- [A detailed WebSocket communication protocol document](docs/websocket.md)

-## 大模型配置
+## Large Model Configuration

-如果你已经拥有一个的小智 AI 聊天机器人设备，并且已接入官方服务器，可以登录 [xiaozhi.me](https://xiaozhi.me) 控制台进行配置。
+If you already have a XiaoZhi AI chatbot device and have connected to the official server, you can log in to the [xiaozhi.me](https://xiaozhi.me) console for configuration.

-👉 [后台操作视频教程（旧版界面）](https://www.bilibili.com/video/BV1jUCUY2EKM/)
+👉 [Backend Operation Video Tutorial (Old Interface)](https://www.bilibili.com/video/BV1jUCUY2EKM/)

-## 相关开源项目
+## Related Open Source Projects

-在个人电脑上部署服务器，可以参考以下第三方开源的项目：
+For server deployment on personal computers, refer to the following open-source projects:

- [xinnan-tech/xiaozhi-esp32-server](https://github.com/xinnan-tech/xiaozhi-esp32-server) Python 服务器
- [joey-zhou/xiaozhi-esp32-server-java](https://github.com/joey-zhou/xiaozhi-esp32-server-java) Java 服务器
- [AnimeAIChat/xiaozhi-server-go](https://github.com/AnimeAIChat/xiaozhi-server-go) Golang 服务器
+- [xinnan-tech/xiaozhi-esp32-server](https://github.com/xinnan-tech/xiaozhi-esp32-server) Python server
+- [joey-zhou/xiaozhi-esp32-server-java](https://github.com/joey-zhou/xiaozhi-esp32-server-java) Java server
+- [AnimeAIChat/xiaozhi-server-go](https://github.com/AnimeAIChat/xiaozhi-server-go) Golang server
+- [hackers365/xiaozhi-esp32-server-golang](https://github.com/hackers365/xiaozhi-esp32-server-golang) Golang server

-使用小智通信协议的第三方客户端项目：
+Other client projects using the XiaoZhi communication protocol:

- [huangjunsen0406/py-xiaozhi](https://github.com/huangjunsen0406/py-xiaozhi) Python 客户端
- [TOM88812/xiaozhi-android-client](https://github.com/TOM88812/xiaozhi-android-client) Android 客户端
- [100askTeam/xiaozhi-linux](http://github.com/100askTeam/xiaozhi-linux) 百问科技提供的 Linux 客户端
- [78/xiaozhi-sf32](https://github.com/78/xiaozhi-sf32) 思澈科技的蓝牙芯片固件
- [QuecPython/solution-xiaozhiAI](https://github.com/QuecPython/solution-xiaozhiAI) 移远提供的 QuecPython 固件
+- [huangjunsen0406/py-xiaozhi](https://github.com/huangjunsen0406/py-xiaozhi) Python client
+- [TOM88812/xiaozhi-android-client](https://github.com/TOM88812/xiaozhi-android-client) Android client
+- [100askTeam/xiaozhi-linux](http://github.com/100askTeam/xiaozhi-linux) Linux client by 100ask
+- [78/xiaozhi-sf32](https://github.com/78/xiaozhi-sf32) Bluetooth chip firmware by Sichuan
+- [QuecPython/solution-xiaozhiAI](https://github.com/QuecPython/solution-xiaozhiAI) QuecPython firmware by Quectel
+
+Custom Assets Tools:
+
+- [78/xiaozhi-assets-generator](https://github.com/78/xiaozhi-assets-generator) Custom Assets Generator (Wake words, fonts, emojis, backgrounds)
+
+## About the Project
+
+This is an open-source ESP32 project, released under the MIT license, allowing anyone to use it for free, including for commercial purposes.
+
+We hope this project helps everyone understand AI hardware development and apply rapidly evolving large language models to real hardware devices.
+
+If you have any ideas or suggestions, please feel free to raise Issues or join our [Discord](https://discord.gg/C759fGMBcZ) or QQ group: 994694848

 ## Star History

@@ -158,4 +170,4 @@
   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=78/xiaozhi-esp32&type=Date" />
   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=78/xiaozhi-esp32&type=Date" />
 </picture>
-</a>
+</a>
--- a/README_en.md
+++ b/README_en.md
@@ -1,157 +0,0 @@
-# An MCP-based Chatbot
-
-(English | [中文](README.md) | [日本語](README_ja.md))
-
-## Video
-
-👉 [Human: Give AI a camera vs AI: Instantly finds out the owner hasn't washed hair for three days【bilibili】](https://www.bilibili.com/video/BV1bpjgzKEhd/)
-
-👉 [Handcraft your AI girlfriend, beginner's guide【bilibili】](https://www.bilibili.com/video/BV1XnmFYLEJN/)
-
-## Introduction
-
-This is an open-source ESP32 project, released under the MIT license, allowing anyone to use it for free, including for commercial purposes.
-
-We hope this project helps everyone understand AI hardware development and apply rapidly evolving large language models to real hardware devices.
-
-If you have any ideas or suggestions, please feel free to raise Issues or join the QQ group: 1011329060
-
-### Control Everything with MCP
-
-As a voice interaction entry, the XiaoZhi AI chatbot leverages the AI capabilities of large models like Qwen / DeepSeek, and achieves multi-terminal control via the MCP protocol.
-
-![Control everything via MCP](docs/mcp-based-graph.jpg)
-
-### Features Implemented
-
- Wi-Fi / ML307 Cat.1 4G
- Offline voice wake-up [ESP-SR](https://github.com/espressif/esp-sr)
- Supports two communication protocols ([Websocket](docs/websocket.md) or MQTT+UDP)
- Uses OPUS audio codec
- Voice interaction based on streaming ASR + LLM + TTS architecture
- Speaker recognition, identifies the current speaker [3D Speaker](https://github.com/modelscope/3D-Speaker)
- OLED / LCD display, supports emoji display
- Battery display and power management
- Multi-language support (Chinese, English, Japanese)
- Supports ESP32-C3, ESP32-S3, ESP32-P4 chip platforms
- Device-side MCP for device control (Speaker, LED, Servo, GPIO, etc.)
- Cloud-side MCP to extend large model capabilities (smart home control, PC desktop operation, knowledge search, email, etc.)
-
-## Hardware
-
-### Breadboard DIY Practice
-
-See the Feishu document tutorial:
-
-👉 ["XiaoZhi AI Chatbot Encyclopedia"](https://ccnphfhqs21z.feishu.cn/wiki/F5krwD16viZoF0kKkvDcrZNYnhb?from=from_copylink)
-
-Breadboard demo:
-
-![Breadboard Demo](docs/v1/wiring2.jpg)
-
-### Supports 70+ Open Source Hardware (Partial List)
-
- <a href="https://oshwhub.com/li-chuang-kai-fa-ban/li-chuang-shi-zhan-pai-esp32-s3-kai-fa-ban" target="_blank" title="LiChuang ESP32-S3 Development Board">LiChuang ESP32-S3 Development Board</a>
- <a href="https://github.com/espressif/esp-box" target="_blank" title="Espressif ESP32-S3-BOX3">Espressif ESP32-S3-BOX3</a>
- <a href="https://docs.m5stack.com/zh_CN/core/CoreS3" target="_blank" title="M5Stack CoreS3">M5Stack CoreS3</a>
- <a href="https://docs.m5stack.com/en/atom/Atomic%20Echo%20Base" target="_blank" title="AtomS3R + Echo Base">M5Stack AtomS3R + Echo Base</a>
- <a href="https://gf.bilibili.com/item/detail/1108782064" target="_blank" title="Magic Button 2.4">Magic Button 2.4</a>
- <a href="https://www.waveshare.net/shop/ESP32-S3-Touch-AMOLED-1.8.htm" target="_blank" title="Waveshare ESP32-S3-Touch-AMOLED-1.8">Waveshare ESP32-S3-Touch-AMOLED-1.8</a>
- <a href="https://github.com/Xinyuan-LilyGO/T-Circle-S3" target="_blank" title="LILYGO T-Circle-S3">LILYGO T-Circle-S3</a>
- <a href="https://oshwhub.com/tenclass01/xmini_c3" target="_blank" title="XiaGe Mini C3">XiaGe Mini C3</a>
- <a href="https://oshwhub.com/movecall/cuican-ai-pendant-lights-up-y" target="_blank" title="Movecall CuiCan ESP32S3">CuiCan AI Pendant</a>
- <a href="https://github.com/WMnologo/xingzhi-ai" target="_blank" title="WMnologo-Xingzhi-1.54">WMnologo-Xingzhi-1.54TFT</a>
- <a href="https://www.seeedstudio.com/SenseCAP-Watcher-W1-A-p-5979.html" target="_blank" title="SenseCAP Watcher">SenseCAP Watcher</a>
- <a href="https://www.bilibili.com/video/BV1BHJtz6E2S/" target="_blank" title="ESP-HI Low Cost Robot Dog">ESP-HI Low Cost Robot Dog</a>
-
-<div style="display: flex; justify-content: space-between;">
-  <a href="docs/v1/lichuang-s3.jpg" target="_blank" title="LiChuang ESP32-S3 Development Board">
-    <img src="docs/v1/lichuang-s3.jpg" width="240" />
-  </a>
-  <a href="docs/v1/espbox3.jpg" target="_blank" title="Espressif ESP32-S3-BOX3">
-    <img src="docs/v1/espbox3.jpg" width="240" />
-  </a>
-  <a href="docs/v1/m5cores3.jpg" target="_blank" title="M5Stack CoreS3">
-    <img src="docs/v1/m5cores3.jpg" width="240" />
-  </a>
-  <a href="docs/v1/atoms3r.jpg" target="_blank" title="AtomS3R + Echo Base">
-    <img src="docs/v1/atoms3r.jpg" width="240" />
-  </a>
-  <a href="docs/v1/magiclick.jpg" target="_blank" title="Magic Button 2.4">
-    <img src="docs/v1/magiclick.jpg" width="240" />
-  </a>
-  <a href="docs/v1/waveshare.jpg" target="_blank" title="Waveshare ESP32-S3-Touch-AMOLED-1.8">
-    <img src="docs/v1/waveshare.jpg" width="240" />
-  </a>
-  <a href="docs/v1/lilygo-t-circle-s3.jpg" target="_blank" title="LILYGO T-Circle-S3">
-    <img src="docs/v1/lilygo-t-circle-s3.jpg" width="240" />
-  </a>
-  <a href="docs/v1/xmini-c3.jpg" target="_blank" title="XiaGe Mini C3">
-    <img src="docs/v1/xmini-c3.jpg" width="240" />
-  </a>
-  <a href="docs/v1/movecall-cuican-esp32s3.jpg" target="_blank" title="CuiCan">
-    <img src="docs/v1/movecall-cuican-esp32s3.jpg" width="240" />
-  </a>
-  <a href="docs/v1/wmnologo_xingzhi_1.54.jpg" target="_blank" title="WMnologo-Xingzhi-1.54">
-    <img src="docs/v1/wmnologo_xingzhi_1.54.jpg" width="240" />
-  </a>
-  <a href="docs/v1/sensecap_watcher.jpg" target="_blank" title="SenseCAP Watcher">
-    <img src="docs/v1/sensecap_watcher.jpg" width="240" />
-  </a>
-  <a href="docs/v1/esp-hi.jpg" target="_blank" title="ESP-HI Low Cost Robot Dog">
-    <img src="docs/v1/esp-hi.jpg" width="240" />
-  </a>
-</div>
-
-## Software
-
-### Firmware Flashing
-
-For beginners, it is recommended to use the firmware that can be flashed without setting up a development environment.
-
-The firmware connects to the official [xiaozhi.me](https://xiaozhi.me) server by default. Personal users can register an account to use the Qwen real-time model for free.
-
-👉 [Beginner's Firmware Flashing Guide](https://ccnphfhqs21z.feishu.cn/wiki/Zpz4wXBtdimBrLk25WdcXzxcnNS)
-
-### Development Environment
-
- Cursor or VSCode
- Install ESP-IDF plugin, select SDK version 5.4 or above
- Linux is better than Windows for faster compilation and fewer driver issues
- This project uses Google C++ code style, please ensure compliance when submitting code
-
-### Developer Documentation
-
- [Custom Board Guide](main/boards/README.md) - Learn how to create custom boards for XiaoZhi AI
- [MCP Protocol IoT Control Usage](docs/mcp-usage.md) - Learn how to control IoT devices via MCP protocol
- [MCP Protocol Interaction Flow](docs/mcp-protocol.md) - Device-side MCP protocol implementation
- [A detailed WebSocket communication protocol document](docs/websocket.md)
-
-## Large Model Configuration
-
-If you already have a XiaoZhi AI chatbot device and have connected to the official server, you can log in to the [xiaozhi.me](https://xiaozhi.me) console for configuration.
-
-👉 [Backend Operation Video Tutorial (Old Interface)](https://www.bilibili.com/video/BV1jUCUY2EKM/)
-
-## Related Open Source Projects
-
-For server deployment on personal computers, refer to the following open-source projects:
-
- [xinnan-tech/xiaozhi-esp32-server](https://github.com/xinnan-tech/xiaozhi-esp32-server) Python server
- [joey-zhou/xiaozhi-esp32-server-java](https://github.com/joey-zhou/xiaozhi-esp32-server-java) Java server
- [AnimeAIChat/xiaozhi-server-go](https://github.com/AnimeAIChat/xiaozhi-server-go) Golang server
-
-Other client projects using the XiaoZhi communication protocol:
-
- [huangjunsen0406/py-xiaozhi](https://github.com/huangjunsen0406/py-xiaozhi) Python client
- [TOM88812/xiaozhi-android-client](https://github.com/TOM88812/xiaozhi-android-client) Android client
-
-## Star History
-
-<a href="https://star-history.com/#78/xiaozhi-esp32&Date">
- <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=78/xiaozhi-esp32&type=Date&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=78/xiaozhi-esp32&type=Date" />
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=78/xiaozhi-esp32&type=Date" />
- </picture>
-</a> 
--- a/README_ja.md
+++ b/README_ja.md
@@ -1,26 +1,24 @@
 # MCP ベースのチャットボット

-（日本語 | [中文](README.md) | [English](README_en.md)）
+（日本語 | [中文](README_zh.md) | [English](README.md)）

-## 動画
+## はじめに

 👉 [人間：AIにカメラを装着 vs AI：その場で飼い主が3日間髪を洗っていないことを発見【bilibili】](https://www.bilibili.com/video/BV1bpjgzKEhd/)

 👉 [手作りでAIガールフレンドを作る、初心者入門チュートリアル【bilibili】](https://www.bilibili.com/video/BV1XnmFYLEJN/)

-## イントロダクション
-
-これはエビ兄さんがオープンソースで公開しているESP32プロジェクトで、MITライセンスのもと、誰でも無料で、商用利用も可能です。
-
-このプロジェクトを通じて、AIハードウェア開発を理解し、急速に進化する大規模言語モデルを実際のハードウェアデバイスに応用できるようになることを目指しています。
-
-ご意見やご提案があれば、いつでもIssueを提出するか、QQグループ：1011329060 にご参加ください。
-
-### MCPであらゆるものを制御
-
 シャオジーAIチャットボットは音声インタラクションの入口として、Qwen / DeepSeekなどの大規模モデルのAI能力を活用し、MCPプロトコルを通じてマルチエンド制御を実現します。

-![MCPであらゆるものを制御](docs/mcp-based-graph.jpg)
+<img src="docs/mcp-based-graph.jpg" alt="MCPであらゆるものを制御" width="320">
+
+## バージョンノート
+
+現在のv2バージョンはv1パーティションテーブルと互換性がないため、v1からv2へOTAでアップグレードすることはできません。パーティションテーブルの詳細については、[partitions/v2/README.md](partitions/v2/README.md)をご参照ください。
+
+v1を実行しているすべてのハードウェアは、ファームウェアを手動で書き込むことでv2にアップグレードできます。
+
+v1の安定版は1.9.2です。`git checkout v1`でv1に切り替えることができます。v1ブランチは2026年2月まで継続的にメンテナンスされます。

 ### 実装済み機能

@@ -36,6 +34,7 @@
 - ESP32-C3、ESP32-S3、ESP32-P4チッププラットフォーム対応
 - デバイス側MCPによるデバイス制御（音量・明るさ調整、アクション制御など）
 - クラウド側MCPで大規模モデル能力を拡張（スマートホーム制御、PCデスクトップ操作、知識検索、メール送受信など）
+- カスタマイズ可能なウェイクワード、フォント、絵文字、チャット背景、オンラインWeb編集に対応 ([カスタムアセットジェネレーター](https://github.com/78/xiaozhi-assets-generator))

 ## ハードウェア

@@ -122,9 +121,10 @@ Feishuドキュメントチュートリアルをご覧ください：

 ### 開発者ドキュメント

- [カスタム開発ボードガイド](main/boards/README.md) - シャオジーAI用のカスタム開発ボード作成方法
+- [カスタム開発ボードガイド](docs/custom-board.md) - シャオジーAI用のカスタム開発ボード作成方法
 - [MCPプロトコルIoT制御使用法](docs/mcp-usage.md) - MCPプロトコルでIoTデバイスを制御する方法
 - [MCPプロトコルインタラクションフロー](docs/mcp-protocol.md) - デバイス側MCPプロトコルの実装方法
+- [MQTT + UDP ハイブリッド通信プロトコルドキュメント](docs/mqtt-udp.md)
 - [詳細なWebSocket通信プロトコルドキュメント](docs/websocket.md)

 ## 大規模モデル設定
@@ -140,11 +140,23 @@ Feishuドキュメントチュートリアルをご覧ください：
 - [xinnan-tech/xiaozhi-esp32-server](https://github.com/xinnan-tech/xiaozhi-esp32-server) Pythonサーバー
 - [joey-zhou/xiaozhi-esp32-server-java](https://github.com/joey-zhou/xiaozhi-esp32-server-java) Javaサーバー
 - [AnimeAIChat/xiaozhi-server-go](https://github.com/AnimeAIChat/xiaozhi-server-go) Golangサーバー
+- [hackers365/xiaozhi-esp32-server-golang](https://github.com/hackers365/xiaozhi-esp32-server-golang) Golangサーバー

 シャオジー通信プロトコルを利用した他のクライアントプロジェクト：

 - [huangjunsen0406/py-xiaozhi](https://github.com/huangjunsen0406/py-xiaozhi) Pythonクライアント
 - [TOM88812/xiaozhi-android-client](https://github.com/TOM88812/xiaozhi-android-client) Androidクライアント
+- [100askTeam/xiaozhi-linux](http://github.com/100askTeam/xiaozhi-linux) 百問科技提供のLinuxクライアント
+- [78/xiaozhi-sf32](https://github.com/78/xiaozhi-sf32) 思澈科技のBluetoothチップファームウェア
+- [QuecPython/solution-xiaozhiAI](https://github.com/QuecPython/solution-xiaozhiAI) 移遠提供のQuecPythonファームウェア
+
+## プロジェクトについて
+
+これはエビ兄さんがオープンソースで公開しているESP32プロジェクトで、MITライセンスのもと、誰でも無料で、商用利用も可能です。
+
+このプロジェクトを通じて、AIハードウェア開発を理解し、急速に進化する大規模言語モデルを実際のハードウェアデバイスに応用できるようになることを目指しています。
+
+ご意見やご提案があれば、いつでもIssueを提出するか、[Discord](https://discord.gg/C759fGMBcZ) または QQグループ：1011329060 にご参加ください。

 ## スター履歴

--- a/README_zh.md
+++ b/README_zh.md
@@ -0,0 +1,169 @@
+# An MCP-based Chatbot
+
+（中文 | [English](README.md) | [日本語](README_ja.md)）
+
+## 介绍
+
+👉 [人类：给 AI 装摄像头 vs AI：当场发现主人三天没洗头【bilibili】](https://www.bilibili.com/video/BV1bpjgzKEhd/)
+
+👉 [手工打造你的 AI 女友，新手入门教程【bilibili】](https://www.bilibili.com/video/BV1XnmFYLEJN/)
+
+小智 AI 聊天机器人作为一个语音交互入口，利用 Qwen / DeepSeek 等大模型的 AI 能力，通过 MCP 协议实现多端控制。
+
+<img src="docs/mcp-based-graph.jpg" alt="通过MCP控制万物" width="320">
+
+### 版本说明
+
+当前 v2 版本与 v1 版本分区表不兼容，所以无法从 v1 版本通过 OTA 升级到 v2 版本。分区表说明参见 [partitions/v2/README.md](partitions/v2/README.md)。
+
+使用 v1 版本的所有硬件，可以通过手动烧录固件来升级到 v2 版本。
+
+v1 的稳定版本为 1.9.2，可以通过 `git checkout v1` 来切换到 v1 版本，该分支会持续维护到 2026 年 2 月。
+
+### 已实现功能
+
+- Wi-Fi / ML307 Cat.1 4G
+- 离线语音唤醒 [ESP-SR](https://github.com/espressif/esp-sr)
+- 支持两种通信协议（[Websocket](docs/websocket.md) 或 MQTT+UDP）
+- 采用 OPUS 音频编解码
+- 基于流式 ASR + LLM + TTS 架构的语音交互
+- 声纹识别，识别当前说话人的身份 [3D Speaker](https://github.com/modelscope/3D-Speaker)
+- OLED / LCD 显示屏，支持表情显示
+- 电量显示与电源管理
+- 支持多语言（中文、英文、日文）
+- 支持 ESP32-C3、ESP32-S3、ESP32-P4 芯片平台
+- 通过设备端 MCP 实现设备控制（音量、灯光、电机、GPIO 等）
+- 通过云端 MCP 扩展大模型能力（智能家居控制、PC桌面操作、知识搜索、邮件收发等）
+- 自定义唤醒词、字体、表情与聊天背景，支持网页端在线修改 ([自定义Assets生成器](https://github.com/78/xiaozhi-assets-generator))
+
+## 硬件
+
+### 面包板手工制作实践
+
+详见飞书文档教程：
+
+👉 [《小智 AI 聊天机器人百科全书》](https://ccnphfhqs21z.feishu.cn/wiki/F5krwD16viZoF0kKkvDcrZNYnhb?from=from_copylink)
+
+面包板效果图如下：
+
+![面包板效果图](docs/v1/wiring2.jpg)
+
+### 支持 70 多个开源硬件（仅展示部分）
+
+- <a href="https://oshwhub.com/li-chuang-kai-fa-ban/li-chuang-shi-zhan-pai-esp32-s3-kai-fa-ban" target="_blank" title="立创·实战派 ESP32-S3 开发板">立创·实战派 ESP32-S3 开发板</a>
+- <a href="https://github.com/espressif/esp-box" target="_blank" title="乐鑫 ESP32-S3-BOX3">乐鑫 ESP32-S3-BOX3</a>
+- <a href="https://docs.m5stack.com/zh_CN/core/CoreS3" target="_blank" title="M5Stack CoreS3">M5Stack CoreS3</a>
+- <a href="https://docs.m5stack.com/en/atom/Atomic%20Echo%20Base" target="_blank" title="AtomS3R + Echo Base">M5Stack AtomS3R + Echo Base</a>
+- <a href="https://gf.bilibili.com/item/detail/1108782064" target="_blank" title="神奇按钮 2.4">神奇按钮 2.4</a>
+- <a href="https://www.waveshare.net/shop/ESP32-S3-Touch-AMOLED-1.8.htm" target="_blank" title="微雪电子 ESP32-S3-Touch-AMOLED-1.8">微雪电子 ESP32-S3-Touch-AMOLED-1.8</a>
+- <a href="https://github.com/Xinyuan-LilyGO/T-Circle-S3" target="_blank" title="LILYGO T-Circle-S3">LILYGO T-Circle-S3</a>
+- <a href="https://oshwhub.com/tenclass01/xmini_c3" target="_blank" title="虾哥 Mini C3">虾哥 Mini C3</a>
+- <a href="https://oshwhub.com/movecall/cuican-ai-pendant-lights-up-y" target="_blank" title="Movecall CuiCan ESP32S3">璀璨·AI 吊坠</a>
+- <a href="https://github.com/WMnologo/xingzhi-ai" target="_blank" title="无名科技Nologo-星智-1.54">无名科技 Nologo-星智-1.54TFT</a>
+- <a href="https://www.seeedstudio.com/SenseCAP-Watcher-W1-A-p-5979.html" target="_blank" title="SenseCAP Watcher">SenseCAP Watcher</a>
+- <a href="https://www.bilibili.com/video/BV1BHJtz6E2S/" target="_blank" title="ESP-HI 超低成本机器狗">ESP-HI 超低成本机器狗</a>
+
+<div style="display: flex; justify-content: space-between;">
+  <a href="docs/v1/lichuang-s3.jpg" target="_blank" title="立创·实战派 ESP32-S3 开发板">
+    <img src="docs/v1/lichuang-s3.jpg" width="240" />
+  </a>
+  <a href="docs/v1/espbox3.jpg" target="_blank" title="乐鑫 ESP32-S3-BOX3">
+    <img src="docs/v1/espbox3.jpg" width="240" />
+  </a>
+  <a href="docs/v1/m5cores3.jpg" target="_blank" title="M5Stack CoreS3">
+    <img src="docs/v1/m5cores3.jpg" width="240" />
+  </a>
+  <a href="docs/v1/atoms3r.jpg" target="_blank" title="AtomS3R + Echo Base">
+    <img src="docs/v1/atoms3r.jpg" width="240" />
+  </a>
+  <a href="docs/v1/magiclick.jpg" target="_blank" title="神奇按钮 2.4">
+    <img src="docs/v1/magiclick.jpg" width="240" />
+  </a>
+  <a href="docs/v1/waveshare.jpg" target="_blank" title="微雪电子 ESP32-S3-Touch-AMOLED-1.8">
+    <img src="docs/v1/waveshare.jpg" width="240" />
+  </a>
+  <a href="docs/v1/lilygo-t-circle-s3.jpg" target="_blank" title="LILYGO T-Circle-S3">
+    <img src="docs/v1/lilygo-t-circle-s3.jpg" width="240" />
+  </a>
+  <a href="docs/v1/xmini-c3.jpg" target="_blank" title="虾哥 Mini C3">
+    <img src="docs/v1/xmini-c3.jpg" width="240" />
+  </a>
+  <a href="docs/v1/movecall-cuican-esp32s3.jpg" target="_blank" title="CuiCan">
+    <img src="docs/v1/movecall-cuican-esp32s3.jpg" width="240" />
+  </a>
+  <a href="docs/v1/wmnologo_xingzhi_1.54.jpg" target="_blank" title="无名科技Nologo-星智-1.54">
+    <img src="docs/v1/wmnologo_xingzhi_1.54.jpg" width="240" />
+  </a>
+  <a href="docs/v1/sensecap_watcher.jpg" target="_blank" title="SenseCAP Watcher">
+    <img src="docs/v1/sensecap_watcher.jpg" width="240" />
+  </a>
+  <a href="docs/v1/esp-hi.jpg" target="_blank" title="ESP-HI 超低成本机器狗">
+    <img src="docs/v1/esp-hi.jpg" width="240" />
+  </a>
+</div>
+
+## 软件
+
+### 固件烧录
+
+新手第一次操作建议先不要搭建开发环境，直接使用免开发环境烧录的固件。
+
+固件默认接入 [xiaozhi.me](https://xiaozhi.me) 官方服务器，个人用户注册账号可以免费使用 Qwen 实时模型。
+
+👉 [新手烧录固件教程](https://ccnphfhqs21z.feishu.cn/wiki/Zpz4wXBtdimBrLk25WdcXzxcnNS)
+
+### 开发环境
+
+- Cursor 或 VSCode
+- 安装 ESP-IDF 插件，选择 SDK 版本 5.4 或以上
+- Linux 比 Windows 更好，编译速度快，也免去驱动问题的困扰
+- 本项目使用 Google C++ 代码风格，提交代码时请确保符合规范
+
+### 开发者文档
+
+- [自定义开发板指南](docs/custom-board.md) - 学习如何为小智 AI 创建自定义开发板
+- [MCP 协议物联网控制用法说明](docs/mcp-usage.md) - 了解如何通过 MCP 协议控制物联网设备
+- [MCP 协议交互流程](docs/mcp-protocol.md) - 设备端 MCP 协议的实现方式
+- [MQTT + UDP 混合通信协议文档](docs/mqtt-udp.md)
+- [一份详细的 WebSocket 通信协议文档](docs/websocket.md)
+
+## 大模型配置
+
+如果你已经拥有一个小智 AI 聊天机器人设备，并且已接入官方服务器，可以登录 [xiaozhi.me](https://xiaozhi.me) 控制台进行配置。
+
+👉 [后台操作视频教程（旧版界面）](https://www.bilibili.com/video/BV1jUCUY2EKM/)
+
+## 相关开源项目
+
+在个人电脑上部署服务器，可以参考以下第三方开源的项目：
+
+- [xinnan-tech/xiaozhi-esp32-server](https://github.com/xinnan-tech/xiaozhi-esp32-server) Python 服务器
+- [joey-zhou/xiaozhi-esp32-server-java](https://github.com/joey-zhou/xiaozhi-esp32-server-java) Java 服务器
+- [AnimeAIChat/xiaozhi-server-go](https://github.com/AnimeAIChat/xiaozhi-server-go) Golang 服务器
+- [hackers365/xiaozhi-esp32-server-golang](https://github.com/hackers365/xiaozhi-esp32-server-golang) Golang 服务器
+
+使用小智通信协议的第三方客户端项目：
+
+- [huangjunsen0406/py-xiaozhi](https://github.com/huangjunsen0406/py-xiaozhi) Python 客户端
+- [TOM88812/xiaozhi-android-client](https://github.com/TOM88812/xiaozhi-android-client) Android 客户端
+- [100askTeam/xiaozhi-linux](http://github.com/100askTeam/xiaozhi-linux) 百问科技提供的 Linux 客户端
+- [78/xiaozhi-sf32](https://github.com/78/xiaozhi-sf32) 思澈科技的蓝牙芯片固件
+- [QuecPython/solution-xiaozhiAI](https://github.com/QuecPython/solution-xiaozhiAI) 移远提供的 QuecPython 固件
+
+## 关于项目
+
+这是一个由虾哥开源的 ESP32 项目，以 MIT 许可证发布，允许任何人免费使用，修改或用于商业用途。
+
+我们希望通过这个项目，能够帮助大家了解 AI 硬件开发，将当下飞速发展的大语言模型应用到实际的硬件设备中。
+
+如果你有任何想法或建议，请随时提出 Issues 或加入 [Discord](https://discord.gg/C759fGMBcZ) 或 QQ 群：1011329060
+
+## Star History
+
+<a href="https://star-history.com/#78/xiaozhi-esp32&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=78/xiaozhi-esp32&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=78/xiaozhi-esp32&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=78/xiaozhi-esp32&type=Date" />
+ </picture>
+</a>
--- a/docs/blufi.md
+++ b/docs/blufi.md
@@ -0,0 +1,37 @@
+# BluFi 配网（集成 esp-wifi-connect）
+
+本文档说明如何在小智固件中启用和使用 BluFi（BLE Wi‑Fi 配网），并结合项目内置的 `esp-wifi-connect` 组件完成 Wi‑Fi 连接与存储。官方
+BluFi
+协议说明请参考 [Espressif 文档](https://docs.espressif.com/projects/esp-idf/zh_CN/stable/esp32/api-guides/ble/blufi.html)。
+
+## 前置条件
+
+- 需要支持 BLE 的芯片与固件配置。
+- 在 `idf.py menuconfig` 中启用 `WiFi Configuration Method -> Esp Blufi`（`CONFIG_USE_ESP_BLUFI_WIFI_PROVISIONING=y`
+  ）。如果想使用 BluFi，必须关闭同一菜单下的 Hotspot 选项，否则默认使用 Hotspot 配网模式。
+
+- 保持默认的 NVS 与事件循环初始化（项目的 `app_main` 已处理）。
+- CONFIG_BT_BLUEDROID_ENABLED、CONFIG_BT_NIMBLE_ENABLED这两个宏应二选一，不能同时启用。
+## 工作流程
+
+1) 手机端通过 BluFi（如官方 EspBlufi App 或自研客户端）连接设备，发送 Wi‑Fi SSID/密码，手机端可以通过blufi协议获取设备端扫描到的WiFi列表。
+2) 设备侧在 `ESP_BLUFI_EVENT_REQ_CONNECT_TO_AP` 中将凭据写入 `SsidManager`（存储到 NVS，属于 `esp-wifi-connect` 组件）。
+3) 随后启动 `WifiStation` 扫描并连接；状态通过 BluFi 返回。
+4) 配网成功后设备会自动连接新 Wi‑Fi；失败则返回失败状态。
+
+## 使用步骤
+
+1. 配置：在 menuconfig 开启 `Esp Blufi`。编译并烧录固件。
+2. 触发配网：设备首次启动且没有已保存的 Wi‑Fi 时会自动进入配网。
+3. 手机端操作：打开 EspBlufi App（或其他 BluFi 客户端），搜索并连接设备，可以选择是否加密，按提示输入 Wi‑Fi SSID/密码并发送。
+4. 观察结果：
+    - 成功：BluFi 报告连接成功，设备自动连接 Wi‑Fi。
+    - 失败：BluFi 返回失败状态，可重新发送或检查路由器。
+
+## 注意事项
+
+- BluFi 配网不支持与热点配网同时开启。如果热点配网已经启动，则默认使用热点配网。请在 menuconfig 中只保留一种配网方式。
+- 若多次测试，建议清除或覆盖存储的 SSID（`wifi` 命名空间），避免旧配置干扰。
+- 如果使用自定义 BluFi 客户端，需遵循官方协议帧格式，参考上文官方文档链接。
+- 官方文档中已提供EspBlufi APP下载地址
+- 由于IDF5.5.2的blufi接口发生变化,5.5.2版本编译后蓝牙名称为"Xiaozhi-Blufi",5.5.1版本中蓝牙名称为"BLUFI_DEVICE"
--- a/docs/code_style.md
+++ b/docs/code_style.md
@@ -0,0 +1,91 @@
+# 代码风格指南
+
+## 代码格式化工具
+
+本项目使用 clang-format 工具来统一代码风格。我们已经在项目根目录下提供了 `.clang-format` 配置文件，该配置基于 Google C++ 风格指南，并做了一些自定义调整。
+
+### 安装 clang-format
+
+在使用之前，请确保你已经安装了 clang-format 工具：
+
+- **Windows**：
+  ```powershell
+  winget install LLVM
+  # 或者使用 Chocolatey
+  choco install llvm
+  ```
+
+- **Linux**：
+  ```bash
+  sudo apt install clang-format  # Ubuntu/Debian
+  sudo dnf install clang-tools-extra  # Fedora
+  ```
+
+- **macOS**：
+  ```bash
+  brew install clang-format
+  ```
+
+### 使用方法
+
+1. **格式化单个文件**：
+   ```bash
+   clang-format -i path/to/your/file.cpp
+   ```
+
+2. **格式化整个项目**：
+   ```bash
+   # 在项目根目录下执行
+   find main -iname *.h -o -iname *.cc | xargs clang-format -i
+   ```
+
+3. **在提交代码前检查格式**：
+   ```bash
+   # 检查文件格式是否符合规范（不修改文件）
+   clang-format --dry-run -Werror path/to/your/file.cpp
+   ```
+
+### IDE 集成
+
+- **Visual Studio Code**：
+  1. 安装 C/C++ 扩展
+  2. 在设置中启用 `C_Cpp.formatting` 为 `clang-format`
+  3. 可以设置保存时自动格式化：`editor.formatOnSave: true`
+
+- **CLion**：
+  1. 在设置中选择 `Editor > Code Style > C/C++`
+  2. 将 `Formatter` 设置为 `clang-format`
+  3. 选择使用项目中的 `.clang-format` 配置文件
+
+### 主要格式规则
+
+- 缩进使用 4 个空格
+- 行宽限制为 100 字符
+- 大括号采用 Attach 风格（与控制语句在同一行）
+- 指针和引用符号靠左对齐
+- 自动排序头文件包含
+- 类访问修饰符缩进为 -4 空格
+
+### 注意事项
+
+1. 提交代码前请确保代码已经过格式化
+2. 不要手动调整已格式化的代码对齐
+3. 如果某段代码不希望被格式化，可以使用以下注释包围：
+   ```cpp
+   // clang-format off
+   // 你的代码
+   // clang-format on
+   ```
+
+### 常见问题
+
+1. **格式化失败**：
+   - 检查 clang-format 版本是否过低
+   - 确认文件编码为 UTF-8
+   - 验证 .clang-format 文件语法是否正确
+
+2. **与期望格式不符**：
+   - 检查是否使用了项目根目录下的 .clang-format 配置
+   - 确认没有其他位置的 .clang-format 文件被优先使用
+
+如有任何问题或建议，欢迎提出 issue 或 pull request。
--- a/main/boards/README.md
+++ b/main/boards/README.md
@@ -21,7 +21,7 @@

 ### 1. 创建新的开发板目录

-首先在`boards/`目录下创建一个新的目录，例如`my-custom-board/`：
+首先在`boards/`目录下创建一个新的目录，命名方式应使用 `[品牌名]-[开发板类型]` 的形式，例如 `m5stack-tab5`：

 ```bash
 mkdir main/boards/my-custom-board
@@ -87,24 +87,51 @@ mkdir main/boards/my-custom-board

 #### config.json

-在`config.json`中定义编译配置:
+在`config.json`中定义编译配置，这个文件用于 `scripts/release.py` 脚本自动化编译：

 ```json
 {
-    "target": "esp32s3",  // 目标芯片型号: esp32, esp32s3, esp32c3等
+    "target": "esp32s3",  // 目标芯片型号: esp32, esp32s3, esp32c3, esp32c6, esp32p4等
    "builds": [
        {
-            "name": "my-custom-board",  // 开发板名称
+            "name": "my-custom-board",  // 开发板名称，用于生成固件包
            "sdkconfig_append": [
-                // 额外需要的编译配置
+                // 特别 Flash 大小配置
                "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/8m.csv\""
+                // 特别分区表配置
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/8m.csv\""
            ]
        }
    ]
 }
 ```

+**配置项说明：**
+- `target`: 目标芯片型号，必须与硬件匹配
+- `name`: 编译输出的固件包名称，建议与目录名一致
+- `sdkconfig_append`: 额外的 sdkconfig 配置项数组，会追加到默认配置中
+
+**常用的 sdkconfig_append 配置：**
+```json
+// Flash 大小
+"CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y"   // 4MB Flash
+"CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y"   // 8MB Flash
+"CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y"  // 16MB Flash
+
+// 分区表
+"CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/4m.csv\""  // 4MB 分区表
+"CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/8m.csv\""  // 8MB 分区表
+"CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/16m.csv\"" // 16MB 分区表
+
+// 语言配置
+"CONFIG_LANGUAGE_EN_US=y"  // 英语
+"CONFIG_LANGUAGE_ZH_CN=y"  // 简体中文
+
+// 唤醒词配置
+"CONFIG_USE_DEVICE_AEC=y"          // 启用设备端 AEC
+"CONFIG_WAKE_WORD_DISABLED=y"      // 禁用唤醒词
+```
+
 ### 3. 编写板级初始化代码

 创建一个`my_custom_board.cc`文件，实现开发板的所有初始化逻辑。
@@ -131,10 +158,6 @@ mkdir main/boards/my-custom-board

 #define TAG "MyCustomBoard"

-// 声明字体
-LV_FONT_DECLARE(font_puhui_16_4);
-LV_FONT_DECLARE(font_awesome_16_4);
-
 class MyCustomBoard : public WifiBoard {
 private:
    i2c_master_bus_handle_t codec_i2c_bus_;
@@ -174,8 +197,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@@ -212,12 +236,7 @@ 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,
-                                        .emoji_font = font_emoji_32_init(),
-                                    });
+                                    DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
    }

    // MCP Tools 初始化
@@ -269,7 +288,106 @@ public:
 DECLARE_BOARD(MyCustomBoard);
 ```

-### 4. 创建README.md
+### 4. 添加构建系统配置
+
+#### 在 Kconfig.projbuild 中添加开发板选项
+
+打开 `main/Kconfig.projbuild` 文件，在 `choice BOARD_TYPE` 部分添加新的开发板配置项：
+
+```kconfig
+choice BOARD_TYPE
+    prompt "Board Type"
+    default BOARD_TYPE_BREAD_COMPACT_WIFI
+    help
+        Board type. 开发板类型
+    
+    # ... 其他开发板选项 ...
+    
+    config BOARD_TYPE_MY_CUSTOM_BOARD
+        bool "My Custom Board (我的自定义开发板)"
+        depends on IDF_TARGET_ESP32S3  # 根据你的目标芯片修改
+endchoice
+```
+
+**注意事项：**
+- `BOARD_TYPE_MY_CUSTOM_BOARD` 是配置项名称，需要全大写，使用下划线分隔
+- `depends on` 指定了目标芯片类型（如 `IDF_TARGET_ESP32S3`、`IDF_TARGET_ESP32C3` 等）
+- 描述文字可以使用中英文
+
+#### 在 CMakeLists.txt 中添加开发板配置
+
+打开 `main/CMakeLists.txt` 文件，在开发板类型判断部分添加新的配置：
+
+```cmake
+# 在 elseif 链中添加你的开发板配置
+elseif(CONFIG_BOARD_TYPE_MY_CUSTOM_BOARD)
+    set(BOARD_TYPE "my-custom-board")  # 与目录名一致
+    set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)  # 根据屏幕大小选择合适的字体
+    set(BUILTIN_ICON_FONT font_awesome_20_4)
+    set(DEFAULT_EMOJI_COLLECTION twemoji_64)  # 可选，如果需要表情显示
+endif()
+```
+
+**字体和表情配置说明：**
+
+根据屏幕分辨率选择合适的字体大小：
+- 小屏幕（128x64 OLED）：`font_puhui_basic_14_1` / `font_awesome_14_1`
+- 中小屏幕（240x240）：`font_puhui_basic_16_4` / `font_awesome_16_4`
+- 中等屏幕（240x320）：`font_puhui_basic_20_4` / `font_awesome_20_4`
+- 大屏幕（480x320+）：`font_puhui_basic_30_4` / `font_awesome_30_4`
+
+表情集合选项：
+- `twemoji_32` - 32x32 像素表情（小屏幕）
+- `twemoji_64` - 64x64 像素表情（大屏幕）
+
+### 5. 配置和编译
+
+#### 方法一：使用 idf.py 手动配置
+
+1. **设置目标芯片**（首次配置或更换芯片时）：
+   ```bash
+   # 对于 ESP32-S3
+   idf.py set-target esp32s3
+   
+   # 对于 ESP32-C3
+   idf.py set-target esp32c3
+   
+   # 对于 ESP32
+   idf.py set-target esp32
+   ```
+
+2. **清理旧配置**：
+   ```bash
+   idf.py fullclean
+   ```
+
+3. **进入配置菜单**：
+   ```bash
+   idf.py menuconfig
+   ```
+   
+   在菜单中导航到：`Xiaozhi Assistant` -> `Board Type`，选择你的自定义开发板。
+
+4. **编译和烧录**：
+   ```bash
+   idf.py build
+   idf.py flash monitor
+   ```
+
+#### 方法二：使用 release.py 脚本（推荐）
+
+如果你的开发板目录下有 `config.json` 文件，可以使用此脚本自动完成配置和编译：
+
+```bash
+python scripts/release.py my-custom-board
+```
+
+此脚本会自动：
+- 读取 `config.json` 中的 `target` 配置并设置目标芯片
+- 应用 `sdkconfig_append` 中的编译选项
+- 完成编译并打包固件
+
+### 6. 创建README.md

 在README.md中说明开发板的特性、硬件要求、编译和烧录步骤：

--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
--- a/main/Kconfig.projbuild
+++ b/main/Kconfig.projbuild
--- a/main/application.cc
+++ b/main/application.cc
--- a/main/application.h
+++ b/main/application.h
@@ -9,20 +9,29 @@
 #include <string>
 #include <mutex>
 #include <deque>
-#include <vector>
 #include <memory>

 #include "protocol.h"
 #include "ota.h"
 #include "audio_service.h"
-#include "device_state_event.h"
+#include "device_state.h"
+#include "device_state_machine.h"
+
+// Main event bits
+#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_ACTIVATION_DONE      (1 << 5)
+#define MAIN_EVENT_CLOCK_TICK           (1 << 6)
+#define MAIN_EVENT_NETWORK_CONNECTED    (1 << 7)
+#define MAIN_EVENT_NETWORK_DISCONNECTED (1 << 8)
+#define MAIN_EVENT_TOGGLE_CHAT          (1 << 9)
+#define MAIN_EVENT_START_LISTENING      (1 << 10)
+#define MAIN_EVENT_STOP_LISTENING       (1 << 11)
+#define MAIN_EVENT_STATE_CHANGED        (1 << 12)

-#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)

 enum AecMode {
    kAecOff,
@@ -36,30 +45,80 @@ public:
        static Application instance;
        return instance;
    }
-    // 删除拷贝构造函数和赋值运算符
+    // Delete copy constructor and assignment operator
    Application(const Application&) = delete;
    Application& operator=(const Application&) = delete;

-    void Start();
-    void MainEventLoop();
-    DeviceState GetDeviceState() const { return device_state_; }
+    /**
+     * Initialize the application
+     * This sets up display, audio, network callbacks, etc.
+     * Network connection starts asynchronously.
+     */
+    void Initialize();
+
+    /**
+     * Run the main event loop
+     * This function runs in the main task and never returns.
+     * It handles all events including network, state changes, and user interactions.
+     */
+    void Run();
+
+    DeviceState GetDeviceState() const { return state_machine_.GetState(); }
    bool IsVoiceDetected() const { return audio_service_.IsVoiceDetected(); }
-    void Schedule(std::function<void()> callback);
-    void SetDeviceState(DeviceState state);
+    
+    /**
+     * Request state transition
+     * Returns true if transition was successful
+     */
+    bool SetDeviceState(DeviceState state);
+
+    /**
+     * Schedule a callback to be executed in the main task
+     */
+    void Schedule(std::function<void()>&& callback);
+
+    /**
+     * Alert with status, message, emotion and optional sound
+     */
    void Alert(const char* status, const char* message, const char* emotion = "", const std::string_view& sound = "");
    void DismissAlert();
+
    void AbortSpeaking(AbortReason reason);
+
+    /**
+     * Toggle chat state (event-based, thread-safe)
+     * Sends MAIN_EVENT_TOGGLE_CHAT to be handled in Run()
+     */
    void ToggleChatState();
+
+    /**
+     * Start listening (event-based, thread-safe)
+     * Sends MAIN_EVENT_START_LISTENING to be handled in Run()
+     */
    void StartListening();
+
+    /**
+     * Stop listening (event-based, thread-safe)
+     * Sends MAIN_EVENT_STOP_LISTENING to be handled in Run()
+     */
    void StopListening();
+
    void Reboot();
    void WakeWordInvoke(const std::string& wake_word);
+    bool UpgradeFirmware(const std::string& url, const std::string& version = "");
    bool CanEnterSleepMode();
    void SendMcpMessage(const std::string& payload);
    void SetAecMode(AecMode mode);
    AecMode GetAecMode() const { return aec_mode_; }
    void PlaySound(const std::string_view& sound);
    AudioService& GetAudioService() { return audio_service_; }
+    
+    /**
+     * Reset protocol resources (thread-safe)
+     * Can be called from any task to release resources allocated after network connected
+     * This includes closing audio channel, resetting protocol and ota objects
+     */
+    void ResetProtocol();

 private:
    Application();
@@ -70,22 +129,61 @@ private:
    std::unique_ptr<Protocol> protocol_;
    EventGroupHandle_t event_group_ = nullptr;
    esp_timer_handle_t clock_timer_handle_ = nullptr;
-    volatile DeviceState device_state_ = kDeviceStateUnknown;
+    DeviceStateMachine state_machine_;
    ListeningMode listening_mode_ = kListeningModeAutoStop;
    AecMode aec_mode_ = kAecOff;
    std::string last_error_message_;
    AudioService audio_service_;
+    std::unique_ptr<Ota> ota_;

    bool has_server_time_ = false;
    bool aborted_ = false;
+    bool assets_version_checked_ = false;
+    bool play_popup_on_listening_ = false;  // Flag to play popup sound after state changes to listening
    int clock_ticks_ = 0;
-    TaskHandle_t check_new_version_task_handle_ = nullptr;
+    TaskHandle_t activation_task_handle_ = nullptr;

-    void OnWakeWordDetected();
-    void CheckNewVersion(Ota& ota);
+
+    // Event handlers
+    void HandleStateChangedEvent();
+    void HandleToggleChatEvent();
+    void HandleStartListeningEvent();
+    void HandleStopListeningEvent();
+    void HandleNetworkConnectedEvent();
+    void HandleNetworkDisconnectedEvent();
+    void HandleActivationDoneEvent();
+    void HandleWakeWordDetectedEvent();
+    void ContinueOpenAudioChannel(ListeningMode mode);
+    void ContinueWakeWordInvoke(const std::string& wake_word);
+
+    // Activation task (runs in background)
+    void ActivationTask();
+
+    // Helper methods
+    void CheckAssetsVersion();
+    void CheckNewVersion();
+    void InitializeProtocol();
    void ShowActivationCode(const std::string& code, const std::string& message);
-    void OnClockTimer();
    void SetListeningMode(ListeningMode mode);
+    ListeningMode GetDefaultListeningMode() const;
+    
+    // State change handler called by state machine
+    void OnStateChanged(DeviceState old_state, DeviceState new_state);
+};
+
+
+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_
--- a/main/assets.cc
+++ b/main/assets.cc
@@ -0,0 +1,562 @@
+#include "assets.h"
+#include "board.h"
+#include "display.h"
+#include "application.h"
+#include "lvgl_theme.h"
+#include "emote_display.h"
+#include "expression_emote.h"
+#if HAVE_LVGL
+#include "display/lcd_display.h"
+#include <spi_flash_mmap.h>
+#endif
+
+#include <esp_log.h>
+#include <esp_timer.h>
+#include <esp_heap_caps.h>
+#include <cbin_font.h>
+
+
+#define TAG "Assets"
+#define PARTITION_LABEL "assets"
+
+struct mmap_assets_table {
+    char asset_name[32];          /*!< Name of the asset */
+    uint32_t asset_size;          /*!< Size of the asset */
+    uint32_t asset_offset;        /*!< Offset of the asset */
+    uint16_t asset_width;         /*!< Width of the asset */
+    uint16_t asset_height;        /*!< Height of the asset */
+};
+
+Assets::Assets() {
+#if HAVE_LVGL
+    strategy_ = std::make_unique<Assets::LvglStrategy>();
+#else
+    strategy_ = std::make_unique<Assets::EmoteStrategy>();
+#endif
+    // Initialize the partition
+    InitializePartition();
+}
+
+Assets::~Assets() {
+    UnApplyPartition();
+}
+
+bool Assets::FindPartition(Assets* assets) {
+    assets->partition_ = esp_partition_find_first(ESP_PARTITION_TYPE_ANY, ESP_PARTITION_SUBTYPE_ANY, PARTITION_LABEL);
+    if (assets->partition_ == nullptr) {
+        ESP_LOGI(TAG, "No assets partition found");
+        return false;
+    }
+    return true;
+}
+
+bool Assets::Apply(bool refresh_display_theme) {
+    return strategy_ ? strategy_->Apply(this, refresh_display_theme) : false;
+}
+
+bool Assets::InitializePartition() {
+    return strategy_ ? strategy_->InitializePartition(this) : false;
+}
+
+void Assets::UnApplyPartition() {
+    if (strategy_) {
+        strategy_->UnApplyPartition(this);
+    }
+}
+
+bool Assets::GetAssetData(const std::string& name, void*& ptr, size_t& size) {
+    return strategy_ ? strategy_->GetAssetData(this, name, ptr, size) : false;
+}
+
+bool Assets::LoadSrmodelsFromIndex(Assets* assets, cJSON* root) {
+    void* ptr = nullptr;
+    size_t size = 0;
+    bool need_delete_root = false;
+
+    // If root is not provided, parse index.json
+    if (root == nullptr) {
+        if (!assets->GetAssetData("index.json", ptr, size)) {
+            ESP_LOGE(TAG, "The index.json file is not found");
+            return false;
+        }
+
+        root = cJSON_ParseWithLength(static_cast<char*>(ptr), size);
+        if (root == nullptr) {
+            ESP_LOGE(TAG, "The index.json file is not valid");
+            return false;
+        }
+        need_delete_root = true;
+    }
+
+    cJSON* srmodels = cJSON_GetObjectItem(root, "srmodels");
+    if (cJSON_IsString(srmodels)) {
+        std::string srmodels_file = srmodels->valuestring;
+        if (assets->GetAssetData(srmodels_file, ptr, size)) {
+            if (assets->models_list_ != nullptr) {
+                esp_srmodel_deinit(assets->models_list_);
+                assets->models_list_ = nullptr;
+            }
+            assets->models_list_ = srmodel_load(static_cast<uint8_t*>(ptr));
+            if (assets->models_list_ != nullptr) {
+                auto& app = Application::GetInstance();
+                app.GetAudioService().SetModelsList(assets->models_list_);
+                if (need_delete_root) {
+                    cJSON_Delete(root);
+                }
+                return true;
+            } else {
+                ESP_LOGE(TAG, "Failed to load srmodels.bin");
+            }
+        } else {
+            ESP_LOGE(TAG, "The srmodels file %s is not found", srmodels_file.c_str());
+        }
+    }
+
+    if (need_delete_root) {
+        cJSON_Delete(root);
+    }
+    return false;
+}
+
+#if HAVE_LVGL
+uint32_t Assets::LvglStrategy::CalculateChecksum(const char* data, uint32_t length) {
+    uint32_t checksum = 0;
+    for (uint32_t i = 0; i < length; i++) {
+        checksum += data[i];
+    }
+    return checksum & 0xFFFF;
+}
+
+bool Assets::LvglStrategy::InitializePartition(Assets* assets) {
+    assets->partition_valid_ = false;
+    assets_.clear();
+
+    if (!Assets::FindPartition(assets)) {
+        return false;
+    }
+
+    int free_pages = spi_flash_mmap_get_free_pages(SPI_FLASH_MMAP_DATA);
+    uint32_t storage_size = free_pages * 64 * 1024;
+    ESP_LOGI(TAG, "The storage free size is %ld KB", storage_size / 1024);
+    ESP_LOGI(TAG, "The partition size is %ld KB", assets->partition_->size / 1024);
+    if (storage_size < assets->partition_->size) {
+        ESP_LOGE(TAG, "The free size %ld KB is less than assets partition required %ld KB", storage_size / 1024, assets->partition_->size / 1024);
+        return false;
+    }
+
+    esp_err_t err = esp_partition_mmap(assets->partition_, 0, assets->partition_->size, ESP_PARTITION_MMAP_DATA, (const void**)&mmap_root_, &mmap_handle_);
+    if (err != ESP_OK) {
+        ESP_LOGE(TAG, "Failed to mmap assets partition: %s", esp_err_to_name(err));
+        return false;
+    }
+
+    assets->partition_valid_ = true;
+
+    uint32_t stored_files = *(uint32_t*)(mmap_root_ + 0);
+    uint32_t stored_chksum = *(uint32_t*)(mmap_root_ + 4);
+    uint32_t stored_len = *(uint32_t*)(mmap_root_ + 8);
+
+    if (stored_len > assets->partition_->size - 12) {
+        ESP_LOGD(TAG, "The stored_len (0x%lx) is greater than the partition size (0x%lx) - 12", stored_len, assets->partition_->size);
+        return false;
+    }
+
+    auto start_time = esp_timer_get_time();
+    uint32_t calculated_checksum = CalculateChecksum(mmap_root_ + 12, stored_len);
+    auto end_time = esp_timer_get_time();
+    ESP_LOGI(TAG, "The checksum calculation time is %d ms", int((end_time - start_time) / 1000));
+
+    if (calculated_checksum != stored_chksum) {
+        ESP_LOGE(TAG, "The calculated checksum (0x%lx) does not match the stored checksum (0x%lx)", calculated_checksum, stored_chksum);
+        return false;
+    }
+
+    checksum_valid_ = true;
+
+    for (uint32_t i = 0; i < stored_files; i++) {
+        auto item = (const mmap_assets_table*)(mmap_root_ + 12 + i * sizeof(mmap_assets_table));
+        auto asset = Asset{
+            .size = static_cast<size_t>(item->asset_size),
+            .offset = static_cast<size_t>(12 + sizeof(mmap_assets_table) * stored_files + item->asset_offset)
+        };
+        assets_[item->asset_name] = asset;
+    }
+    return checksum_valid_;
+}
+
+void Assets::LvglStrategy::UnApplyPartition(Assets* assets) {
+    if (mmap_handle_ != 0) {
+        esp_partition_munmap(mmap_handle_);
+        mmap_handle_ = 0;
+        mmap_root_ = nullptr;
+    }
+    checksum_valid_ = false;
+    assets_.clear();
+    (void)assets; // Unused parameter
+}
+
+bool Assets::LvglStrategy::GetAssetData(Assets* assets, const std::string& name, void*& ptr, size_t& size) {
+    auto asset = assets_.find(name);
+    if (asset == assets_.end()) {
+        return false;
+    }
+    auto data = (const char*)(mmap_root_ + asset->second.offset);
+    if (data[0] != 'Z' || data[1] != 'Z') {
+        ESP_LOGE(TAG, "The asset %s is not valid with magic %02x%02x", name.c_str(), data[0], data[1]);
+        return false;
+    }
+
+    ptr = static_cast<void*>(const_cast<char*>(data + 2));
+    size = asset->second.size;
+    return true;
+}
+
+bool Assets::LvglStrategy::Apply(Assets* assets, bool refresh_display_theme) {
+    void* ptr = nullptr;
+    size_t size = 0;
+    if (!assets->GetAssetData("index.json", ptr, size)) {
+        ESP_LOGE(TAG, "The index.json file is not found");
+        return false;
+    }
+
+    cJSON* root = cJSON_ParseWithLength(static_cast<char*>(ptr), size);
+    if (root == nullptr) {
+        ESP_LOGE(TAG, "The index.json file is not valid");
+        return false;
+    }
+
+    cJSON* version = cJSON_GetObjectItem(root, "version");
+    if (cJSON_IsNumber(version)) {
+        if (version->valuedouble > 1) {
+            ESP_LOGE(TAG, "The assets version %d is not supported, please upgrade the firmware", version->valueint);
+            return false;
+        }
+    }
+
+    Assets::LoadSrmodelsFromIndex(assets, root);
+
+    auto& theme_manager = LvglThemeManager::GetInstance();
+    auto light_theme = theme_manager.GetTheme("light");
+    auto dark_theme = theme_manager.GetTheme("dark");
+
+    cJSON* font = cJSON_GetObjectItem(root, "text_font");
+    if (cJSON_IsString(font)) {
+        std::string fonts_text_file = font->valuestring;
+        if (assets->GetAssetData(fonts_text_file, ptr, size)) {
+            auto text_font = std::make_shared<LvglCBinFont>(ptr);
+            if (text_font->font() == nullptr) {
+                ESP_LOGE(TAG, "Failed to load fonts.bin");
+                return false;
+            }
+            if (light_theme != nullptr) {
+                light_theme->set_text_font(text_font);
+            }
+            if (dark_theme != nullptr) {
+                dark_theme->set_text_font(text_font);
+            }
+        } else {
+            ESP_LOGE(TAG, "The font file %s is not found", fonts_text_file.c_str());
+        }
+    }
+
+    cJSON* emoji_collection = cJSON_GetObjectItem(root, "emoji_collection");
+    if (cJSON_IsArray(emoji_collection)) {
+        auto custom_emoji_collection = std::make_shared<EmojiCollection>();
+        int emoji_count = cJSON_GetArraySize(emoji_collection);
+        for (int i = 0; i < emoji_count; i++) {
+            cJSON* emoji = cJSON_GetArrayItem(emoji_collection, i);
+            if (cJSON_IsObject(emoji)) {
+                cJSON* name = cJSON_GetObjectItem(emoji, "name");
+                cJSON* file = cJSON_GetObjectItem(emoji, "file");
+                cJSON* eaf = cJSON_GetObjectItem(emoji, "eaf");
+                if (cJSON_IsString(name) && cJSON_IsString(file) && (NULL== eaf)) {
+                    if (!assets->GetAssetData(file->valuestring, ptr, size)) {
+                        ESP_LOGE(TAG, "Emoji %s image file %s is not found", name->valuestring, file->valuestring);
+                        continue;
+                    }
+                    custom_emoji_collection->AddEmoji(name->valuestring, new LvglRawImage(ptr, size));
+                }
+            }
+        }
+        if (light_theme != nullptr) {
+            light_theme->set_emoji_collection(custom_emoji_collection);
+        }
+        if (dark_theme != nullptr) {
+            dark_theme->set_emoji_collection(custom_emoji_collection);
+        }
+    }
+
+    cJSON* skin = cJSON_GetObjectItem(root, "skin");
+    if (cJSON_IsObject(skin)) {
+        cJSON* light_skin = cJSON_GetObjectItem(skin, "light");
+        if (cJSON_IsObject(light_skin) && light_theme != nullptr) {
+            cJSON* text_color = cJSON_GetObjectItem(light_skin, "text_color");
+            cJSON* background_color = cJSON_GetObjectItem(light_skin, "background_color");
+            cJSON* background_image = cJSON_GetObjectItem(light_skin, "background_image");
+            if (cJSON_IsString(text_color)) {
+                light_theme->set_text_color(LvglTheme::ParseColor(text_color->valuestring));
+            }
+            if (cJSON_IsString(background_color)) {
+                light_theme->set_background_color(LvglTheme::ParseColor(background_color->valuestring));
+                light_theme->set_chat_background_color(LvglTheme::ParseColor(background_color->valuestring));
+            }
+            if (cJSON_IsString(background_image)) {
+                if (!assets->GetAssetData(background_image->valuestring, ptr, size)) {
+                    ESP_LOGE(TAG, "The background image file %s is not found", background_image->valuestring);
+                    return false;
+                }
+                auto background_image = std::make_shared<LvglCBinImage>(ptr);
+                light_theme->set_background_image(background_image);
+            }
+        }
+        cJSON* dark_skin = cJSON_GetObjectItem(skin, "dark");
+        if (cJSON_IsObject(dark_skin) && dark_theme != nullptr) {
+            cJSON* text_color = cJSON_GetObjectItem(dark_skin, "text_color");
+            cJSON* background_color = cJSON_GetObjectItem(dark_skin, "background_color");
+            cJSON* background_image = cJSON_GetObjectItem(dark_skin, "background_image");
+            if (cJSON_IsString(text_color)) {
+                dark_theme->set_text_color(LvglTheme::ParseColor(text_color->valuestring));
+            }
+            if (cJSON_IsString(background_color)) {
+                dark_theme->set_background_color(LvglTheme::ParseColor(background_color->valuestring));
+                dark_theme->set_chat_background_color(LvglTheme::ParseColor(background_color->valuestring));
+            }
+            if (cJSON_IsString(background_image)) {
+                if (!assets->GetAssetData(background_image->valuestring, ptr, size)) {
+                    ESP_LOGE(TAG, "The background image file %s is not found", background_image->valuestring);
+                    return false;
+                }
+                auto background_image = std::make_shared<LvglCBinImage>(ptr);
+                dark_theme->set_background_image(background_image);
+            }
+        }
+    }
+
+    if (refresh_display_theme) {
+        auto display = Board::GetInstance().GetDisplay();
+        ESP_LOGI(TAG, "Refreshing display theme...");
+
+        auto current_theme = display->GetTheme();
+        if (current_theme != nullptr) {
+            display->SetTheme(current_theme);
+        }
+
+        // Parse hide_subtitle configuration
+        cJSON* hide_subtitle = cJSON_GetObjectItem(root, "hide_subtitle");
+        if (cJSON_IsBool(hide_subtitle)) {
+            bool hide = cJSON_IsTrue(hide_subtitle);
+            auto lcd_display = dynamic_cast<LcdDisplay*>(display);
+            if (lcd_display != nullptr) {
+                lcd_display->SetHideSubtitle(hide);
+                ESP_LOGI(TAG, "Set hide_subtitle to %s", hide ? "true" : "false");
+            }
+        }
+    }
+    
+    cJSON_Delete(root);
+    return true;
+}
+#endif // HAVE_LVGL
+
+bool Assets::EmoteStrategy::InitializePartition(Assets* assets) {
+    assets->partition_valid_ = false;
+
+    if (!Assets::FindPartition(assets)) {
+        return false;
+    }
+
+    esp_err_t ret = ESP_ERR_INVALID_STATE;
+    auto display = Board::GetInstance().GetDisplay();
+    auto* emote_display = dynamic_cast<emote::EmoteDisplay*>(display);
+    if (emote_display && emote_display->GetEmoteHandle() != nullptr) {
+        const emote_data_t data = {
+            .type = EMOTE_SOURCE_PARTITION,
+            .source = {
+                .partition_label = PARTITION_LABEL,
+            },
+            .flags = {
+                .mmap_enable = true, //must be true here!!!
+            },
+        };
+        ret = emote_mount_assets(emote_display->GetEmoteHandle(), &data);
+    } else {
+        ESP_LOGE(TAG, "Emote display is not initialized");
+    }
+    assets->partition_valid_ = ((ret == ESP_OK) ? true : false);
+    return assets->partition_valid_;
+}
+
+void Assets::EmoteStrategy::UnApplyPartition(Assets* assets) {
+    auto display = Board::GetInstance().GetDisplay();
+    auto* emote_display = dynamic_cast<emote::EmoteDisplay*>(display);
+    if (emote_display && emote_display->GetEmoteHandle() != nullptr) {
+        emote_unmount_assets(emote_display->GetEmoteHandle());
+    }
+    (void)assets; // Unused parameter
+}
+
+bool Assets::EmoteStrategy::GetAssetData(Assets* assets, const std::string& name, void*& ptr, size_t& size) {
+    auto display = Board::GetInstance().GetDisplay();
+    auto* emote_display = dynamic_cast<emote::EmoteDisplay*>(display);
+    if (emote_display && emote_display->GetEmoteHandle() != nullptr) {
+        const uint8_t* data = nullptr;
+        size_t data_size = 0;
+        if (ESP_OK == emote_get_asset_data_by_name(emote_display->GetEmoteHandle(), name.c_str(), &data, &data_size)) {
+            ptr = const_cast<void*>(static_cast<const void*>(data));
+            size = data_size;
+            return true;
+        }
+        ESP_LOGE(TAG, "Failed to get asset data by name: %s", name.c_str());
+        return false;
+    }
+    (void)assets; // Unused parameter
+    return false;
+}
+
+bool Assets::EmoteStrategy::Apply(Assets* assets, bool refresh_display_theme) {
+    Assets::LoadSrmodelsFromIndex(assets);
+
+    auto display = Board::GetInstance().GetDisplay();
+    auto* emote_display = dynamic_cast<emote::EmoteDisplay*>(display);
+
+    if (emote_display && emote_display->GetEmoteHandle() != nullptr) {
+        emote_load_assets(emote_display->GetEmoteHandle());
+    }
+    return true;
+}
+
+bool Assets::Download(std::string url, std::function<void(int progress, size_t speed)> progress_callback) {
+    ESP_LOGI(TAG, "Downloading new version of assets from %s", url.c_str());
+
+    // 取消当前资源分区的内存映射
+    UnApplyPartition();
+
+    // 下载新的资源文件
+    auto network = Board::GetInstance().GetNetwork();
+    auto http = network->CreateHttp(0);
+    
+    if (!http->Open("GET", url)) {
+        ESP_LOGE(TAG, "Failed to open HTTP connection");
+        return false;
+    }
+
+    if (http->GetStatusCode() != 200) {
+        ESP_LOGE(TAG, "Failed to get assets, status code: %d", http->GetStatusCode());
+        return false;
+    }
+
+    size_t content_length = http->GetBodyLength();
+    if (content_length == 0) {
+        ESP_LOGE(TAG, "Failed to get content length");
+        return false;
+    }
+
+    if (content_length > partition_->size) {
+        ESP_LOGE(TAG, "Assets file size (%u) is larger than partition size (%lu)", content_length, partition_->size);
+        return false;
+    }
+
+    // 定义扇区大小为4KB（ESP32的标准扇区大小）
+    const size_t SECTOR_SIZE = esp_partition_get_main_flash_sector_size();
+    
+    // 计算需要擦除的扇区数量
+    size_t sectors_to_erase = (content_length + SECTOR_SIZE - 1) / SECTOR_SIZE; // 向上取整
+    size_t total_erase_size = sectors_to_erase * SECTOR_SIZE;
+    
+    ESP_LOGI(TAG, "Sector size: %u, content length: %u, sectors to erase: %u, total erase size: %u", 
+             SECTOR_SIZE, content_length, sectors_to_erase, total_erase_size);
+    
+    // 写入新的资源文件到分区，一边erase一边写入
+    char* buffer = (char*)heap_caps_malloc(SECTOR_SIZE, MALLOC_CAP_INTERNAL);
+    if (buffer == nullptr) {
+        ESP_LOGE(TAG, "Failed to allocate buffer");
+        return false;
+    }
+    size_t total_written = 0;
+    size_t recent_written = 0;
+    size_t current_sector = 0;
+    auto last_calc_time = esp_timer_get_time();
+    
+    while (true) {
+        int ret = http->Read(buffer, SECTOR_SIZE);
+        if (ret < 0) {
+            ESP_LOGE(TAG, "Failed to read HTTP data: %s", esp_err_to_name(ret));
+            heap_caps_free(buffer);
+            return false;
+        }
+
+        if (ret == 0) {
+            break;
+        }
+
+        // 检查是否需要擦除新的扇区
+        size_t write_end_offset = total_written + ret;
+        size_t needed_sectors = (write_end_offset + SECTOR_SIZE - 1) / SECTOR_SIZE;
+        
+        // 擦除需要的新扇区
+        while (current_sector < needed_sectors) {
+            size_t sector_start = current_sector * SECTOR_SIZE;
+            size_t sector_end = (current_sector + 1) * SECTOR_SIZE;
+            
+            // 确保擦除范围不超过分区大小
+            if (sector_end > partition_->size) {
+                ESP_LOGE(TAG, "Sector end (%u) exceeds partition size (%lu)", sector_end, partition_->size);
+                heap_caps_free(buffer);
+                return false;
+            }
+            
+            ESP_LOGD(TAG, "Erasing sector %u (offset: %u, size: %u)", current_sector, sector_start, SECTOR_SIZE);
+            esp_err_t err = esp_partition_erase_range(partition_, sector_start, SECTOR_SIZE);
+            if (err != ESP_OK) {
+                ESP_LOGE(TAG, "Failed to erase sector %u at offset %u: %s", current_sector, sector_start, esp_err_to_name(err));
+                heap_caps_free(buffer);
+                return false;
+            }
+            
+            current_sector++;
+        }
+
+        // 写入数据到分区
+        esp_err_t err = esp_partition_write(partition_, total_written, buffer, ret);
+        if (err != ESP_OK) {
+            ESP_LOGE(TAG, "Failed to write to assets partition at offset %u: %s", total_written, esp_err_to_name(err));
+            heap_caps_free(buffer);
+            return false;
+        }
+
+        total_written += ret;
+        recent_written += ret;
+
+        // 计算进度和速度
+        if (esp_timer_get_time() - last_calc_time >= 1000000 || total_written == content_length || ret == 0) {
+            size_t progress = total_written * 100 / content_length;
+            size_t speed = recent_written; // 每秒的字节数
+            ESP_LOGI(TAG, "Progress: %u%% (%u/%u), Speed: %u B/s, Sectors erased: %u", 
+                     progress, total_written, content_length, speed, current_sector);
+            if (progress_callback) {
+                progress_callback(progress, speed);
+            }
+            last_calc_time = esp_timer_get_time();
+            recent_written = 0; // 重置最近写入的字节数
+        }
+    }
+    
+    http->Close();
+    heap_caps_free(buffer);
+
+    if (total_written != content_length) {
+        ESP_LOGE(TAG, "Downloaded size (%u) does not match expected size (%u)", total_written, content_length);
+        return false;
+    }
+
+    ESP_LOGI(TAG, "Assets download completed, total written: %u bytes, total sectors erased: %u", 
+             total_written, current_sector);
+
+    // 重新初始化资源分区
+    if (!InitializePartition()) {
+        ESP_LOGE(TAG, "Failed to re-initialize assets partition");
+        return false;
+    }
+
+    return true;
+}
--- a/main/assets.h
+++ b/main/assets.h
@@ -0,0 +1,89 @@
+#ifndef ASSETS_H
+#define ASSETS_H
+
+#include <string>
+#include <functional>
+#include <memory>
+
+#include <cJSON.h>
+#include <esp_partition.h>
+#include <model_path.h>
+#include <map>
+#include <string>
+
+#if HAVE_LVGL
+#include <spi_flash_mmap.h>
+#endif
+
+struct Asset {
+    size_t size;
+    size_t offset;
+};
+
+class Assets {
+public:
+    static Assets& GetInstance() {
+        static Assets instance;
+        return instance;
+    }
+    ~Assets();
+
+    bool Download(std::string url, std::function<void(int progress, size_t speed)> progress_callback);
+    bool Apply(bool refresh_display_theme = true);
+    bool GetAssetData(const std::string& name, void*& ptr, size_t& size);
+
+    inline bool partition_valid() const { return partition_valid_; }
+    inline std::string default_assets_url() const { return default_assets_url_; }
+
+private:
+    Assets();
+    Assets(const Assets&) = delete;
+    Assets& operator=(const Assets&) = delete;
+
+    bool InitializePartition();
+    void UnApplyPartition();
+    static bool FindPartition(Assets* assets);
+    static bool LoadSrmodelsFromIndex(Assets* assets, cJSON* root = nullptr);
+  
+    class AssetStrategy {
+    public:
+        virtual ~AssetStrategy() = default;
+        virtual bool Apply(Assets* assets, bool refresh_display_theme = true) = 0;
+        virtual bool InitializePartition(Assets* assets) = 0;
+        virtual void UnApplyPartition(Assets* assets) = 0;
+        virtual bool GetAssetData(Assets* assets, const std::string& name, void*& ptr, size_t& size) = 0;
+    };
+    
+    class LvglStrategy : public AssetStrategy {
+    public:
+        bool Apply(Assets* assets, bool refresh_display_theme = true) override;
+        bool InitializePartition(Assets* assets) override;
+        void UnApplyPartition(Assets* assets) override;
+        bool GetAssetData(Assets* assets, const std::string& name, void*& ptr, size_t& size) override;
+    private:
+        static uint32_t CalculateChecksum(const char* data, uint32_t length);
+        std::map<std::string, Asset> assets_;
+        esp_partition_mmap_handle_t mmap_handle_ = 0;
+        const char* mmap_root_ = nullptr;
+        bool checksum_valid_ = false;
+    };
+    
+    class EmoteStrategy : public AssetStrategy {
+    public:
+        bool Apply(Assets* assets, bool refresh_display_theme = true) override;
+        bool InitializePartition(Assets* assets) override;
+        void UnApplyPartition(Assets* assets) override;
+        bool GetAssetData(Assets* assets, const std::string& name, void*& ptr, size_t& size) override;
+    };
+    
+    // Strategy instance
+    std::unique_ptr<AssetStrategy> strategy_;
+
+protected:
+    const esp_partition_t* partition_ = nullptr;
+    bool partition_valid_ = false;
+    std::string default_assets_url_;
+    srmodel_list_t* models_list_ = nullptr;
+};
+
+#endif
--- a/main/assets/common/exclamation.ogg
+++ b/main/assets/common/exclamation.ogg
--- a/main/assets/common/exclamation.p3
+++ b/main/assets/common/exclamation.p3
--- a/main/assets/common/low_battery.ogg
+++ b/main/assets/common/low_battery.ogg
--- a/main/assets/common/low_battery.p3
+++ b/main/assets/common/low_battery.p3
--- a/main/assets/common/popup.ogg
+++ b/main/assets/common/popup.ogg
--- a/main/assets/common/popup.p3
+++ b/main/assets/common/popup.p3
--- a/main/assets/common/success.ogg
+++ b/main/assets/common/success.ogg
--- a/main/assets/common/success.p3
+++ b/main/assets/common/success.p3
--- a/main/assets/common/vibration.ogg
+++ b/main/assets/common/vibration.ogg
--- a/main/assets/common/vibration.p3
+++ b/main/assets/common/vibration.p3
--- a/main/assets/en-US/0.p3
+++ b/main/assets/en-US/0.p3
--- a/main/assets/en-US/1.p3
+++ b/main/assets/en-US/1.p3
--- a/main/assets/en-US/2.p3
+++ b/main/assets/en-US/2.p3
--- a/main/assets/en-US/3.p3
+++ b/main/assets/en-US/3.p3
--- a/main/assets/en-US/4.p3
+++ b/main/assets/en-US/4.p3
--- a/main/assets/en-US/5.p3
+++ b/main/assets/en-US/5.p3
--- a/main/assets/en-US/6.p3
+++ b/main/assets/en-US/6.p3
--- a/main/assets/en-US/7.p3
+++ b/main/assets/en-US/7.p3
--- a/main/assets/en-US/8.p3
+++ b/main/assets/en-US/8.p3
--- a/main/assets/en-US/9.p3
+++ b/main/assets/en-US/9.p3
--- a/main/assets/en-US/activation.p3
+++ b/main/assets/en-US/activation.p3
--- a/main/assets/en-US/err_pin.p3
+++ b/main/assets/en-US/err_pin.p3
--- a/main/assets/en-US/err_reg.p3
+++ b/main/assets/en-US/err_reg.p3
--- a/main/assets/en-US/upgrade.p3
+++ b/main/assets/en-US/upgrade.p3
--- a/main/assets/en-US/welcome.p3
+++ b/main/assets/en-US/welcome.p3
--- a/main/assets/en-US/wificonfig.p3
+++ b/main/assets/en-US/wificonfig.p3
--- a/main/assets/ja-JP/0.p3
+++ b/main/assets/ja-JP/0.p3
--- a/main/assets/ja-JP/1.p3
+++ b/main/assets/ja-JP/1.p3
--- a/main/assets/ja-JP/2.p3
+++ b/main/assets/ja-JP/2.p3
--- a/main/assets/ja-JP/3.p3
+++ b/main/assets/ja-JP/3.p3
--- a/main/assets/ja-JP/4.p3
+++ b/main/assets/ja-JP/4.p3
--- a/main/assets/ja-JP/5.p3
+++ b/main/assets/ja-JP/5.p3
--- a/main/assets/ja-JP/6.p3
+++ b/main/assets/ja-JP/6.p3
--- a/main/assets/ja-JP/7.p3
+++ b/main/assets/ja-JP/7.p3
--- a/main/assets/ja-JP/8.p3
+++ b/main/assets/ja-JP/8.p3
--- a/main/assets/ja-JP/9.p3
+++ b/main/assets/ja-JP/9.p3
--- a/main/assets/ja-JP/activation.p3
+++ b/main/assets/ja-JP/activation.p3
--- a/main/assets/ja-JP/err_pin.p3
+++ b/main/assets/ja-JP/err_pin.p3
--- a/main/assets/ja-JP/err_reg.p3
+++ b/main/assets/ja-JP/err_reg.p3
--- a/main/assets/ja-JP/upgrade.p3
+++ b/main/assets/ja-JP/upgrade.p3
--- a/main/assets/ja-JP/welcome.p3
+++ b/main/assets/ja-JP/welcome.p3
--- a/main/assets/ja-JP/wificonfig.p3
+++ b/main/assets/ja-JP/wificonfig.p3
--- a/main/assets/locales/ar-SA/0.ogg
+++ b/main/assets/locales/ar-SA/0.ogg
--- a/main/assets/locales/ar-SA/1.ogg
+++ b/main/assets/locales/ar-SA/1.ogg
--- a/main/assets/locales/ar-SA/2.ogg
+++ b/main/assets/locales/ar-SA/2.ogg
--- a/main/assets/locales/ar-SA/3.ogg
+++ b/main/assets/locales/ar-SA/3.ogg
--- a/main/assets/locales/ar-SA/4.ogg
+++ b/main/assets/locales/ar-SA/4.ogg
--- a/main/assets/locales/ar-SA/5.ogg
+++ b/main/assets/locales/ar-SA/5.ogg
--- a/main/assets/locales/ar-SA/6.ogg
+++ b/main/assets/locales/ar-SA/6.ogg
--- a/main/assets/locales/ar-SA/7.ogg
+++ b/main/assets/locales/ar-SA/7.ogg
--- a/main/assets/locales/ar-SA/8.ogg
+++ b/main/assets/locales/ar-SA/8.ogg
--- a/main/assets/locales/ar-SA/9.ogg
+++ b/main/assets/locales/ar-SA/9.ogg
--- a/main/assets/locales/ar-SA/activation.ogg
+++ b/main/assets/locales/ar-SA/activation.ogg
--- a/main/assets/locales/ar-SA/err_pin.ogg
+++ b/main/assets/locales/ar-SA/err_pin.ogg
--- a/main/assets/locales/ar-SA/err_reg.ogg
+++ b/main/assets/locales/ar-SA/err_reg.ogg
--- a/main/assets/locales/ar-SA/language.json
+++ b/main/assets/locales/ar-SA/language.json
@@ -0,0 +1,59 @@
+{
+    "language": {
+        "type": "ar-SA"
+    },
+    "strings": {
+        "WARNING": "تحذير",
+        "INFO": "معلومات",
+        "ERROR": "خطأ",
+        "VERSION": "الإصدار ",
+        "LOADING_PROTOCOL": "الاتصال بالخادم...",
+        "INITIALIZING": "التهيئة...",
+        "PIN_ERROR": "يرجى إدخال بطاقة SIM",
+        "REG_ERROR": "لا يمكن الوصول إلى الشبكة، يرجى التحقق من حالة بطاقة البيانات",
+        "DETECTING_MODULE": "اكتشاف الوحدة...",
+        "REGISTERING_NETWORK": "انتظار الشبكة...",
+        "CHECKING_NEW_VERSION": "فحص الإصدار الجديد...",
+        "CHECK_NEW_VERSION_FAILED": "فشل فحص الإصدار الجديد، سيتم المحاولة خلال %d ثانية: %s",
+        "SWITCH_TO_WIFI_NETWORK": "التبديل إلى Wi-Fi...",
+        "SWITCH_TO_4G_NETWORK": "التبديل إلى 4G...",
+        "STANDBY": "في الانتظار",
+        "CONNECT_TO": "الاتصال بـ ",
+        "CONNECTING": "جاري الاتصال...",
+        "CONNECTED_TO": "متصل بـ ",
+        "LISTENING": "الاستماع...",
+        "SPEAKING": "التحدث...",
+        "SERVER_NOT_FOUND": "البحث عن خدمة متاحة",
+        "SERVER_NOT_CONNECTED": "لا يمكن الاتصال بالخدمة، يرجى المحاولة لاحقاً",
+        "SERVER_TIMEOUT": "انتهت مهلة الاستجابة",
+        "SERVER_ERROR": "فشل الإرسال، يرجى التحقق من الشبكة",
+        "CONNECT_TO_HOTSPOT": "اتصل الهاتف بنقطة الاتصال ",
+        "ACCESS_VIA_BROWSER": "،الوصول عبر المتصفح ",
+        "WIFI_CONFIG_MODE": "وضع تكوين الشبكة",
+        "ENTERING_WIFI_CONFIG_MODE": "الدخول في وضع تكوين الشبكة...",
+        "SCANNING_WIFI": "فحص Wi-Fi...",
+        "NEW_VERSION": "إصدار جديد ",
+        "OTA_UPGRADE": "تحديث OTA",
+        "UPGRADING": "تحديث النظام...",
+        "UPGRADE_FAILED": "فشل التحديث",
+        "ACTIVATION": "تفعيل الجهاز",
+        "BATTERY_LOW": "البطارية منخفضة",
+        "BATTERY_CHARGING": "جاري الشحن",
+        "BATTERY_FULL": "البطارية ممتلئة",
+        "BATTERY_NEED_CHARGE": "البطارية منخفضة، يرجى الشحن",
+        "VOLUME": "الصوت ",
+        "MUTED": "صامت",
+        "MAX_VOLUME": "أقصى صوت",
+        "RTC_MODE_OFF": "AEC مُوقف",
+        "RTC_MODE_ON": "AEC مُشغل",
+        "DOWNLOAD_ASSETS_FAILED": "فشل في تنزيل الموارد",
+        "LOADING_ASSETS": "جاري تحميل الموارد...",
+        "PLEASE_WAIT": "يرجى الانتظار...",
+        "FOUND_NEW_ASSETS": "تم العثور على موارد جديدة: %s",
+        "HELLO_MY_FRIEND": "مرحباً، صديقي!",
+        "CONNECTION_SUCCESSFUL": "تم الاتصال بنجاح",
+        "FLIGHT_MODE_OFF": "وضع الطيران معطل",
+        "FLIGHT_MODE_ON": "وضع الطيران قيد التشغيل",
+        "MODEM_INIT_ERROR": "فشل تهيئة المودم"
+    }
+}
--- a/main/assets/locales/ar-SA/upgrade.ogg
+++ b/main/assets/locales/ar-SA/upgrade.ogg
--- a/main/assets/locales/ar-SA/welcome.ogg
+++ b/main/assets/locales/ar-SA/welcome.ogg
--- a/main/assets/locales/ar-SA/wificonfig.ogg
+++ b/main/assets/locales/ar-SA/wificonfig.ogg
--- a/main/assets/locales/bg-BG/0.ogg
+++ b/main/assets/locales/bg-BG/0.ogg
--- a/main/assets/locales/bg-BG/1.ogg
+++ b/main/assets/locales/bg-BG/1.ogg
--- a/main/assets/locales/bg-BG/2.ogg
+++ b/main/assets/locales/bg-BG/2.ogg
--- a/main/assets/locales/bg-BG/3.ogg
+++ b/main/assets/locales/bg-BG/3.ogg
--- a/main/assets/locales/bg-BG/4.ogg
+++ b/main/assets/locales/bg-BG/4.ogg
--- a/main/assets/locales/bg-BG/5.ogg
+++ b/main/assets/locales/bg-BG/5.ogg
--- a/main/assets/locales/bg-BG/6.ogg
+++ b/main/assets/locales/bg-BG/6.ogg
--- a/main/assets/locales/bg-BG/7.ogg
+++ b/main/assets/locales/bg-BG/7.ogg
--- a/main/assets/locales/bg-BG/8.ogg
+++ b/main/assets/locales/bg-BG/8.ogg
--- a/main/assets/locales/bg-BG/9.ogg
+++ b/main/assets/locales/bg-BG/9.ogg
--- a/main/assets/locales/bg-BG/activation.ogg
+++ b/main/assets/locales/bg-BG/activation.ogg
--- a/main/assets/locales/bg-BG/err_pin.ogg
+++ b/main/assets/locales/bg-BG/err_pin.ogg
--- a/main/assets/locales/bg-BG/err_reg.ogg
+++ b/main/assets/locales/bg-BG/err_reg.ogg
--- a/main/assets/locales/bg-BG/language.json
+++ b/main/assets/locales/bg-BG/language.json
@@ -0,0 +1,59 @@
+{
+    "language": {
+        "type": "bg-BG"
+    },
+    "strings": {
+        "WARNING": "Предупреждение",
+        "INFO": "Информация",
+        "ERROR": "Грешка",
+        "VERSION": "Версия ",
+        "LOADING_PROTOCOL": "Влизане в системата...",
+        "INITIALIZING": "Инициализация...",
+        "PIN_ERROR": "Моля, поставете SIM карта",
+        "REG_ERROR": "Не може да се осъществи достъп до мрежата, моля проверете статуса на SIM картата",
+        "DETECTING_MODULE": "Откриване на модул...",
+        "REGISTERING_NETWORK": "Изчакване на мрежата...",
+        "CHECKING_NEW_VERSION": "Проверка за нова версия...",
+        "CHECK_NEW_VERSION_FAILED": "Проверката за нова версия е неуспешна, ще се опита отново след %d секунди: %s",
+        "SWITCH_TO_WIFI_NETWORK": "Превключване към Wi-Fi...",
+        "SWITCH_TO_4G_NETWORK": "Превключване към 4G...",
+        "STANDBY": "Режим на готовност",
+        "CONNECT_TO": "Свързване към ",
+        "CONNECTING": "Свързване...",
+        "CONNECTION_SUCCESSFUL": "Успешно свързване",
+        "CONNECTED_TO": "Свързан към ",
+        "LISTENING": "Слушане...",
+        "SPEAKING": "Говорене...",
+        "SERVER_NOT_FOUND": "Търсене на налична услуга",
+        "SERVER_NOT_CONNECTED": "Не може да се свърже с услугата, моля опитайте по-късно",
+        "SERVER_TIMEOUT": "Времето за изчакване на отговор изтече",
+        "SERVER_ERROR": "Неуспешно изпращане, моля проверете мрежата",
+        "CONNECT_TO_HOTSPOT": "Горещa точка: ",
+        "ACCESS_VIA_BROWSER": " Конфигурационен URL: ",
+        "WIFI_CONFIG_MODE": "Режим на конфигуриране на Wi-Fi",
+        "ENTERING_WIFI_CONFIG_MODE": "Влизане в режим на конфигуриране на Wi-Fi...",
+        "SCANNING_WIFI": "Сканиране на Wi-Fi...",
+        "NEW_VERSION": "Нова версия ",
+        "OTA_UPGRADE": "OTA надстройка",
+        "UPGRADING": "Системата се надстройва...",
+        "UPGRADE_FAILED": "Надстройката е неуспешна",
+        "ACTIVATION": "Активация",
+        "BATTERY_LOW": "Слаба батерия",
+        "BATTERY_CHARGING": "Зарядна",
+        "BATTERY_FULL": "Батерията е пълна",
+        "BATTERY_NEED_CHARGE": "Слаба батерия, моля заредете",
+        "VOLUME": "Сила на звука ",
+        "MUTED": "Заглушено",
+        "MAX_VOLUME": "Максимална сила на звука",
+        "RTC_MODE_OFF": "AEC изключен",
+        "RTC_MODE_ON": "AEC включен",
+        "PLEASE_WAIT": "Моля, изчакайте...",
+        "FOUND_NEW_ASSETS": "Намерени нови ресурси: %s",
+        "DOWNLOAD_ASSETS_FAILED": "Неуспешно изтегляне на ресурси",
+        "LOADING_ASSETS": "Зареждане на ресурси...",
+        "HELLO_MY_FRIEND": "Здравей, мой приятел!",
+        "FLIGHT_MODE_OFF": "Режим на самолет е изключен",
+        "FLIGHT_MODE_ON": "Режим на самолет е включен",
+        "MODEM_INIT_ERROR": "Неуспешна инициализация на модема"
+    }
+}
--- a/main/assets/locales/bg-BG/upgrade.ogg
+++ b/main/assets/locales/bg-BG/upgrade.ogg
--- a/main/assets/locales/bg-BG/welcome.ogg
+++ b/main/assets/locales/bg-BG/welcome.ogg
--- a/main/assets/locales/bg-BG/wificonfig.ogg
+++ b/main/assets/locales/bg-BG/wificonfig.ogg
--- a/main/assets/locales/ca-ES/0.ogg
+++ b/main/assets/locales/ca-ES/0.ogg
--- a/main/assets/locales/ca-ES/1.ogg
+++ b/main/assets/locales/ca-ES/1.ogg
--- a/main/assets/locales/ca-ES/2.ogg
+++ b/main/assets/locales/ca-ES/2.ogg
--- a/main/assets/locales/ca-ES/3.ogg
+++ b/main/assets/locales/ca-ES/3.ogg
--- a/main/assets/locales/ca-ES/4.ogg
+++ b/main/assets/locales/ca-ES/4.ogg
--- a/main/assets/locales/ca-ES/5.ogg
+++ b/main/assets/locales/ca-ES/5.ogg
--- a/Show More
+++ b/Show More