devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

fix compiling errors

Browse Source
This commit is contained in:
Terrence
2025-05-30 01:09:51 +08:00
parent 1858da4973
commit 1a695a203b
6 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/CMakeLists.txt
View File

@@ -1,6 +1,5 @@
set(SOURCES "audio_codecs/audio_codec.cc" set(SOURCES "audio_codecs/audio_codec.cc"
"audio_codecs/no_audio_codec.cc" "audio_codecs/no_audio_codec.cc"
"audio_codecs/adc_pdm_audio_codec.cc"
"audio_codecs/box_audio_codec.cc" "audio_codecs/box_audio_codec.cc"
"audio_codecs/es8311_audio_codec.cc" "audio_codecs/es8311_audio_codec.cc"
"audio_codecs/es8374_audio_codec.cc" "audio_codecs/es8374_audio_codec.cc"

24
main/Kconfig.projbuild
View File

@@ -38,8 +38,16 @@ choice BOARD_TYPE
bool "面包板（WiFi） ESP32 DevKit" bool "面包板（WiFi） ESP32 DevKit"
config BOARD_TYPE_BREAD_COMPACT_ESP32_LCD config BOARD_TYPE_BREAD_COMPACT_ESP32_LCD
bool "面包板（WiFi+ LCD） ESP32 DevKit" bool "面包板（WiFi+ LCD） ESP32 DevKit"
config BOARD_TYPE_ESP32_CGC config BOARD_TYPE_XMINI_C3
bool "ESP32 CGC" 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_ESP_HI
bool "ESP-HI"
config BOARD_TYPE_ESP_BOX_3 config BOARD_TYPE_ESP_BOX_3
bool "ESP BOX 3" bool "ESP BOX 3"
config BOARD_TYPE_ESP_BOX config BOARD_TYPE_ESP_BOX
@@ -56,6 +64,8 @@ choice BOARD_TYPE
bool "Kevin SP V3开发板" bool "Kevin SP V3开发板"
config BOARD_TYPE_KEVIN_SP_V4_DEV config BOARD_TYPE_KEVIN_SP_V4_DEV
bool "Kevin SP V4开发板" bool "Kevin SP V4开发板"
config BOARD_TYPE_ESP32_CGC
bool "ESP32 CGC"
config BOARD_TYPE_KEVIN_YUYING_313LCD config BOARD_TYPE_KEVIN_YUYING_313LCD
bool "鱼鹰科技3.13LCD开发板" bool "鱼鹰科技3.13LCD开发板"
config BOARD_TYPE_LICHUANG_DEV config BOARD_TYPE_LICHUANG_DEV
@@ -86,16 +96,6 @@ choice BOARD_TYPE
bool "AtomS3R CAM/M12 + Echo Base" bool "AtomS3R CAM/M12 + Echo Base"
config BOARD_TYPE_ATOMMATRIX_ECHO_BASE config BOARD_TYPE_ATOMMATRIX_ECHO_BASE
bool "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_ESP_HI
bool "ESP-HI"
config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_8 config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_8
bool "Waveshare ESP32-S3-Touch-AMOLED-1.8" bool "Waveshare ESP32-S3-Touch-AMOLED-1.8"
config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75 config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75

0
main/audio_codecs/adc_pdm_audio_codec.cc → main/boards/esp-hi/adc_pdm_audio_codec.cc
View File

0
main/audio_codecs/adc_pdm_audio_codec.h → main/boards/esp-hi/adc_pdm_audio_codec.h
View File

2
main/boards/esp-hi/esp_hi.cc
View File

@@ -1,5 +1,5 @@
#include "wifi_board.h" #include "wifi_board.h"
#include "audio_codecs/adc_pdm_audio_codec.h" #include "adc_pdm_audio_codec.h"
#include "application.h" #include "application.h"
#include "button.h" #include "button.h"
#include "config.h" #include "config.h"

4
main/idf_component.yml
View File

@@ -13,8 +13,8 @@ dependencies:
espressif/esp_lcd_panel_io_additions: ^1.0.1 espressif/esp_lcd_panel_io_additions: ^1.0.1
78/esp_lcd_nv3023: ~1.0.0 78/esp_lcd_nv3023: ~1.0.0
78/esp-wifi-connect: ~2.4.2 78/esp-wifi-connect: ~2.4.2
78/esp-opus-encoder: ~2.3.2 78/esp-opus-encoder: ~2.3.3
78/esp-ml307: ~2.1.2 78/esp-ml307: ~2.1.3
78/xiaozhi-fonts: ~1.3.2 78/xiaozhi-fonts: ~1.3.2
espressif/led_strip: ^2.5.5 espressif/led_strip: ^2.5.5
espressif/esp_codec_dev: ~1.3.2 espressif/esp_codec_dev: ~1.3.2