Merge branch 'main' into watcher-en

* main: (44 commits)
  Add session_id to websocket message
  chore: 更新 .gitignore 文件 (78#591)
  fix unused variable warning
  Fix Initialize()
  Lilygo T-CameraPlus-S3 关闭延时关机以及削平电池百分比 (78#598)
  Add server AEC option
  lilygo-t-cameraplus-s3 add pmic (78#586)
  fixbug: button driver cannot be in stack memory
  Default realtime chat for esp-box-3, lichuang-dev
  Double click BOOT to switch 4G/Wi-Fi
  Default press time to 0
  Bump to 1.6.2
  Add CEREG to board JSON for 4G LBS to fix weather location
  Upgrade component versions
  Use English output log
  解决部分esp32-s3-touch-lcd-3.5开机黑屏不显示的问题 (78#581)
  Upgrade components
  Adjust LCD display
  Remove warnings
  【需求】双网络类型通过长按boot切换网络 (78#520)
  ...

# Conflicts:
#	main/Kconfig.projbuild
#	main/boards/common/wifi_board.cc
#	main/protocols/websocket_protocol.cc

Author: Wvirgil123

.gitignore

@@ -10,4 +10,5 @@ dependencies.lock
 .env
 releases/
 main/assets/lang_config.h
-.DS_Store
+.DS_Store
+.cache

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.5.9")
+set(PROJECT_VER "1.6.2")
 
 # Add this line to disable the specific warning
 add_compile_options(-Wno-missing-field-initializers)

docs/websocket.md

@@ -13,7 +13,7 @@
 
 2. **建立 WebSocket 连接**  
    - 当设备需要开始语音会话时（例如用户唤醒、手动按键触发等），调用 `OpenAudioChannel()`：  
-     - 根据编译配置获取 WebSocket URL（`CONFIG_WEBSOCKET_URL`）  
+     - 根据配置获取 WebSocket URL
      - 设置若干请求头（`Authorization`, `Protocol-Version`, `Device-Id`, `Client-Id`）  
      - 调用 `Connect()` 与服务器建立 WebSocket 连接  
 

main/CMakeLists.txt

@@ -2,6 +2,7 @@ set(SOURCES "audio_codecs/audio_codec.cc"
             "audio_codecs/no_audio_codec.cc"
             "audio_codecs/box_audio_codec.cc"
             "audio_codecs/es8311_audio_codec.cc"
+            "audio_codecs/es8374_audio_codec.cc"
             "audio_codecs/es8388_audio_codec.cc"
             "led/single_led.cc"
             "led/circular_strip.cc"
@@ -10,6 +11,8 @@ set(SOURCES "audio_codecs/audio_codec.cc"
             "display/lcd_display.cc"
             "display/oled_display.cc"
             "protocols/protocol.cc"
+            "protocols/mqtt_protocol.cc"
+            "protocols/websocket_protocol.cc"
             "iot/thing.cc"
             "iot/thing_manager.cc"
             "system_info.cc"
@@ -108,6 +111,10 @@ elseif(CONFIG_BOARD_TYPE_LILYGO_T_CIRCLE_S3)
     set(BOARD_TYPE "lilygo-t-circle-s3")
 elseif(CONFIG_BOARD_TYPE_LILYGO_T_CAMERAPLUS_S3)
     set(BOARD_TYPE "lilygo-t-cameraplus-s3")
+elseif(CONFIG_BOARD_TYPE_LILYGO_T_DISPLAY_S3_PRO_MVSRLORA)
+    set(BOARD_TYPE "lilygo-t-display-s3-pro-mvsrlora")
+elseif(CONFIG_BOARD_TYPE_LILYGO_T_DISPLAY_S3_PRO_MVSRLORA_NO_BATTERY)
+    set(BOARD_TYPE "lilygo-t-display-s3-pro-mvsrlora")
 elseif(CONFIG_BOARD_TYPE_MOVECALL_MOJI_ESP32S3)
     set(BOARD_TYPE "movecall-moji-esp32s3")
     elseif(CONFIG_BOARD_TYPE_MOVECALL_CUICAN_ESP32S3)
@@ -116,6 +123,12 @@ elseif(CONFIG_BOARD_TYPE_ATK_DNESP32S3)
     set(BOARD_TYPE "atk-dnesp32s3")
 elseif(CONFIG_BOARD_TYPE_ATK_DNESP32S3_BOX)
     set(BOARD_TYPE "atk-dnesp32s3-box")
+elseif(CONFIG_BOARD_TYPE_ATK_DNESP32S3_BOX0)
+    set(BOARD_TYPE "atk-dnesp32s3-box0")
+elseif(CONFIG_BOARD_TYPE_ATK_DNESP32S3M_WIFI)
+    set(BOARD_TYPE "atk-dnesp32s3m-wifi")
+elseif(CONFIG_BOARD_TYPE_ATK_DNESP32S3M_4G)
+    set(BOARD_TYPE "atk-dnesp32s3m-4g")
 elseif(CONFIG_BOARD_TYPE_DU_CHATX)
     set(BOARD_TYPE "du-chatx")
 elseif(CONFIG_BOARD_TYPE_ESP32S3_Taiji_Pi)
@@ -136,23 +149,23 @@ elseif(CONFIG_BOARD_TYPE_SENSECAP_WATCHER)
     set(BOARD_TYPE "sensecap-watcher")
 elseif(CONFIG_BOARD_TYPE_DOIT_S3_AIBOX)
     set(BOARD_TYPE "doit-s3-aibox")
+elseif(CONFIG_BOARD_TYPE_MIXGO_NOVA)
+    set(BOARD_TYPE "mixgo-nova")
 elseif(CONFIG_BOARD_TYPE_ESP32_CGC)
     set(BOARD_TYPE "esp32-cgc")
+elseif(CONFIG_BOARD_TYPE_ESP_S3_LCD_EV_Board)
+    set(BOARD_TYPE "esp-s3-lcd-ev-board")
 endif()
 file(GLOB BOARD_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.c
 )
 list(APPEND SOURCES ${BOARD_SOURCES})
 
-if(CONFIG_CONNECTION_TYPE_MQTT_UDP)
-    list(APPEND SOURCES "protocols/mqtt_protocol.cc")
-elseif(CONFIG_CONNECTION_TYPE_WEBSOCKET)
-    list(APPEND SOURCES "protocols/websocket_protocol.cc")
-endif()
-
 if(CONFIG_USE_AUDIO_PROCESSOR)
-    list(APPEND SOURCES "audio_processing/audio_processor.cc")
+    list(APPEND SOURCES "audio_processing/afe_audio_processor.cc")
+else()
+    list(APPEND SOURCES "audio_processing/dummy_audio_processor.cc")
 endif()
 if(CONFIG_USE_WAKE_WORD_DETECT)
     list(APPEND SOURCES "audio_processing/wake_word_detect.cc")

main/Kconfig.projbuild

@@ -1,14 +1,14 @@
 menu "Xiaozhi Assistant"
 
-config OTA_VERSION_URL
-    string "OTA Version URL"
+config OTA_URL
+    string "Default OTA URL"
     default "https://api.tenclass.net/xiaozhi/ota/"
     help
-        The application will access this URL to check for updates.
+        The application will access this URL to check for new firmwares and server address.
 
 
 choice
-    prompt "Language Selection"
+    prompt "语言选择"
     default LANGUAGE_ZH_CN
     help
         Select device display language
@@ -23,39 +23,143 @@ choice
         bool "Japanese"
 endchoice
 
-
-choice CONNECTION_TYPE
-    prompt "Connection Type"
-    default CONNECTION_TYPE_MQTT_UDP
-    help
-        网络数据传输协议
-    config CONNECTION_TYPE_MQTT_UDP
-        bool "MQTT + UDP"
-    config CONNECTION_TYPE_WEBSOCKET
-        bool "Websocket"
-endchoice
-
-config WEBSOCKET_URL
-    depends on CONNECTION_TYPE_WEBSOCKET
-    string "Websocket URL"
-    default "wss://api.tenclass.net/xiaozhi/v1/"
-    help
-        Communication with the server through websocket after wake up.
-
-config WEBSOCKET_ACCESS_TOKEN
-    depends on CONNECTION_TYPE_WEBSOCKET
-    string "Websocket Access Token"
-    default "test-token"
-    help
-        Access token for websocket communication.
-
 choice BOARD_TYPE
     prompt "Board Type"
-    default BOARD_TYPE_SENSECAP_WATCHER
+    default BOARD_TYPE_BREAD_COMPACT_WIFI
     help
         Board type. 开发板类型
+    config BOARD_TYPE_BREAD_COMPACT_WIFI
+        bool "面包板新版接线（WiFi）"
+    config BOARD_TYPE_BREAD_COMPACT_WIFI_LCD
+        bool "面包板新版接线（WiFi）+ LCD"
+    config BOARD_TYPE_BREAD_COMPACT_ML307
+        bool "面包板新版接线（ML307 AT）"
+    config BOARD_TYPE_BREAD_COMPACT_ESP32
+        bool "面包板（WiFi） ESP32 DevKit"
+    config BOARD_TYPE_BREAD_COMPACT_ESP32_LCD
+        bool "面包板（WiFi+ LCD） ESP32 DevKit"
+    config BOARD_TYPE_ESP32_CGC
+        bool "ESP32 CGC"
+    config BOARD_TYPE_ESP_BOX_3
+        bool "ESP BOX 3"
+    config BOARD_TYPE_ESP_BOX
+        bool "ESP BOX"
+    config BOARD_TYPE_ESP_BOX_LITE
+        bool "ESP BOX Lite"        
+    config BOARD_TYPE_KEVIN_BOX_1
+        bool "Kevin Box 1"
+    config BOARD_TYPE_KEVIN_BOX_2
+        bool "Kevin Box 2"
+    config BOARD_TYPE_KEVIN_C3
+        bool "Kevin C3"
+    config BOARD_TYPE_KEVIN_SP_V3_DEV
+        bool "Kevin SP V3开发板"
+    config BOARD_TYPE_KEVIN_SP_V4_DEV
+        bool "Kevin SP V4开发板"
+    config BOARD_TYPE_KEVIN_YUYING_313LCD
+        bool "鱼鹰科技3.13LCD开发板"
+    config BOARD_TYPE_LICHUANG_DEV
+        bool "立创·实战派ESP32-S3开发板"
+    config BOARD_TYPE_LICHUANG_C3_DEV
+        bool "立创·实战派ESP32-C3开发板"
+    config BOARD_TYPE_DF_K10
+        bool "DFRobot 行空板 k10"
+    config BOARD_TYPE_MAGICLICK_2P4
+        bool "神奇按钮 Magiclick_2.4"
+    config BOARD_TYPE_MAGICLICK_2P5
+        bool "神奇按钮 Magiclick_2.5"
+    config BOARD_TYPE_MAGICLICK_C3
+        bool "神奇按钮 Magiclick_C3"
+    config BOARD_TYPE_MAGICLICK_C3_V2
+        bool "神奇按钮 Magiclick_C3_v2"
+    config BOARD_TYPE_M5STACK_CORE_S3
+        bool "M5Stack CoreS3"
+    config BOARD_TYPE_ATOMS3_ECHO_BASE
+        bool "AtomS3 + Echo Base"
+    config BOARD_TYPE_ATOMS3R_ECHO_BASE
+        bool "AtomS3R + Echo Base"
+    config BOARD_TYPE_ATOMS3R_CAM_M12_ECHO_BASE
+        bool "AtomS3R CAM/M12 + Echo Base"
+    config BOARD_TYPE_ATOMMATRIX_ECHO_BASE
+        bool "AtomMatrix + Echo Base"
+    config BOARD_TYPE_XMINI_C3
+        bool "虾哥 Mini C3"
+    config BOARD_TYPE_ESP32S3_KORVO2_V3
+        bool "ESP32S3_KORVO2_V3开发板"
+    config BOARD_TYPE_ESP_SPARKBOT
+        bool "ESP-SparkBot开发板"
+    config BOARD_TYPE_ESP_SPOT_S3
+        bool "ESP-Spot-S3"
+    config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_8
+        bool "Waveshare ESP32-S3-Touch-AMOLED-1.8"
+    config BOARD_TYPE_ESP32S3_Touch_LCD_1_85C
+        bool "Waveshare ESP32-S3-Touch-LCD-1.85C"
+    config BOARD_TYPE_ESP32S3_Touch_LCD_1_85
+        bool "Waveshare ESP32-S3-Touch-LCD-1.85"
+    config BOARD_TYPE_ESP32S3_Touch_LCD_1_46
+        bool "Waveshare ESP32-S3-Touch-LCD-1.46"
+    config BOARD_TYPE_ESP32S3_Touch_LCD_3_5
+        bool "Waveshare ESP32-S3-Touch-LCD-3.5"
+    config BOARD_TYPE_TUDOUZI
+        bool "土豆子"
+    config BOARD_TYPE_LILYGO_T_CIRCLE_S3
+        bool "LILYGO T-Circle-S3"
+    config BOARD_TYPE_LILYGO_T_CAMERAPLUS_S3
+        bool "LILYGO T-CameraPlus-S3"
+    config BOARD_TYPE_LILYGO_T_DISPLAY_S3_PRO_MVSRLORA
+        bool "LILYGO T-Display-S3-Pro-MVSRLora"
+    config BOARD_TYPE_LILYGO_T_DISPLAY_S3_PRO_MVSRLORA_NO_BATTERY
+        bool "LILYGO T-Display-S3-Pro-MVSRLora_No_Battery"
+    config BOARD_TYPE_MOVECALL_MOJI_ESP32S3
+         bool "Movecall Moji 小智AI衍生版"
+    config BOARD_TYPE_MOVECALL_CUICAN_ESP32S3
+         bool "Movecall CuiCan 璀璨·AI吊坠"
+    config BOARD_TYPE_ATK_DNESP32S3
+        bool "正点原子DNESP32S3开发板"
+    config BOARD_TYPE_ATK_DNESP32S3_BOX
+        bool "正点原子DNESP32S3-BOX"
+    config BOARD_TYPE_ATK_DNESP32S3_BOX0
+        bool "正点原子DNESP32S3-BOX0"
+    config BOARD_TYPE_ATK_DNESP32S3M_WIFI
+        bool "正点原子DNESP32S3M-WIFI"
+    config BOARD_TYPE_ATK_DNESP32S3M_4G
+        bool "正点原子DNESP32S3M-4G"
+    config BOARD_TYPE_DU_CHATX
+        bool "嘟嘟开发板CHATX(wifi)"
+    config BOARD_TYPE_ESP32S3_Taiji_Pi
+        bool "太极小派esp32s3"
+    config BOARD_TYPE_XINGZHI_Cube_0_85TFT_WIFI
+        bool "无名科技星智0.85(WIFI)"
+    config BOARD_TYPE_XINGZHI_Cube_0_85TFT_ML307
+        bool "无名科技星智0.85(ML307)"
+    config BOARD_TYPE_XINGZHI_Cube_0_96OLED_WIFI
+        bool "无名科技星智0.96(WIFI)"
+    config BOARD_TYPE_XINGZHI_Cube_0_96OLED_ML307
+        bool "无名科技星智0.96(ML307)"
+    config BOARD_TYPE_XINGZHI_Cube_1_54TFT_WIFI
+        bool "无名科技星智1.54(WIFI)"
+    config BOARD_TYPE_XINGZHI_Cube_1_54TFT_ML307
+        bool "无名科技星智1.54(ML307)"
     config BOARD_TYPE_SENSECAP_WATCHER
         bool "SenseCAP Watcher"
+    config BOARD_TYPE_DOIT_S3_AIBOX
+        bool "四博智联AI陪伴盒子"
+    config BOARD_TYPE_MIXGO_NOVA
+        bool "元控·青春"
+    config BOARD_TYPE_ESP_S3_LCD_EV_Board
+        bool "乐鑫ESP S3 LCD EV Board开发板"
+endchoice
+
+choice ESP_S3_LCD_EV_Board_Version_TYPE
+    depends on BOARD_TYPE_ESP_S3_LCD_EV_Board
+    prompt "EV_BOARD Type"
+    default ESP_S3_LCD_EV_Board_1p4
+    help
+        开发板硬件版本型号选择
+    config ESP_S3_LCD_EV_Board_1p4
+        bool "乐鑫ESP32_S3_LCD_EV_Board-MB_V1.4"
+    config ESP_S3_LCD_EV_Board_1p5
+        bool "乐鑫ESP32_S3_LCD_EV_Board-MB_V1.5"
 endchoice
 
 choice DISPLAY_OLED_TYPE
@@ -125,30 +229,37 @@ choice DISPLAY_ESP32S3_KORVO2_V3
 endchoice
 
 config USE_WECHAT_MESSAGE_STYLE
-    bool "Use WeChat chat interface style"
+    bool "使用微信聊天界面风格"
     default n
     help
-        Use WeChat chat interface style
+        使用微信聊天界面风格
 
 config USE_WAKE_WORD_DETECT
-    bool "Enable wake word detection"
+    bool "启用唤醒词检测"
     default y
     depends on IDF_TARGET_ESP32S3 && SPIRAM
     help
-        Requires ESP32 S3 and AFE support
+        需要 ESP32 S3 与 AFE 支持
 
 config USE_AUDIO_PROCESSOR
-    bool "Enable audio noise reduction and gain processing"
+    bool "启用音频降噪、增益处理"
     default y
     depends on IDF_TARGET_ESP32S3 && SPIRAM
     help
-        Requires ESP32 S3 and AFE support
+        需要 ESP32 S3 与 AFE 支持
 
-config USE_REALTIME_CHAT
-    bool "Enable real-time conversation mode with barge-in (requires AEC support)"
+config USE_DEVICE_AEC
+    bool "在通话过程中启用设备端 AEC"
     default n
     depends on USE_AUDIO_PROCESSOR && (BOARD_TYPE_ESP_BOX_3 || BOARD_TYPE_ESP_BOX || BOARD_TYPE_ESP_BOX_LITE || BOARD_TYPE_LICHUANG_DEV || BOARD_TYPE_ESP32S3_KORVO2_V3)
     help
-        Requires ESP32 S3 and AEC to be enabled. Due to insufficient performance, it is not recommended to enable it at the same time as the WeChat chat interface style.
-        
+        因为性能不够，不建议和微信聊天界面风格同时开启
+
+config USE_SERVER_AEC
+    bool "在通话过程中启用服务器端 AEC"
+    default n
+    depends on USE_AUDIO_PROCESSOR
+    help
+        启用服务器端 AEC，需要服务器支持
+
 endmenu