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

Merge pull request #2890 from jepler/nrf-audio-tick

Browse Source 
nrf: put supervisor enable/disable tick in place
This commit is contained in:
Scott Shawcroft 2020-06-01 15:51:22 -07:00 committed by GitHub
commit 4146d6f872
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@
#include "common-hal/audiobusio/I2SOut.h" #include "common-hal/audiobusio/I2SOut.h"
#include "shared-bindings/audiobusio/I2SOut.h" #include "shared-bindings/audiobusio/I2SOut.h"
#include "shared-module/audiocore/__init__.h" #include "shared-module/audiocore/__init__.h"
#include "supervisor/shared/tick.h"
#include "py/obj.h" #include "py/obj.h"
#include "py/runtime.h" #include "py/runtime.h"
@ -158,7 +159,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 (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);
@ -211,6 +212,8 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t* self,
NRF_I2S->CONFIG.ALIGN = I2S_CONFIG_ALIGN_ALIGN_Left; NRF_I2S->CONFIG.ALIGN = I2S_CONFIG_ALIGN_ALIGN_Left;
NRF_I2S->CONFIG.FORMAT = left_justified ? I2S_CONFIG_FORMAT_FORMAT_Aligned NRF_I2S->CONFIG.FORMAT = left_justified ? I2S_CONFIG_FORMAT_FORMAT_Aligned
: I2S_CONFIG_FORMAT_FORMAT_I2S; : I2S_CONFIG_FORMAT_FORMAT_I2S;
supervisor_enable_tick();
} }
bool common_hal_audiobusio_i2sout_deinited(audiobusio_i2sout_obj_t* self) { bool common_hal_audiobusio_i2sout_deinited(audiobusio_i2sout_obj_t* self) {
@ -230,6 +233,7 @@ void common_hal_audiobusio_i2sout_deinit(audiobusio_i2sout_obj_t* self) {
reset_pin_number(self->data_pin_number); reset_pin_number(self->data_pin_number);
self->data_pin_number = 0xff; self->data_pin_number = 0xff;
instance = NULL; instance = NULL;
supervisor_disable_tick();
} }
void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t* self, void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t* self,
@ -340,5 +344,8 @@ void i2s_reset(void) {
NRF_I2S->PSEL.LRCK = 0xFFFFFFFF; NRF_I2S->PSEL.LRCK = 0xFFFFFFFF;
NRF_I2S->PSEL.SDOUT = 0xFFFFFFFF; NRF_I2S->PSEL.SDOUT = 0xFFFFFFFF;
NRF_I2S->PSEL.SDIN = 0xFFFFFFFF; NRF_I2S->PSEL.SDIN = 0xFFFFFFFF;
if (instance) {
supervisor_disable_tick();
}
instance = NULL; instance = NULL;
} }

6
ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
View File

@ -36,6 +36,7 @@
#include "shared-bindings/audiopwmio/PWMAudioOut.h" #include "shared-bindings/audiopwmio/PWMAudioOut.h"
#include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/__init__.h"
#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Pin.h"
#include "supervisor/shared/tick.h"
#include "supervisor/shared/translate.h" #include "supervisor/shared/translate.h"
// TODO: This should be the same size as PWMOut.c:pwms[], but there's no trivial way to accomplish that // TODO: This should be the same size as PWMOut.c:pwms[], but there's no trivial way to accomplish that
@ -67,6 +68,7 @@ STATIC void activate_audiopwmout_obj(audiopwmio_pwmaudioout_obj_t *self) {
for (size_t i=0; i < MP_ARRAY_SIZE(active_audio); i++) { for (size_t i=0; i < MP_ARRAY_SIZE(active_audio); i++) {
if (!active_audio[i]) { if (!active_audio[i]) {
active_audio[i] = self; active_audio[i] = self;
supervisor_enable_tick();
break; break;
} }
} }
@ -77,12 +79,16 @@ STATIC void deactivate_audiopwmout_obj(audiopwmio_pwmaudioout_obj_t *self) {
for (size_t i=0; i < MP_ARRAY_SIZE(active_audio); i++) { for (size_t i=0; i < MP_ARRAY_SIZE(active_audio); i++) {
if (active_audio[i] == self) { if (active_audio[i] == self) {
active_audio[i] = NULL; active_audio[i] = NULL;
supervisor_disable_tick();
} }
} }
} }
void audiopwmout_reset() { void audiopwmout_reset() {
for (size_t i=0; i < MP_ARRAY_SIZE(active_audio); i++) { for (size_t i=0; i < MP_ARRAY_SIZE(active_audio); i++) {
if (active_audio[i]) {
supervisor_disable_tick();
}
active_audio[i] = NULL; active_audio[i] = NULL;
} }
} }