refactor to audioi2sin

Author: FoamyGuy

…espressif/common-hal/audio_i2sin/I2SIn.c …/espressif/common-hal/audioi2sin/I2SIn.cports/espressif/common-hal/audio_i2sin/I2SIn.c renamed to ports/espressif/common-hal/audioi2sin/I2SIn.c ports/espressif/common-hal/audio_i2sin/I2SIn.c renamed to ports/espressif/common-hal/audioi2sin/I2SIn.c

@@ -8,16 +8,16 @@
 
 #include "bindings/espidf/__init__.h"
 
-#include "common-hal/audio_i2sin/I2SIn.h"
+#include "common-hal/audioi2sin/I2SIn.h"
 #include "py/runtime.h"
-#include "shared-bindings/audio_i2sin/I2SIn.h"
+#include "shared-bindings/audioi2sin/I2SIn.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
 #include "driver/i2s_std.h"
 
-#if CIRCUITPY_AUDIO_I2SIN
+#if CIRCUITPY_AUDIOI2SIN
 
-void common_hal_audio_i2sin_i2sin_construct(audio_i2sin_i2sin_obj_t *self,
+void common_hal_audioi2sin_i2sin_construct(audioi2sin_i2sin_obj_t *self,
     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,
     uint32_t sample_rate, uint8_t bit_depth, bool mono, bool left_justified) {
@@ -75,12 +75,12 @@ void common_hal_audio_i2sin_i2sin_construct(audio_i2sin_i2sin_obj_t *self,
     }
 }
 
-bool common_hal_audio_i2sin_i2sin_deinited(audio_i2sin_i2sin_obj_t *self) {
+bool common_hal_audioi2sin_i2sin_deinited(audioi2sin_i2sin_obj_t *self) {
     return self->data == NULL;
 }
 
-void common_hal_audio_i2sin_i2sin_deinit(audio_i2sin_i2sin_obj_t *self) {
-    if (common_hal_audio_i2sin_i2sin_deinited(self)) {
+void common_hal_audioi2sin_i2sin_deinit(audioi2sin_i2sin_obj_t *self) {
+    if (common_hal_audioi2sin_i2sin_deinited(self)) {
         return;
     }
 
@@ -111,7 +111,7 @@ void common_hal_audio_i2sin_i2sin_deinit(audio_i2sin_i2sin_obj_t *self) {
     self->mclk = NULL;
 }
 
-uint32_t common_hal_audio_i2sin_i2sin_record_to_buffer(audio_i2sin_i2sin_obj_t *self,
+uint32_t common_hal_audioi2sin_i2sin_record_to_buffer(audioi2sin_i2sin_obj_t *self,
     void *buffer, uint32_t length) {
     size_t element_size = self->bit_depth / 8;
     // 24-bit samples occupy a 32-bit slot on the I2S bus.
@@ -158,12 +158,12 @@ uint32_t common_hal_audio_i2sin_i2sin_record_to_buffer(audio_i2sin_i2sin_obj_t *
     return produced;
 }
 
-uint8_t common_hal_audio_i2sin_i2sin_get_bit_depth(audio_i2sin_i2sin_obj_t *self) {
+uint8_t common_hal_audioi2sin_i2sin_get_bit_depth(audioi2sin_i2sin_obj_t *self) {
     return self->bit_depth;
 }
 
-uint32_t common_hal_audio_i2sin_i2sin_get_sample_rate(audio_i2sin_i2sin_obj_t *self) {
+uint32_t common_hal_audioi2sin_i2sin_get_sample_rate(audioi2sin_i2sin_obj_t *self) {
     return self->sample_rate;
 }
 
-#endif // CIRCUITPY_AUDIO_I2SIN
+#endif // CIRCUITPY_AUDIOI2SIN

…espressif/common-hal/audio_i2sin/I2SIn.h …/espressif/common-hal/audioi2sin/I2SIn.hports/espressif/common-hal/audio_i2sin/I2SIn.h renamed to ports/espressif/common-hal/audioi2sin/I2SIn.h ports/espressif/common-hal/audio_i2sin/I2SIn.h renamed to ports/espressif/common-hal/audioi2sin/I2SIn.h

@@ -12,7 +12,7 @@
 
 #include "driver/i2s_std.h"
 
-#if CIRCUITPY_AUDIO_I2SIN
+#if CIRCUITPY_AUDIOI2SIN
 
 typedef struct {
     mp_obj_base_t base;
@@ -24,6 +24,6 @@ typedef struct {
     uint32_t sample_rate;
     uint8_t bit_depth;
     bool mono;
-} audio_i2sin_i2sin_obj_t;
+} audioi2sin_i2sin_obj_t;
 
 #endif

…ressif/common-hal/audio_i2sin/__init__.c …pressif/common-hal/audioi2sin/__init__.cports/espressif/common-hal/audio_i2sin/__init__.c renamed to ports/espressif/common-hal/audioi2sin/__init__.c ports/espressif/common-hal/audio_i2sin/__init__.c renamed to ports/espressif/common-hal/audioi2sin/__init__.c

@@ -68,7 +68,7 @@ CIRCUITPY_ALARM_TOUCH ?= 0
 CIRCUITPY_ANALOGBUFIO ?= 1
 CIRCUITPY_AUDIOBUSIO ?= 1
 CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
-CIRCUITPY_AUDIO_I2SIN ?= 1
+CIRCUITPY_AUDIOI2SIN ?= 1
 CIRCUITPY_AUDIOIO ?= 1
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_BLEIO_NATIVE ?= 1

ports/espressif/mpconfigport.mk

@@ -11,15 +11,15 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "shared/runtime/interrupt_char.h"
-#include "common-hal/audio_i2sin/I2SIn.h"
-#include "shared-bindings/audio_i2sin/I2SIn.h"
+#include "common-hal/audioi2sin/I2SIn.h"
+#include "shared-bindings/audioi2sin/I2SIn.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "bindings/rp2pio/StateMachine.h"
 #include "supervisor/port.h"
 
 #include "hardware/dma.h"
 
-#if CIRCUITPY_AUDIO_I2SIN
+#if CIRCUITPY_AUDIOI2SIN
 
 // 16-bit programs sample a stereo frame of 16+16 = 32 bits and rely on
 // auto-push at 32 to deliver one packed (right<<16 | left) word per frame.
@@ -148,7 +148,7 @@ static const uint16_t i2sin_program_left_justified_swap_32[] = {
 };
 
 // Caller validates that pins are free.
-void common_hal_audio_i2sin_i2sin_construct(audio_i2sin_i2sin_obj_t *self,
+void common_hal_audioi2sin_i2sin_construct(audioi2sin_i2sin_obj_t *self,
     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,
     uint32_t sample_rate, uint8_t bit_depth, bool mono, bool left_justified) {
@@ -239,7 +239,7 @@ void common_hal_audio_i2sin_i2sin_construct(audio_i2sin_i2sin_obj_t *self,
     // 8 bytes; size the half-buffer for ~40 ms of audio so a slow consumer
     // (SD card flush etc.) can complete without overrunning.
     size_t bytes_per_frame = (bit_depth == 16) ? 4 : 8;
-    size_t target = (size_t)self->sample_rate * bytes_per_frame * 2 / 2;
+    size_t target = (size_t)self->sample_rate * bytes_per_frame * 40 / 1000;
     size_t half_size = (target > 4096) ? target : 4096;
     // Round up to a multiple of 8 so 24/32-bit pair reads never straddle
     // the half boundary.
@@ -266,12 +266,12 @@ void common_hal_audio_i2sin_i2sin_construct(audio_i2sin_i2sin_obj_t *self,
     self->dma_channel = common_hal_rp2pio_statemachine_get_read_dma_channel(&self->state_machine);
 }
 
-bool common_hal_audio_i2sin_i2sin_deinited(audio_i2sin_i2sin_obj_t *self) {
+bool common_hal_audioi2sin_i2sin_deinited(audioi2sin_i2sin_obj_t *self) {
     return common_hal_rp2pio_statemachine_deinited(&self->state_machine);
 }
 
-void common_hal_audio_i2sin_i2sin_deinit(audio_i2sin_i2sin_obj_t *self) {
-    if (common_hal_audio_i2sin_i2sin_deinited(self)) {
+void common_hal_audioi2sin_i2sin_deinit(audioi2sin_i2sin_obj_t *self) {
+    if (common_hal_audioi2sin_i2sin_deinited(self)) {
         return;
     }
     common_hal_rp2pio_statemachine_stop_background_read(&self->state_machine);
@@ -285,11 +285,11 @@ void common_hal_audio_i2sin_i2sin_deinit(audio_i2sin_i2sin_obj_t *self) {
     self->dma_channel = -1;
 }
 
-uint8_t common_hal_audio_i2sin_i2sin_get_bit_depth(audio_i2sin_i2sin_obj_t *self) {
+uint8_t common_hal_audioi2sin_i2sin_get_bit_depth(audioi2sin_i2sin_obj_t *self) {
     return self->bit_depth;
 }
 
-uint32_t common_hal_audio_i2sin_i2sin_get_sample_rate(audio_i2sin_i2sin_obj_t *self) {
+uint32_t common_hal_audioi2sin_i2sin_get_sample_rate(audioi2sin_i2sin_obj_t *self) {
     return self->sample_rate;
 }
 
@@ -304,7 +304,7 @@ uint32_t common_hal_audio_i2sin_i2sin_get_sample_rate(audio_i2sin_i2sin_obj_t *s
 // the number actually written.
 // Compute the byte offset inside `ring` that the DMA is currently writing
 // (one past the last word it finished). Always lies in [0, ring_size).
-static size_t i2sin_write_pos(audio_i2sin_i2sin_obj_t *self) {
+static size_t i2sin_write_pos(audioi2sin_i2sin_obj_t *self) {
     uintptr_t addr = (uintptr_t)dma_channel_hw_addr(self->dma_channel)->write_addr;
     uintptr_t base = (uintptr_t)self->ring;
     if (addr < base || addr >= base + self->ring_size) {
@@ -316,7 +316,7 @@ static size_t i2sin_write_pos(audio_i2sin_i2sin_obj_t *self) {
     return (size_t)(addr - base);
 }
 
-uint32_t common_hal_audio_i2sin_i2sin_record_to_buffer(audio_i2sin_i2sin_obj_t *self,
+uint32_t common_hal_audioi2sin_i2sin_record_to_buffer(audioi2sin_i2sin_obj_t *self,
     void *buffer, uint32_t output_buffer_length) {
     uint32_t output_count = 0;
     const size_t ring_size = self->ring_size;
@@ -433,4 +433,4 @@ uint32_t common_hal_audio_i2sin_i2sin_record_to_buffer(audio_i2sin_i2sin_obj_t *
     return output_count;
 }
 
-#endif // CIRCUITPY_AUDIO_I2SIN
+#endif // CIRCUITPY_AUDIOI2SIN

…spberrypi/common-hal/audio_i2sin/I2SIn.c …aspberrypi/common-hal/audioi2sin/I2SIn.cports/raspberrypi/common-hal/audio_i2sin/I2SIn.c renamed to ports/raspberrypi/common-hal/audioi2sin/I2SIn.c ports/raspberrypi/common-hal/audio_i2sin/I2SIn.c renamed to ports/raspberrypi/common-hal/audioi2sin/I2SIn.c

@@ -26,4 +26,4 @@ typedef struct {
     size_t read_pos;
     int dma_channel;
     bool overflow;
-} audio_i2sin_i2sin_obj_t;
+} audioi2sin_i2sin_obj_t;