djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8571 from lookfwd/fix_8570 

Adds I2S mclk support to audiobusio.I2SOut for the Espressif port #8570
This commit is contained in:
Dan Halbert 2023-11-09 11:20:06 -05:00 committed by GitHub
parent b7b62873f8 3921520fed
commit 3ca98028f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/espressif/common-hal/audiobusio/I2SOut.c
View File

@ -49,16 +49,13 @@
void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self, void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self,
const mcu_pin_obj_t *bit_clock, const mcu_pin_obj_t *word_select, const mcu_pin_obj_t *bit_clock, const mcu_pin_obj_t *word_select,
const mcu_pin_obj_t *data, const mcu_pin_obj_t *main_clock, bool left_justified) { const mcu_pin_obj_t *data, const mcu_pin_obj_t *main_clock, bool left_justified) {
if (main_clock != NULL) {
mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_main_clock);
}
port_i2s_allocate_init(&self->i2s, left_justified); port_i2s_allocate_init(&self->i2s, left_justified);
i2s_std_config_t i2s_config = { i2s_std_config_t i2s_config = {
.clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(48000), .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(48000),
.slot_cfg = I2S_STD_MSB_SLOT_DEFAULT_CONFIG(I2S_DATA_BIT_WIDTH_16BIT, I2S_SLOT_MODE_STEREO), .slot_cfg = I2S_STD_MSB_SLOT_DEFAULT_CONFIG(I2S_DATA_BIT_WIDTH_16BIT, I2S_SLOT_MODE_STEREO),
.gpio_cfg = { .gpio_cfg = {
.mclk = I2S_GPIO_UNUSED, .mclk = main_clock != NULL ? main_clock->number : I2S_GPIO_UNUSED,
.bclk = bit_clock->number, .bclk = bit_clock->number,
.ws = word_select->number, .ws = word_select->number,
.dout = data->number, .dout = data->number,
@ -68,6 +65,7 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self,
CHECK_ESP_RESULT(i2s_channel_init_std_mode(self->i2s.handle, &i2s_config)); CHECK_ESP_RESULT(i2s_channel_init_std_mode(self->i2s.handle, &i2s_config));
self->bit_clock = bit_clock; self->bit_clock = bit_clock;
self->word_select = word_select; self->word_select = word_select;
self->mclk = main_clock;
self->data = data; self->data = data;
claim_pin(bit_clock); claim_pin(bit_clock);
claim_pin(word_select); claim_pin(word_select);
@ -97,6 +95,11 @@ void common_hal_audiobusio_i2sout_deinit(audiobusio_i2sout_obj_t *self) {
} }
self->word_select = NULL; self->word_select = NULL;
if (self->mclk) {
reset_pin_number(self->mclk->number);
}
self->mclk = NULL;
if (self->data) { if (self->data) {
reset_pin_number(self->data->number); reset_pin_number(self->data->number);
} }

1
ports/espressif/common-hal/audiobusio/I2SOut.h
View File

@ -40,6 +40,7 @@ typedef struct {
const mcu_pin_obj_t *bit_clock; const mcu_pin_obj_t *bit_clock;
const mcu_pin_obj_t *word_select; const mcu_pin_obj_t *word_select;
const mcu_pin_obj_t *data; const mcu_pin_obj_t *data;
const mcu_pin_obj_t *mclk;
} audiobusio_i2sout_obj_t; } audiobusio_i2sout_obj_t;
#endif #endif