v1.6.8: Move partition CSV files into a folder

2025-06-04 12:11:41 +08:00
parent 16ec95f6d5
commit f41210577b
41 changed files with 53 additions and 44 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(PROJECT_VER "1.6.6")
+set(PROJECT_VER "1.6.8")

 # Add this line to disable the specific warning
 add_compile_options(-Wno-missing-field-initializers)
--- a/main/audio_processing/no_wake_word.cc
+++ b/main/audio_processing/no_wake_word.cc
@@ -41,5 +41,5 @@ bool NoWakeWord::GetWakeWordOpus(std::vector<uint8_t>& opus) {
 }

 const std::string& NoWakeWord::GetLastDetectedWakeWord() const {
-    return "";  // No wake word detected
+    return last_detected_wake_word_;
 }
--- a/main/audio_processing/no_wake_word.h
+++ b/main/audio_processing/no_wake_word.h
@@ -26,6 +26,7 @@ public:

 private:
    AudioCodec* codec_ = nullptr;
+    std::string last_detected_wake_word_;
 };

 #endif 
--- a/main/boards/README.md
+++ b/main/boards/README.md
@@ -1,6 +1,6 @@
 # 自定义开发板指南

-本指南介绍如何为小智AI语音聊天机器人项目定制一个新的开发板初始化程序。小智AI支持50多种ESP32系列开发板，每个开发板的初始化代码都放在对应的目录下。
+本指南介绍如何为小智AI语音聊天机器人项目定制一个新的开发板初始化程序。小智AI支持70多种ESP32系列开发板，每个开发板的初始化代码都放在对应的目录下。

 ## 重要提示

@@ -98,7 +98,7 @@ mkdir main/boards/my-custom-board
            "sdkconfig_append": [
                // 额外需要的编译配置
                "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_8M.csv\""
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/8m.csv\""
            ]
        }
    ]
--- a/main/boards/atommatrix-echo-base/README.md
+++ b/main/boards/atommatrix-echo-base/README.md
@@ -27,7 +27,7 @@ Serial flasher config -> Flash size -> 4 MB
 **修改分区表：**

 ```
-Partition Table -> Custom partition CSV file -> partitions_4M.csv
+Partition Table -> Custom partition CSV file -> partitions/v1/4m.csv
 ```

 **编译：**
--- a/main/boards/atommatrix-echo-base/config.json
+++ b/main/boards/atommatrix-echo-base/config.json
@@ -5,7 +5,7 @@
            "name": "atommatrix-echo-base",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_4M.csv\""
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/4m.csv\""
            ]
        }
    ]
--- a/main/boards/atoms3-echo-base/README.md
+++ b/main/boards/atoms3-echo-base/README.md
@@ -33,7 +33,7 @@ Serial flasher config -> Flash size -> 8 MB
 **修改分区表：**

 ```
-Partition Table -> Custom partition CSV file -> partitions_8M.csv
+Partition Table -> Custom partition CSV file -> partitions/v1/8m.csv
 ```

 **关闭片外 PSRAM：**
--- a/main/boards/atoms3-echo-base/config.json
+++ b/main/boards/atoms3-echo-base/config.json
@@ -7,7 +7,7 @@
                "CONFIG_SPIRAM=n",
                "CONFIG_USE_AFE=n",
                "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_8M.csv\""
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/8m.csv\""
            ]
        }
    ]
--- a/main/boards/atoms3r-cam-m12-echo-base/README.md
+++ b/main/boards/atoms3r-cam-m12-echo-base/README.md
@@ -32,7 +32,7 @@ idf.py menuconfig

 - `Xiaozhi Assistant` → `Board Type` → 选择 `AtomS3R CAM/M12 + Echo Base`
 - `Xiaozhi Assistant` → `IoT Protocol` → 选择 `MCP协议` 可开启摄像头识别功能
- `Partition Table` → `Custom partition CSV file` → 删除原有内容，输入 `partitions_8M.csv`
+- `Partition Table` → `Custom partition CSV file` → 删除原有内容，输入 `partitions/v1/8m.csv`
 - `Serial flasher config` → `Flash size` → 选择 `8 MB`

 按 `S` 保存，按 `Q` 退出。
--- a/main/boards/atoms3r-cam-m12-echo-base/config.json
+++ b/main/boards/atoms3r-cam-m12-echo-base/config.json
@@ -5,7 +5,7 @@
            "name": "atoms3r-cam-m12-echo-base",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_8M.csv\""
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/8m.csv\""
            ]
        }
    ]
--- a/main/boards/atoms3r-echo-base/README.md
+++ b/main/boards/atoms3r-echo-base/README.md
@@ -27,7 +27,7 @@ Serial flasher config -> Flash size -> 8 MB
 **修改分区表：**

 ```
-Partition Table -> Custom partition CSV file -> partitions_8M.csv
+Partition Table -> Custom partition CSV file -> partitions/v1/8m.csv
 ```

 **修改 psram 配置：**
--- a/main/boards/atoms3r-echo-base/config.json
+++ b/main/boards/atoms3r-echo-base/config.json
@@ -5,7 +5,7 @@
            "name": "atoms3r-echo-base",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_8M.csv\""
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/8m.csv\""
            ]
        }
    ]
--- a/main/boards/bread-compact-esp32-lcd/config.json
+++ b/main/boards/bread-compact-esp32-lcd/config.json
@@ -5,7 +5,7 @@
            "name": "bread-compact-esp32-lcd",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_4M.csv\"",
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/4m.csv\"",
                "LCD_ST7789_240X240_7PIN=y"
            ]
        }
--- a/main/boards/bread-compact-esp32/README.md
+++ b/main/boards/bread-compact-esp32/README.md
@@ -27,7 +27,7 @@ Serial flasher config -> Flash size -> 4 MB
 **修改分区表：**

 ```
-Partition Table -> Custom partition CSV file -> partitions_4M.csv
+Partition Table -> Custom partition CSV file -> partitions/v1/4m.csv
 ```

 **编译：**
--- a/main/boards/bread-compact-esp32/config.json
+++ b/main/boards/bread-compact-esp32/config.json
@@ -5,7 +5,7 @@
            "name": "bread-compact-esp32",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_4M.csv\"",
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/4m.csv\"",
                "CONFIG_OLED_SSD1306_128X64=y"
            ]
        },
@@ -13,7 +13,7 @@
            "name": "bread-compact-esp32-128x32",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_4M.csv\"",
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/4m.csv\"",
                "CONFIG_OLED_SSD1306_128X32=y"
            ]
        }
--- a/main/boards/esp-hi/config.json
+++ b/main/boards/esp-hi/config.json
@@ -6,7 +6,7 @@
            "sdkconfig_append": [
                "CONFIG_IDF_TARGET=\"esp32c3\"",
                "CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_hi.csv\"",
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/4m_esp-hi.csv\"",
                "CONFIG_BOARD_TYPE_ESP_HI=y",
                "CONFIG_SR_WN_WN9S_HILEXIN=y",
                "CONFIG_FL_ANGLE_NEUTRAL=78",
--- a/main/boards/esp-spot-s3/README.md
+++ b/main/boards/esp-spot-s3/README.md
@@ -30,8 +30,6 @@ idf.py menuconfig
 分别配置如下选项：

 - `Xiaozhi Assistant` → `Board Type` → 选择 `ESP-Spot-S3`
- `Partition Table` → `Custom partition CSV file` → 输入 `partitions.csv`
- `Serial flasher config` → `Flash size` → 选择 `16 MB`

 按 `S` 保存，按 `Q` 退出。

--- a/main/boards/esp32-cgc-144/README.md
+++ b/main/boards/esp32-cgc-144/README.md
@@ -32,7 +32,7 @@ Serial flasher config -> Flash size -> 4 MB
 **修改分区表：**

 ```
-Partition Table -> Custom partition CSV file -> partitions_4M.csv
+Partition Table -> Custom partition CSV file -> partitions/v1/4m.csv
 ```

 **编译：**
--- a/main/boards/esp32-cgc-144/config.json
+++ b/main/boards/esp32-cgc-144/config.json
@@ -5,6 +5,8 @@
            "name": "esp32-cgc-144",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_4M.csv\""
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/4m.csv\""
+            ]
+        }
    ]
 }
--- a/main/boards/esp32-cgc/README.md
+++ b/main/boards/esp32-cgc/README.md
@@ -38,7 +38,7 @@ Serial flasher config -> Flash size -> 4 MB
 **修改分区表：**

 ```
-Partition Table -> Custom partition CSV file -> partitions_4M.csv
+Partition Table -> Custom partition CSV file -> partitions/v1/4m.csv
 ```

 **编译：**
--- a/main/boards/esp32-cgc/config.json
+++ b/main/boards/esp32-cgc/config.json
@@ -5,7 +5,7 @@
            "name": "esp32-cgc",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_4M.csv\"",
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/4m.csv\"",
                "CONFIG_LCD_ST7735_128X128=y"
            ]
        }
--- a/main/boards/kevin-c3/config.json
+++ b/main/boards/kevin-c3/config.json
@@ -3,7 +3,11 @@
    "builds": [
        {
            "name": "kevin-c3",
-            "sdkconfig_append": []
+            "sdkconfig_append": [
+                "CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=n",
+                "CONFIG_LWIP_IPV6=n",
+                "CONFIG_USE_ESP_WAKE_WORD=y"
+            ]
        }
    ]
 }
--- a/main/boards/lichuang-c3-dev/README.md
+++ b/main/boards/lichuang-c3-dev/README.md
@@ -7,5 +7,5 @@
 ```
 Partition Table  --->
  Partition Table (Custom partition table CSV)  --->
-  (partitions_8M.csv) Custom partition CSV file
+  (partitions/v1/8m.csv) Custom partition CSV file
 ```
--- a/main/boards/lichuang-c3-dev/config.json
+++ b/main/boards/lichuang-c3-dev/config.json
@@ -5,9 +5,10 @@
            "name": "lichuang-c3-dev",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_8M.csv\"",
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/8m.csv\"",
                "CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=n",
-                "CONFIG_LWIP_IPV6=n"
+                "CONFIG_LWIP_IPV6=n",
+                "CONFIG_USE_ESP_WAKE_WORD=y"
            ]
        }
    ]
--- a/main/boards/m5stack-core-s3/sdkconfig.cores3
+++ b/main/boards/m5stack-core-s3/sdkconfig.cores3
@@ -549,8 +549,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA_LARGE is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions/v1/16m.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions/v1/16m.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
--- a/main/boards/m5stack-tab5/sdkconfig.tab5
+++ b/main/boards/m5stack-tab5/sdkconfig.tab5
@@ -678,8 +678,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA_LARGE is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions/v1/16m.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions/v1/16m.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
--- a/main/boards/mixgo-nova/README.md
+++ b/main/boards/mixgo-nova/README.md
@@ -56,7 +56,7 @@ Component config -> ESP PSRAM -> SPI RAM config -> Mode (QUAD/OCT) -> QUAD Mode

 ```
 Serial flasher config -> Flash size -> 8 MB
-Partition Table -> Custom partition CSV file -> partitions_8M.csv
+Partition Table -> Custom partition CSV file -> partitions/v1/8m.csv
 ```

 **编译：**
--- a/main/boards/mixgo-nova/config.json
+++ b/main/boards/mixgo-nova/config.json
@@ -6,7 +6,7 @@
            "sdkconfig_append": [
                "CONFIG_SPIRAM_MODE_QUAD=y",
                "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_8M.csv\"",
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/8m.csv\"",
                "CONFIG_LCD_ST7735_128X160=y"
            ]
        }
--- a/main/boards/movecall-cuican-esp32s3/README.md
+++ b/main/boards/movecall-cuican-esp32s3/README.md
@@ -22,7 +22,7 @@ Serial flasher config -> Flash size -> 8 MB
 ### 分区表配置：

 ```
-Partition Table -> Custom partition CSV file -> partitions_8M.csv
+Partition Table -> Custom partition CSV file -> partitions/v1/8m.csv
 ```

 ### 开发板选择：
--- a/main/boards/movecall-cuican-esp32s3/config.json
+++ b/main/boards/movecall-cuican-esp32s3/config.json
@@ -5,7 +5,7 @@
            "name": "movecall-cuican-esp32s3",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_8M.csv\"",
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/8m.csv\"",
                "CONFIG_COMPILER_OPTIMIZATION_SIZE=y"  
            ]
        }
--- a/main/boards/sensecap-watcher/config.json
+++ b/main/boards/sensecap-watcher/config.json
@@ -5,7 +5,7 @@
            "name": "sensecap-watcher",
            "sdkconfig_append": [
                "CONFIG_ESPTOOLPY_FLASHSIZE_32MB=y",
-                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_32M_sensecap.csv\"",
+                "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/32m.csv\"",
                "CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH=y",
                "CONFIG_ESPTOOLPY_FLASH_MODE_AUTO_DETECT=n",
                "CONFIG_IDF_EXPERIMENTAL_FEATURES=y"
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@ -14,7 +14,7 @@ dependencies:
  78/esp_lcd_nv3023: ~1.0.0
  78/esp-wifi-connect: ~2.4.2
  78/esp-opus-encoder: ~2.3.3
-  78/esp-ml307: ~2.1.3
+  78/esp-ml307: ~2.1.4
  78/xiaozhi-fonts: ~1.3.2
  espressif/led_strip: ^2.5.5
  espressif/esp_codec_dev: ~1.3.2
--- a/main/ota.cc
+++ b/main/ota.cc
@@ -270,6 +270,11 @@ void Ota::Upgrade(const std::string& firmware_url) {
        return;
    }

+    if (http->GetStatusCode() != 200) {
+        ESP_LOGE(TAG, "Failed to get firmware, status code: %d", http->GetStatusCode());
+        return;
+    }
+
    size_t content_length = http->GetBodyLength();
    if (content_length == 0) {
        ESP_LOGE(TAG, "Failed to get content length");
--- a/partitions/v1/16m.csv
+++ b/partitions/v1/16m.csv
--- a/partitions_32M_sensecap.csv
+++ b/partitions_32M_sensecap.csv
--- a/partitions/v1/4m.csv
+++ b/partitions/v1/4m.csv
--- a/partitions/v1/4m_esp-hi.csv
+++ b/partitions/v1/4m_esp-hi.csv
--- a/partitions/v1/8m.csv
+++ b/partitions/v1/8m.csv
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -10,7 +10,7 @@ CONFIG_HTTPD_MAX_REQ_HDR_LEN=2048
 CONFIG_HTTPD_MAX_URI_LEN=2048

 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions/v1/16m.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000

 CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
--- a/sdkconfig.defaults.esp32p4
+++ b/sdkconfig.defaults.esp32p4
@@ -1,8 +1,6 @@
 CONFIG_IDF_TARGET="esp32p4"
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y

 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_SPEED_200M=y