diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 02d5bde8..773bd1ab 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,6 +1,5 @@ set(SOURCES "audio_codecs/audio_codec.cc" "audio_codecs/no_audio_codec.cc" - "audio_codecs/adc_pdm_audio_codec.cc" "audio_codecs/box_audio_codec.cc" "audio_codecs/es8311_audio_codec.cc" "audio_codecs/es8374_audio_codec.cc" diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 37137a96..ac973562 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -38,8 +38,16 @@ choice BOARD_TYPE 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_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_ESP_BOX_3 bool "ESP BOX 3" config BOARD_TYPE_ESP_BOX @@ -56,6 +64,8 @@ choice BOARD_TYPE bool "Kevin SP V3开发板" config BOARD_TYPE_KEVIN_SP_V4_DEV bool "Kevin SP V4开发板" + config BOARD_TYPE_ESP32_CGC + bool "ESP32 CGC" config BOARD_TYPE_KEVIN_YUYING_313LCD bool "鱼鹰科技3.13LCD开发板" config BOARD_TYPE_LICHUANG_DEV @@ -86,16 +96,6 @@ choice BOARD_TYPE 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_ESP_HI - bool "ESP-HI" config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_8 bool "Waveshare ESP32-S3-Touch-AMOLED-1.8" config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75 @@ -127,9 +127,9 @@ choice BOARD_TYPE 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衍生版" + bool "Movecall Moji 小智AI衍生版" config BOARD_TYPE_MOVECALL_CUICAN_ESP32S3 - bool "Movecall CuiCan 璀璨·AI吊坠" + bool "Movecall CuiCan 璀璨·AI吊坠" config BOARD_TYPE_ATK_DNESP32S3 bool "正点原子DNESP32S3开发板" config BOARD_TYPE_ATK_DNESP32S3_BOX diff --git a/main/audio_codecs/adc_pdm_audio_codec.cc b/main/boards/esp-hi/adc_pdm_audio_codec.cc similarity index 98% rename from main/audio_codecs/adc_pdm_audio_codec.cc rename to main/boards/esp-hi/adc_pdm_audio_codec.cc index 1344868e..3487bf94 100644 --- a/main/audio_codecs/adc_pdm_audio_codec.cc +++ b/main/boards/esp-hi/adc_pdm_audio_codec.cc @@ -109,7 +109,7 @@ AdcPdmAudioCodec::AdcPdmAudioCodec(int input_sample_rate, int output_sample_rate if(pdm_speak_n != GPIO_NUM_NC){ PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[pdm_speak_n], PIN_FUNC_GPIO); gpio_set_direction(pdm_speak_n, GPIO_MODE_OUTPUT); - esp_rom_gpio_connect_out_signal(pdm_speak_n,I2SO_SD_OUT_IDX,1,0); //反转输出 SD OUT 信号 + esp_rom_gpio_connect_out_signal(pdm_speak_n, I2SO_SD_OUT_IDX, 1, 0); //反转输出 SD OUT 信号 gpio_set_drive_capability(pdm_speak_n, GPIO_DRIVE_CAP_0); } ESP_LOGI(TAG, "AdcPdmAudioCodec initialized"); diff --git a/main/audio_codecs/adc_pdm_audio_codec.h b/main/boards/esp-hi/adc_pdm_audio_codec.h similarity index 100% rename from main/audio_codecs/adc_pdm_audio_codec.h rename to main/boards/esp-hi/adc_pdm_audio_codec.h diff --git a/main/boards/esp-hi/esp_hi.cc b/main/boards/esp-hi/esp_hi.cc index 7de5cb58..6c8d0a5b 100644 --- a/main/boards/esp-hi/esp_hi.cc +++ b/main/boards/esp-hi/esp_hi.cc @@ -1,5 +1,5 @@ #include "wifi_board.h" -#include "audio_codecs/adc_pdm_audio_codec.h" +#include "adc_pdm_audio_codec.h" #include "application.h" #include "button.h" #include "config.h" diff --git a/main/idf_component.yml b/main/idf_component.yml index 5bedf574..ad108cd6 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -13,8 +13,8 @@ dependencies: espressif/esp_lcd_panel_io_additions: ^1.0.1 78/esp_lcd_nv3023: ~1.0.0 78/esp-wifi-connect: ~2.4.2 - 78/esp-opus-encoder: ~2.3.2 - 78/esp-ml307: ~2.1.2 + 78/esp-opus-encoder: ~2.3.3 + 78/esp-ml307: ~2.1.3 78/xiaozhi-fonts: ~1.3.2 espressif/led_strip: ^2.5.5 espressif/esp_codec_dev: ~1.3.2