Skip to content

Conversation

@yusuhua
Copy link
Contributor

@yusuhua yusuhua commented May 8, 2025

@78 78 merged commit 7ea6714 into 78:main May 8, 2025
1 check passed
Wvirgil123 added a commit to Seeed-Studio/xiaozhi-esp32 that referenced this pull request May 14, 2025
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants