fixup! added audioio to espressif

Author: MarshallMiller

locale/circuitpython.pot

@@ -218,7 +218,7 @@ msgstr ""
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
 #: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
-#: shared-module/synthio/Synthesizer.c
+#: shared-module/synthio/Biquad.c shared-module/synthio/Synthesizer.c
 msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
@@ -734,6 +734,10 @@ msgstr ""
 msgid "Can only alarm on two low pins from deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "Can't construct AudioOut because continuous channel already open"
+msgstr ""
+
 #: ports/espressif/common-hal/_bleio/Characteristic.c
 #: ports/nordic/common-hal/_bleio/Characteristic.c
 msgid "Can't set CCCD on local Characteristic"
@@ -853,6 +857,10 @@ msgstr ""
 msgid "DAC already in use"
 msgstr ""
 
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "DAC not supported"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c
 #: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c
 msgid "Data 0 pin must be byte aligned"
@@ -992,15 +1000,43 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "Failed to create continuous channels: invalid arg"
+msgstr ""
+
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "Failed to create continuous channels: invalid state"
+msgstr ""
+
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "Failed to create continuous channels: no mem"
+msgstr ""
+
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "Failed to create continuous channels: not found"
+msgstr ""
+
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "Failed to enable continuous"
+msgstr ""
+
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
 
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "Failed to register continuous events callback"
+msgstr ""
+
 #: ports/nordic/sd_mutex.c
 #, c-format
 msgid "Failed to release mutex, err 0x%04x"
 msgstr ""
 
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "Failed to start async audio"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid "Failed to write internal flash."
 msgstr ""
@@ -2384,6 +2420,10 @@ msgstr ""
 msgid "addresses is empty"
 msgstr ""
 
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "already playing"
+msgstr ""
+
 #: py/compile.c
 msgid "annotation must be an identifier"
 msgstr ""
@@ -2462,6 +2502,10 @@ msgstr ""
 msgid "attributes not supported"
 msgstr ""
 
+#: ports/espressif/common-hal/audioio/AudioOut.c
+msgid "audio format not supported"
+msgstr ""
+
 #: extmod/ulab/code/ulab_tools.c
 msgid "axis is out of bounds"
 msgstr ""
@@ -2592,7 +2636,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 

ports/espressif/common-hal/audioio/AudioOut.c

@@ -192,7 +192,7 @@ static void audioout_convert_s16s_u8s(
     *out_buffer_size = in_buffer_size / 2;
 }
 
-#define CONV_MATCH(bps,sign,ichans,ochans) ( (bps&0xf) | ((sign&0x1)<<4) | ((ichans&0x3)<<5) | ((ochans&0x3)<<7) )
+#define CONV_MATCH(bps, sign, ichans, ochans) ((bps & 0xf) | ((sign & 0x1) << 4) | ((ichans & 0x3) << 5) | ((ochans & 0x3) << 7))
 
 static audioout_sample_convert_func_t audioout_get_samples_convert_func(
     size_t in_bits_per_sample,
@@ -201,36 +201,36 @@ static audioout_sample_convert_func_t audioout_get_samples_convert_func(
     int out_channels) {
 
     switch CONV_MATCH(in_bits_per_sample, in_signed, in_channels, out_channels) {
-        case CONV_MATCH(8,false,1,1):
-	case CONV_MATCH(8,false,2,2):
+        case CONV_MATCH(8, false, 1, 1):
+        case CONV_MATCH(8, false, 2, 2):
             return audioout_convert_noop;
-        case CONV_MATCH(8,false,2,1):
+        case CONV_MATCH(8, false, 2, 1):
             return audioout_convert_u8s_u8m;
-        case CONV_MATCH(8,false,1,2):
+        case CONV_MATCH(8, false, 1, 2):
             return audioout_convert_u8m_u8s;
-        case CONV_MATCH(8,true,1,1):
+        case CONV_MATCH(8, true, 1, 1):
             return audioout_convert_s8m_u8m;
-        case CONV_MATCH(8,true,2,1):
+        case CONV_MATCH(8, true, 2, 1):
             return audioout_convert_s8s_u8m;
-        case CONV_MATCH(8,true,1,2):
+        case CONV_MATCH(8, true, 1, 2):
             return audioout_convert_s8m_u8s;
-        case CONV_MATCH(8,true,2,2):
+        case CONV_MATCH(8, true, 2, 2):
             return audioout_convert_s8s_u8s;
-        case CONV_MATCH(16,false,1,1):
+        case CONV_MATCH(16, false, 1, 1):
             return audioout_convert_u16m_u8m;
-        case CONV_MATCH(16,false,1,2):
+        case CONV_MATCH(16, false, 1, 2):
             return audioout_convert_u16m_u8s;
-        case CONV_MATCH(16,false,2,1):
+        case CONV_MATCH(16, false, 2, 1):
             return audioout_convert_u16s_u8m;
-        case CONV_MATCH(16,false,2,2):
+        case CONV_MATCH(16, false, 2, 2):
             return audioout_convert_u16s_u8s;
-        case CONV_MATCH(16,true,1,1):
+        case CONV_MATCH(16, true, 1, 1):
             return audioout_convert_s16m_u8m;
-        case CONV_MATCH(16,true,1,2):
+        case CONV_MATCH(16, true, 1, 2):
             return audioout_convert_s16m_u8s;
-        case CONV_MATCH(16,true,2,1):
+        case CONV_MATCH(16, true, 2, 1):
             return audioout_convert_s16s_u8m;
-        case CONV_MATCH(16,true,2,2):
+        case CONV_MATCH(16, true, 2, 2):
             return audioout_convert_s16s_u8s;
         default:
             mp_raise_RuntimeError(MP_ERROR_TEXT("audio format not supported"));
@@ -247,7 +247,7 @@ static bool audioout_fill_buffer(audioio_audioout_obj_t *self) {
     uint8_t dma_buf_idx = self->get_buffer_index;
 
     if (dma_buf_idx == self->put_buffer_index) {
-	return false;
+        return false;
     }
 
     self->get_buffer_index = INCREMENT_BUF_IDX(dma_buf_idx);
@@ -267,7 +267,7 @@ static bool audioout_fill_buffer(audioio_audioout_obj_t *self) {
     if (self->sample_buffer != NULL && self->sample_buffer_size > 0) {
         sample_buf = self->sample_buffer;
         sample_buf_size = self->sample_buffer_size;
-	get_buffer_result = self->sample_buffer_result;
+        get_buffer_result = self->sample_buffer_result;
     } else {
         get_buffer_result = audiosample_get_buffer(self->sample,
             single_channel_output,
@@ -320,7 +320,9 @@ static bool audioout_fill_buffer(audioio_audioout_obj_t *self) {
 }
 
 static void audioout_fill_buffers(audioio_audioout_obj_t *self) {
-    while (audioout_fill_buffer(self));
+    while (audioout_fill_buffer(self)) {
+        ;
+    }
 }
 
 static void audioout_buf_callback_fun(void *user_data) {
@@ -357,11 +359,11 @@ static void audioout_init(audioio_audioout_obj_t *self) {
     dac_continuous_config_t cfg = {
         .chan_mask = self->channel_mask,
         .desc_num = NUM_DMA_BUFFERS,
-	.buf_size = DMA_BUFFER_SIZE,
+        .buf_size = DMA_BUFFER_SIZE,
         .freq_hz = self->freq_hz,
         .offset = 0,
         .clk_src = DAC_DIGI_CLK_SRC_APLL,
-	.chan_mode = self->channel_mode,
+        .chan_mode = self->channel_mode,
     };
 
     esp_err_t ret;
@@ -381,7 +383,7 @@ static void audioout_init(audioio_audioout_obj_t *self) {
 
     dac_event_callbacks_t callbacks = {
         .on_convert_done = handle_convert_done,
-	.on_stop = NULL,
+        .on_stop = NULL,
     };
 
     ret = dac_continuous_register_event_callback(self->handle, &callbacks, (void *)self);
@@ -411,29 +413,29 @@ void common_hal_audioio_audioout_construct(audioio_audioout_obj_t *self,
      * if different pins are supplied for left and right then use true stereo.
      * if the same pin is supplied for left and right then use dual mono.
      */
-    if ( (left_channel_pin == &pin_CHANNEL_0 &&
-          right_channel_pin == &pin_CHANNEL_1) ||
-         (left_channel_pin == &pin_CHANNEL_1 &&
-          right_channel_pin == &pin_CHANNEL_0) ) {
+    if ((left_channel_pin == &pin_CHANNEL_0 &&
+         right_channel_pin == &pin_CHANNEL_1) ||
+        (left_channel_pin == &pin_CHANNEL_1 &&
+         right_channel_pin == &pin_CHANNEL_0)) {
         self->channel_mask = DAC_CHANNEL_MASK_ALL;
-	self->num_channels = 2;
-	self->channel_mode = DAC_CHANNEL_MODE_ALTER;
-    } else if ( (left_channel_pin == &pin_CHANNEL_0 ||
-                 left_channel_pin == &pin_CHANNEL_1) &&
-                right_channel_pin == left_channel_pin ) {
+        self->num_channels = 2;
+        self->channel_mode = DAC_CHANNEL_MODE_ALTER;
+    } else if ((left_channel_pin == &pin_CHANNEL_0 ||
+                left_channel_pin == &pin_CHANNEL_1) &&
+               right_channel_pin == left_channel_pin) {
         self->channel_mask = DAC_CHANNEL_MASK_ALL;
         self->num_channels = 1;
-	self->channel_mode = DAC_CHANNEL_MODE_SIMUL;
+        self->channel_mode = DAC_CHANNEL_MODE_SIMUL;
     } else if (left_channel_pin == &pin_CHANNEL_0 &&
                right_channel_pin == NULL) {
-	self->channel_mask = DAC_CHANNEL_MASK_CH0;
+        self->channel_mask = DAC_CHANNEL_MASK_CH0;
         self->num_channels = 1;
-	self->channel_mode = DAC_CHANNEL_MODE_SIMUL;
+        self->channel_mode = DAC_CHANNEL_MODE_SIMUL;
     } else if (left_channel_pin == &pin_CHANNEL_1 &&
                right_channel_pin == NULL) {
-	self->channel_mask = DAC_CHANNEL_MASK_CH1;
+        self->channel_mask = DAC_CHANNEL_MASK_CH1;
         self->num_channels = 1;
-	self->channel_mode = DAC_CHANNEL_MODE_SIMUL;
+        self->channel_mode = DAC_CHANNEL_MODE_SIMUL;
     } else {
         raise_ValueError_invalid_pin();
     }
@@ -553,7 +555,7 @@ void common_hal_audioio_audioout_stop(audioio_audioout_obj_t *self) {
 }
 
 bool common_hal_audioio_audioout_get_playing(audioio_audioout_obj_t *self) {
-	return self->playing && !self->paused;
+    return self->playing && !self->paused;
 }
 
 #else
@@ -566,20 +568,25 @@ bool common_hal_audioio_audioout_deinited(audioio_audioout_obj_t *self) {
     return true;
 }
 
-void common_hal_audioio_audioout_deinit(audioio_audioout_obj_t *self) {}
+void common_hal_audioio_audioout_deinit(audioio_audioout_obj_t *self) {
+}
 
 void common_hal_audioio_audioout_play(audioio_audioout_obj_t *self,
-    mp_obj_t sample, bool loop) {}
+    mp_obj_t sample, bool loop) {
+}
 
-void common_hal_audioio_audioout_pause(audioio_audioout_obj_t *self) {}
+void common_hal_audioio_audioout_pause(audioio_audioout_obj_t *self) {
+}
 
-void common_hal_audioio_audioout_resume(audioio_audioout_obj_t *self) {}
+void common_hal_audioio_audioout_resume(audioio_audioout_obj_t *self) {
+}
 
 bool common_hal_audioio_audioout_get_paused(audioio_audioout_obj_t *self) {
     return false;
 }
 
-void common_hal_audioio_audioout_stop(audioio_audioout_obj_t *self) {}
+void common_hal_audioio_audioout_stop(audioio_audioout_obj_t *self) {
+}
 
 bool common_hal_audioio_audioout_get_playing(audioio_audioout_obj_t *self) {
     return false;

ports/espressif/common-hal/audioio/AudioOut.h

@@ -16,7 +16,7 @@
 
 #define DEFAULT_SAMPLE_RATE 32000
 
-typedef void(*audioout_sample_convert_func_t)(void *in_buffer, size_t in_buffer_size, uint8_t *out_buffer, uint32_t *out_buffer_size);
+typedef void (*audioout_sample_convert_func_t)(void *in_buffer, size_t in_buffer_size, uint8_t *out_buffer, uint32_t *out_buffer_size);
 
 typedef struct {
     uint8_t *ptr;
@@ -39,7 +39,7 @@ typedef struct {
     audioio_get_buffer_result_t sample_buffer_result;
     uint8_t get_buffer_index;
     uint8_t put_buffer_index;
-    buf_info_t dma_buffers[NUM_DMA_BUFFERS+1];
+    buf_info_t dma_buffers[NUM_DMA_BUFFERS + 1];
     background_callback_t callback;
     uint8_t scratch_buffer[DMA_BUFFER_SIZE];
     audioout_sample_convert_func_t samples_convert;

shared-module/audiocore/__init__.c

@@ -112,7 +112,7 @@ void audiosample_convert_u8s_u8m(uint8_t *buffer_out, const uint8_t *buffer_in,
     for (; nframes--;) {
         uint8_t sample = *buffer_in++ + 0x80;
         *buffer_out++ = sample;
-	buffer_in++;
+        buffer_in++;
     }
 }
 
@@ -127,7 +127,7 @@ void audiosample_convert_s8s_u8m(uint8_t *buffer_out, const int8_t *buffer_in, s
     for (; nframes--;) {
         uint8_t sample = *buffer_in++ + 0x80;
         *buffer_out++ = sample;
-	buffer_in++;
+        buffer_in++;
     }
 }
 
@@ -142,7 +142,7 @@ void audiosample_convert_u16s_u8m(uint8_t *buffer_out, const uint16_t *buffer_in
     for (; nframes--;) {
         uint8_t sample = (*buffer_in++) >> 8;
         *buffer_out++ = sample;
-	buffer_in++;
+        buffer_in++;
     }
 }
 
@@ -157,7 +157,7 @@ void audiosample_convert_s16s_u8m(uint8_t *buffer_out, const int16_t *buffer_in,
     for (; nframes--;) {
         uint8_t sample = (*buffer_in++ + 0x8000) >> 8;
         *buffer_out++ = sample;
-	buffer_in++;
+        buffer_in++;
     }
 }