verachen/xiaozhi-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: adapt to esp_codec_dev>=1.5.5 (#1878)

Browse Source 
* feat: adapt to esp_codec_dev>=1.5.5

* fix: fix board config resolution in release script
This commit is contained in:
laride
2026-03-26 23:56:45 +08:00
committed by GitHub
parent 6d51b9dbde
commit 0f3199a812
7 changed files with 142 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
main/boards/esp-hi/adc_pdm_audio_codec.cc
View File

@ -5,7 +5,6 @@
#include <driver/i2c.h>
#include <driver/i2c_master.h>
#include <driver/i2s_tdm.h>
#include "adc_mic.h"
#include "driver/i2s_pdm.h"
#include "soc/gpio_sig_map.h"
#include "soc/io_mux_reg.h"
@ -44,18 +43,19 @@ AdcPdmAudioCodec::AdcPdmAudioCodec(int input_sample_rate, int output_sample_rate
input_sample_rate_ = input_sample_rate;
output_sample_rate_ = output_sample_rate;
uint8_t adc_channel[1] = {0};
adc_channel[0] = adc_mic_channel;
audio_codec_adc_cfg_t cfg = {
.handle = NULL,
.max_store_buf_size = 1024 * 2,
.conv_frame_size = 1024,
.unit_id = ADC_UNIT_1,
.adc_channel_list = adc_channel,
.adc_channel_num = sizeof(adc_channel) / sizeof(adc_channel[0]),
.sample_rate_hz = (uint32_t)input_sample_rate,
};
audio_codec_adc_cfg_t cfg = {};
cfg.handle = NULL;
cfg.continuous_cfg.max_store_buf_size = 1024 * 2;
cfg.continuous_cfg.conv_frame_size = 1024;
cfg.continuous_cfg.sample_freq_hz = (uint32_t)input_sample_rate;
cfg.continuous_cfg.conv_mode = ADC_CONV_SINGLE_UNIT_1;
cfg.continuous_cfg.format = ADC_DIGI_OUTPUT_FORMAT_TYPE2;
cfg.continuous_cfg.pattern_num = 1;
cfg.continuous_cfg.cfg_mode = AUDIO_CODEC_ADC_CFG_MODE_SINGLE_UNIT;
cfg.continuous_cfg.cfg.single_unit.unit_id = ADC_UNIT_1;
cfg.continuous_cfg.cfg.single_unit.atten = ADC_ATTEN_DB_12;
cfg.continuous_cfg.cfg.single_unit.bit_width = ADC_BITWIDTH_12;
cfg.continuous_cfg.cfg.single_unit.channel_id[0] = (uint8_t)adc_mic_channel;
const audio_codec_data_if_t *adc_if = audio_codec_new_adc_data(&cfg);
esp_codec_dev_cfg_t codec_dev_cfg = {

3
main/boards/esp-hi/config.json
View File

@ -26,7 +26,8 @@
"CONFIG_NEWLIB_NANO_FORMAT=y",
"CONFIG_ESP_CONSOLE_NONE=y",
"CONFIG_USE_ESP_WAKE_WORD=y",
"CONFIG_COMPILER_OPTIMIZATION_SIZE=y"
"CONFIG_COMPILER_OPTIMIZATION_SIZE=y",
"CONFIG_CODEC_DATA_ADC_SUPPORT=y"
]
}
]

26
main/boards/esp-sensairshuttle/adc_pdm_audio_codec.cc
View File

@ -5,7 +5,6 @@
#include <driver/i2c.h>
#include <driver/i2c_master.h>
#include <driver/i2s_tdm.h>
#include "adc_mic.h"
#include "driver/i2s_pdm.h"
#include "soc/gpio_sig_map.h"
#include "soc/io_mux_reg.h"
@ -44,18 +43,19 @@ AdcPdmAudioCodec::AdcPdmAudioCodec(int input_sample_rate, int output_sample_rate
input_sample_rate_ = input_sample_rate;
output_sample_rate_ = output_sample_rate;
uint8_t adc_channel[1] = {0};
adc_channel[0] = adc_mic_channel;
audio_codec_adc_cfg_t cfg = {
.handle = NULL,
.max_store_buf_size = 1024 * 2,
.conv_frame_size = 1024,
.unit_id = ADC_UNIT_1,
.adc_channel_list = adc_channel,
.adc_channel_num = sizeof(adc_channel) / sizeof(adc_channel[0]),
.sample_rate_hz = (uint32_t)input_sample_rate,
};
audio_codec_adc_cfg_t cfg = {};
cfg.handle = NULL;
cfg.continuous_cfg.max_store_buf_size = 1024 * 2;
cfg.continuous_cfg.conv_frame_size = 1024;
cfg.continuous_cfg.sample_freq_hz = (uint32_t)input_sample_rate;
cfg.continuous_cfg.conv_mode = ADC_CONV_SINGLE_UNIT_1;
cfg.continuous_cfg.format = ADC_DIGI_OUTPUT_FORMAT_TYPE2;
cfg.continuous_cfg.pattern_num = 1;
cfg.continuous_cfg.cfg_mode = AUDIO_CODEC_ADC_CFG_MODE_SINGLE_UNIT;
cfg.continuous_cfg.cfg.single_unit.unit_id = ADC_UNIT_1;
cfg.continuous_cfg.cfg.single_unit.atten = ADC_ATTEN_DB_12;
cfg.continuous_cfg.cfg.single_unit.bit_width = ADC_BITWIDTH_12;
cfg.continuous_cfg.cfg.single_unit.channel_id[0] = (uint8_t)adc_mic_channel;
const audio_codec_data_if_t *adc_if = audio_codec_new_adc_data(&cfg);
esp_codec_dev_cfg_t codec_dev_cfg = {

3
main/boards/esp-sensairshuttle/config.json
View File

@ -21,7 +21,8 @@
"CONFIG_SR_WN_WN9S_HIESP=y",
"CONFIG_USE_EMOTE_MESSAGE_STYLE=y",
"CONFIG_FLASH_CUSTOM_ASSETS=y",
"CONFIG_CUSTOM_ASSETS_FILE=\"https://dl.espressif.com/AE/wn9_nihaoxiaozhi_tts-font_puhui_common_20_4-echoear.bin\""
"CONFIG_CUSTOM_ASSETS_FILE=\"https://dl.espressif.com/AE/wn9_nihaoxiaozhi_tts-font_puhui_common_20_4-echoear.bin\"",
"CONFIG_CODEC_DATA_ADC_SUPPORT=y"
]
}
]

3
main/idf_component.yml
View File

@ -30,7 +30,7 @@ dependencies:
- if: target not in [esp32]
78/xiaozhi-fonts: ~1.6.0
espressif/led_strip: ~3.0.2
espressif/esp_codec_dev: ~1.5.4
espressif/esp_codec_dev: ~1.5.6
espressif/esp-sr: ~2.3.0
espressif/button: ~4.1.5
espressif/knob: ^1.0.0
@ -57,7 +57,6 @@ dependencies:
espressif/esp_io_expander_tca95xx_16bit: ^2.0.0
espressif2022/image_player: ^1.1.1
espressif2022/esp_emote_expression: ^0.1.0
espressif/adc_mic: ^0.2.1
espressif/esp_mmap_assets: ^1.3.2
txp666/otto-emoji-gif-component:
version: ^1.1.1