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

ajust code style

Browse Source
This commit is contained in:
Terrence
2025-01-23 21:51:59 +08:00
parent e1ff22e4d6
commit ea605a8e44
5 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/audio_codecs/tcircles3_audio_codec.cc
View File

@@ -11,7 +11,7 @@ static const char TAG[] = "Tcircles3AudioCodec";
Tcircles3AudioCodec::Tcircles3AudioCodec(int input_sample_rate, int output_sample_rate,
gpio_num_t mic_bclk, gpio_num_t mic_ws, gpio_num_t mic_data,
gpio_num_t spkr_bclk, gpio_num_t spkr_lrclk, gpio_num_t spkr_data,
bool input_reference){
bool input_reference) {
duplex_ = true; // 是否双工
input_reference_ = input_reference; // 是否使用参考输入，实现回声消除
input_channels_ = input_reference_ ? 2 : 1; // 输入通道数
@@ -34,7 +34,7 @@ Tcircles3AudioCodec::Tcircles3AudioCodec(int input_sample_rate, int output_sampl
ESP_LOGI(TAG, "Tcircles3AudioCodec initialized");
}
Tcircles3AudioCodec::~Tcircles3AudioCodec(){
Tcircles3AudioCodec::~Tcircles3AudioCodec() {
audio_codec_delete_codec_if(in_codec_if_);
audio_codec_delete_ctrl_if(in_ctrl_if_);
audio_codec_delete_codec_if(out_codec_if_);
@@ -44,7 +44,7 @@ Tcircles3AudioCodec::~Tcircles3AudioCodec(){
}
void Tcircles3AudioCodec::CreateVoiceHardware(gpio_num_t mic_bclk, gpio_num_t mic_ws, gpio_num_t mic_data,
gpio_num_t spkr_bclk, gpio_num_t spkr_lrclk, gpio_num_t spkr_data){
gpio_num_t spkr_bclk, gpio_num_t spkr_lrclk, gpio_num_t spkr_data) {
i2s_chan_config_t mic_chan_config = I2S_CHANNEL_DEFAULT_CONFIG(I2S_NUM_0, I2S_ROLE_MASTER);
mic_chan_config.auto_clear = true; // Auto clear the legacy data in the DMA buffer
@@ -54,7 +54,7 @@ void Tcircles3AudioCodec::CreateVoiceHardware(gpio_num_t mic_bclk, gpio_num_t mi
ESP_ERROR_CHECK(i2s_new_channel(&mic_chan_config, NULL, &rx_handle_));
ESP_ERROR_CHECK(i2s_new_channel(&spkr_chan_config, &tx_handle_, NULL));
i2s_std_config_t mic_config ={
i2s_std_config_t mic_config = {
.clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(static_cast<uint32_t>(input_sample_rate_)),
.slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(I2S_DATA_BIT_WIDTH_16BIT, I2S_SLOT_MODE_STEREO),
.gpio_cfg ={
@@ -63,7 +63,7 @@ void Tcircles3AudioCodec::CreateVoiceHardware(gpio_num_t mic_bclk, gpio_num_t mi
.ws = mic_ws,
.dout = I2S_GPIO_UNUSED,
.din = mic_data,
.invert_flags ={
.invert_flags = {
.mclk_inv = false,
.bclk_inv = false,
.ws_inv = false,
@@ -71,7 +71,7 @@ void Tcircles3AudioCodec::CreateVoiceHardware(gpio_num_t mic_bclk, gpio_num_t mi
}
};
i2s_std_config_t spkr_config ={
i2s_std_config_t spkr_config = {
.clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(static_cast<uint32_t>(11025)),
.slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(I2S_DATA_BIT_WIDTH_16BIT, I2S_SLOT_MODE_STEREO),
.gpio_cfg ={
@@ -80,7 +80,7 @@ void Tcircles3AudioCodec::CreateVoiceHardware(gpio_num_t mic_bclk, gpio_num_t mi
.ws = spkr_lrclk,
.dout = spkr_data,
.din = I2S_GPIO_UNUSED,
.invert_flags ={
.invert_flags = {
.mclk_inv = false,
.bclk_inv = false,
.ws_inv = false
@@ -93,19 +93,16 @@ void Tcircles3AudioCodec::CreateVoiceHardware(gpio_num_t mic_bclk, gpio_num_t mi
ESP_LOGI(TAG, "Voice hardware created");
}
void Tcircles3AudioCodec::SetOutputVolume(int volume){
void Tcircles3AudioCodec::SetOutputVolume(int volume) {
volume_ = volume;
AudioCodec::SetOutputVolume(volume);
}
void Tcircles3AudioCodec::EnableInput(bool enable){
if (enable){
}else{
}
void Tcircles3AudioCodec::EnableInput(bool enable) {
AudioCodec::EnableInput(enable);
}
void Tcircles3AudioCodec::EnableOutput(bool enable){
void Tcircles3AudioCodec::EnableOutput(bool enable) {
if (enable){
gpio_set_level(GPIO_NUM_45, 1);
}else{

3
main/audio_codecs/tcircles3_audio_codec.h
View File

@@ -6,8 +6,7 @@
#include <esp_codec_dev.h>
#include <esp_codec_dev_defaults.h>
class Tcircles3AudioCodec : public AudioCodec
{
class Tcircles3AudioCodec : public AudioCodec {
private:
const audio_codec_data_if_t *data_if_ = nullptr;
const audio_codec_ctrl_if_t *out_ctrl_if_ = nullptr;