使用中文提交内容

适配ESP-IDF v6.0编译 补充项目相关文档

* 修复16处头文件缺失、flash配置错误、WiFi断开原因码兼容问题
* 新增ESP-IDF v6.0迁移适配文档
* 更新变更日志，补充v1.0.0功能清单及v1.1.0版本规划
* 整理讨论记录，新增v6.0适配及国内大模型接入内容

main/CMakeLists.txt

@@ -6,6 +6,7 @@ idf_component_register(
         "channels/telegram/telegram_bot.c"
         "channels/feishu/feishu_bot.c"
         "llm/llm_proxy.c"
+        "llm/llm_provider.c"
         "agent/agent_loop.c"
         "agent/context_builder.c"
         "memory/memory_store.c"
@@ -24,10 +25,11 @@ idf_component_register(
         "tools/gpio_policy.c"
         "skills/skill_loader.c"
         "onboard/wifi_onboard.c"
+        "ota/ota_manager.c"
     INCLUDE_DIRS
         "."
     REQUIRES
         nvs_flash esp_wifi esp_netif esp_http_client esp_http_server
-        esp_https_ota esp_event json spiffs console vfs app_update esp-tls
+        esp_https_ota esp_event cjson spiffs console vfs app_update esp-tls
         esp_timer esp_websocket_client esp_driver_gpio
 )

main/bus/message_bus.c

@@ -1,6 +1,8 @@
 #include "message_bus.h"
 #include "mimi_config.h"
 #include "esp_log.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/queue.h"
 #include <string.h>
 
 static const char *TAG = "bus";

main/channels/telegram/telegram_bot.c

@@ -7,11 +7,14 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include "esp_log.h"
+#include "esp_err.h"
 #include "esp_timer.h"
 #include "esp_http_client.h"
 #include "esp_crt_bundle.h"
 #include "nvs.h"
 #include "cJSON.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
 
 static const char *TAG = "telegram";
 

main/cli/serial_cli.c

@@ -4,6 +4,7 @@
 #include "channels/telegram/telegram_bot.h"
 #include "channels/feishu/feishu_bot.h"
 #include "llm/llm_proxy.h"
+#include "llm/llm_provider.h"
 #include "memory/memory_store.h"
 #include "memory/session_mgr.h"
 #include "proxy/http_proxy.h"

main/gateway/ws_server.c

@@ -4,6 +4,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include "esp_log.h"
 #include "esp_http_server.h"
 #include "cJSON.h"

main/idf_component.yml

@@ -2,7 +2,7 @@
 dependencies:
   ## Required IDF version
   idf:
-    version: '>=5.5.0,<5.6.0'
+    version: ">=5.5.0,<7.0.0"
   # # Put list of dependencies here
   # # For components maintained by Espressif:
   # component: "~1.0.0"
@@ -15,3 +15,4 @@ dependencies:
   #   # All dependencies of `main` are public by default.
   #   public: true
   espressif/esp_websocket_client: ^1.4.0
+  espressif/cjson: ">=1.0.0"

main/llm/llm_provider.c

@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include "esp_log.h"
 #include "esp_err.h"
+#include "esp_http_client.h"
 
 static const char *TAG = "llm_provider";
 

main/ota/ota_manager.c

@@ -5,6 +5,7 @@
 #include "esp_http_client.h"
 #include "esp_crt_bundle.h"
 #include "esp_https_ota.h"
+#include "esp_system.h"
 
 static const char *TAG = "ota";
 

main/proxy/http_proxy.c

@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <netdb.h>
 #include <unistd.h>
 

main/tools/tool_registry.c

@@ -7,6 +7,7 @@
 #include "tools/tool_gpio.h"
 
 #include <string.h>
+#include <stdlib.h>
 #include "esp_log.h"
 #include "cJSON.h"
 

main/wifi/wifi_manager.c

@@ -8,6 +8,10 @@
 #include "esp_netif.h"
 #include "nvs_flash.h"
 #include "nvs.h"
+#include "esp_event.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/event_groups.h"
 
 static const char *TAG = "wifi";
 
@@ -20,16 +24,36 @@ static bool s_reconnect_enabled = true;
 static const char *wifi_reason_to_str(wifi_err_reason_t reason)
 {
     switch (reason) {
+#ifdef WIFI_REASON_AUTH_EXPIRE
     case WIFI_REASON_AUTH_EXPIRE: return "AUTH_EXPIRE";
+#endif
+#ifdef WIFI_REASON_AUTH_FAIL
     case WIFI_REASON_AUTH_FAIL: return "AUTH_FAIL";
+#endif
+#ifdef WIFI_REASON_ASSOC_EXPIRE
     case WIFI_REASON_ASSOC_EXPIRE: return "ASSOC_EXPIRE";
+#endif
+#ifdef WIFI_REASON_ASSOC_FAIL
     case WIFI_REASON_ASSOC_FAIL: return "ASSOC_FAIL";
+#endif
+#ifdef WIFI_REASON_HANDSHAKE_TIMEOUT
     case WIFI_REASON_HANDSHAKE_TIMEOUT: return "HANDSHAKE_TIMEOUT";
+#endif
+#ifdef WIFI_REASON_NO_AP_FOUND
     case WIFI_REASON_NO_AP_FOUND: return "NO_AP_FOUND";
+#endif
+#ifdef WIFI_REASON_BEACON_TIMEOUT
     case WIFI_REASON_BEACON_TIMEOUT: return "BEACON_TIMEOUT";
+#endif
+#ifdef WIFI_REASON_4WAY_HANDSHAKE_TIMEOUT
     case WIFI_REASON_4WAY_HANDSHAKE_TIMEOUT: return "4WAY_HANDSHAKE_TIMEOUT";
+#endif
+#ifdef WIFI_REASON_MIC_FAILURE
     case WIFI_REASON_MIC_FAILURE: return "MIC_FAILURE";
+#endif
+#ifdef WIFI_REASON_CONNECTION_FAIL
     case WIFI_REASON_CONNECTION_FAIL: return "CONNECTION_FAIL";
+#endif
     default: return "UNKNOWN";
     }
 }