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

Merge pull request #2321 from jepler/nrf-i2s-buglets 

Nrf i2s buglets
This commit is contained in:
Scott Shawcroft 2019-11-25 16:11:43 -08:00 committed by GitHub
parent d154d11911 5115fdaa6f
commit 2653455ded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/nrf/common-hal/audiobusio/I2SOut.c
View File

@ -108,6 +108,7 @@ void choose_i2s_clocking(audiobusio_i2sout_obj_t *self, uint32_t sample_rate) {
static void i2s_buffer_fill(audiobusio_i2sout_obj_t* self) { static void i2s_buffer_fill(audiobusio_i2sout_obj_t* self) {
void *buffer = self->buffers[self->next_buffer]; void *buffer = self->buffers[self->next_buffer];
void *buffer_start = buffer;
NRF_I2S->TXD.PTR = (uintptr_t)buffer; NRF_I2S->TXD.PTR = (uintptr_t)buffer;
self->next_buffer = !self->next_buffer; self->next_buffer = !self->next_buffer;
size_t bytesleft = self->buffer_length; size_t bytesleft = self->buffer_length;
@ -157,6 +158,7 @@ static void i2s_buffer_fill(audiobusio_i2sout_obj_t* self) {
// Find the last frame of real audio data and replicate its samples until // Find the last frame of real audio data and replicate its samples until
// you have 32 bits worth, which is the fundamental unit of nRF I2S DMA // you have 32 bits worth, which is the fundamental unit of nRF I2S DMA
if(buffer != buffer_start) {
if (self->bytes_per_sample == 1 && self->channel_count == 1) { if (self->bytes_per_sample == 1 && self->channel_count == 1) {
// For 8-bit mono, 4 copies of the final sample are required // For 8-bit mono, 4 copies of the final sample are required
self->hold_value = 0x01010101 * *(uint8_t*)(buffer-1); self->hold_value = 0x01010101 * *(uint8_t*)(buffer-1);
@ -167,6 +169,7 @@ static void i2s_buffer_fill(audiobusio_i2sout_obj_t* self) {
// For 8-bit stereo and 16-bit mono, 2 copies of the final sample are required // For 8-bit stereo and 16-bit mono, 2 copies of the final sample are required
self->hold_value = 0x00010001 * *(uint16_t*)(buffer-2); self->hold_value = 0x00010001 * *(uint16_t*)(buffer-2);
} }
}
// Emulate pausing and stopping by filling the DMA buffer with copies of // Emulate pausing and stopping by filling the DMA buffer with copies of
// the last sample. This includes the case where this iteration of // the last sample. This includes the case where this iteration of
@ -218,6 +221,8 @@ void common_hal_audiobusio_i2sout_deinit(audiobusio_i2sout_obj_t* self) {
if (common_hal_audiobusio_i2sout_deinited(self)) { if (common_hal_audiobusio_i2sout_deinited(self)) {
return; return;
} }
NRF_I2S->TASKS_STOP = 1;
NRF_I2S->ENABLE = I2S_ENABLE_ENABLE_Disabled;
reset_pin_number(self->bit_clock_pin_number); reset_pin_number(self->bit_clock_pin_number);
self->bit_clock_pin_number = 0xff; self->bit_clock_pin_number = 0xff;
reset_pin_number(self->word_select_pin_number); reset_pin_number(self->word_select_pin_number);

3
shared-bindings/audiobusio/I2SOut.c
View File

@ -117,7 +117,7 @@ STATIC mp_obj_t audiobusio_i2sout_make_new(const mp_obj_type_t *type, size_t n_a
assert_pin(data_obj, false); assert_pin(data_obj, false);
const mcu_pin_obj_t *data = MP_OBJ_TO_PTR(data_obj); const mcu_pin_obj_t *data = MP_OBJ_TO_PTR(data_obj);
audiobusio_i2sout_obj_t *self = m_new_obj(audiobusio_i2sout_obj_t); audiobusio_i2sout_obj_t *self = m_new_obj_with_finaliser(audiobusio_i2sout_obj_t);
self->base.type = &audiobusio_i2sout_type; self->base.type = &audiobusio_i2sout_type;
common_hal_audiobusio_i2sout_construct(self, bit_clock, word_select, data, args[ARG_left_justified].u_bool); common_hal_audiobusio_i2sout_construct(self, bit_clock, word_select, data, args[ARG_left_justified].u_bool);
@ -268,6 +268,7 @@ const mp_obj_property_t audiobusio_i2sout_paused_obj = {
STATIC const mp_rom_map_elem_t audiobusio_i2sout_locals_dict_table[] = { STATIC const mp_rom_map_elem_t audiobusio_i2sout_locals_dict_table[] = {
// Methods // Methods
{ MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&audiobusio_i2sout_deinit_obj) },
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiobusio_i2sout_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiobusio_i2sout_deinit_obj) },
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&audiobusio_i2sout___exit___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&audiobusio_i2sout___exit___obj) },