WIP I2S

tannewt · tannewt · commit 9e40eba4fa3f · 2025-12-18T16:12:02.000-08:00
diff --git a/ports/zephyr-cp/background.c b/ports/zephyr-cp/background.c
@@ -9,37 +9,15 @@
 #include "py/runtime.h"
 #include "supervisor/port.h"
 
-#if CIRCUITPY_DISPLAYIO
-#include "shared-module/displayio/__init__.h"
-#endif
-
-#if CIRCUITPY_AUDIOBUSIO
-#include "common-hal/audiobusio/I2SOut.h"
-#endif
-
-#if CIRCUITPY_AUDIOPWMIO
-#include "common-hal/audiopwmio/PWMAudioOut.h"
-#endif
-
 void port_start_background_tick(void) {
 }
 
 void port_finish_background_tick(void) {
 }
 
 void port_background_tick(void) {
-    #if CIRCUITPY_AUDIOPWMIO
-    audiopwmout_background();
-    #endif
-    #if CIRCUITPY_AUDIOBUSIO
-    i2s_background();
-    #endif
-}
-
-// Allow boards to override this.
-MP_WEAK void board_background_task(void) {
+    // No, ticks. We use Zephyr threads instead.
 }
 
 void port_background_task(void) {
-    board_background_task();
 }
diff --git a/ports/zephyr-cp/boards/frdm_mcxn947_mcxn947_cpu0.conf b/ports/zephyr-cp/boards/frdm_mcxn947_mcxn947_cpu0.conf
@@ -0,0 +1 @@
+CONFIG_DMA_TCD_QUEUE_SIZE=4
diff --git a/ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.conf b/ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
@@ -0,0 +1 @@
+CONFIG_DMA_TCD_QUEUE_SIZE=4
diff --git a/ports/zephyr-cp/boards/nordic/nrf5340dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf5340dk/autogen_board_info.toml
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/boards/nordic/nrf54h20dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf54h20dk/autogen_board_info.toml
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/boards/nordic/nrf54l15dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf54l15dk/autogen_board_info.toml
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/boards/nordic/nrf7002dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf7002dk/autogen_board_info.toml
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/boards/nxp/frdm_mcxn947/autogen_board_info.toml b/ports/zephyr-cp/boards/nxp/frdm_mcxn947/autogen_board_info.toml
@@ -15,14 +15,14 @@ alarm = false
 analogbufio = false
 analogio = false
 atexit = false
-audiobusio = false
-audiocore = false
+audiobusio = true # Zephyr board has audiobusio
+audiocore = true # Zephyr board has audiobusio
 audiodelays = false
 audiofilters = false
 audiofreeverb = false
 audioio = false
 audiomixer = false
-audiomp3 = false
+audiomp3 = true # Zephyr board has audiobusio
 audiopwmio = false
 aurora_epaper = false
 bitbangio = false
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/autogen_board_info.toml b/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/autogen_board_info.toml
@@ -16,13 +16,13 @@ analogbufio = false
 analogio = false
 atexit = false
 audiobusio = true # Zephyr board has audiobusio
-audiocore = false
+audiocore = true # Zephyr board has audiobusio
 audiodelays = false
 audiofilters = false
 audiofreeverb = false
 audioio = false
 audiomixer = false
-audiomp3 = false
+audiomp3 = true # Zephyr board has audiobusio
 audiopwmio = false
 aurora_epaper = false
 bitbangio = false
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/boards/renesas/ek_ra6m5/autogen_board_info.toml b/ports/zephyr-cp/boards/renesas/ek_ra6m5/autogen_board_info.toml
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/boards/renesas/ek_ra8d1/autogen_board_info.toml b/ports/zephyr-cp/boards/renesas/ek_ra8d1/autogen_board_info.toml
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/boards/st/nucleo_n657x0_q/autogen_board_info.toml b/ports/zephyr-cp/boards/st/nucleo_n657x0_q/autogen_board_info.toml
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/boards/st/nucleo_u575zi_q/autogen_board_info.toml b/ports/zephyr-cp/boards/st/nucleo_u575zi_q/autogen_board_info.toml
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/boards/st/stm32h7b3i_dk/autogen_board_info.toml b/ports/zephyr-cp/boards/st/stm32h7b3i_dk/autogen_board_info.toml
@@ -60,7 +60,7 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mdns = false
 memorymap = false
diff --git a/ports/zephyr-cp/common-hal/audiobusio/I2SOut.c b/ports/zephyr-cp/common-hal/audiobusio/I2SOut.c
@@ -10,6 +10,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/i2s.h>
 #include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
 
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-module/audiocore/__init__.h"
@@ -157,16 +158,18 @@ static void audio_thread_func(void *self_in, void *unused1, void *unused2) {
 
 void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t *self,
     mp_obj_t sample, bool loop) {
+    printk("common_hal_audiobusio_i2sout_play\n");
+    return;
 
     // Stop any existing playback
     if (self->playing) {
         common_hal_audiobusio_i2sout_stop(self);
     }
 
     // Get sample information
-    uint8_t bits_per_sample = audiosample_bits_per_sample(sample);
-    uint32_t sample_rate = audiosample_sample_rate(sample);
-    uint8_t channel_count = audiosample_channel_count(sample);
+    uint8_t bits_per_sample = audiosample_get_bits_per_sample(sample);
+    uint32_t sample_rate = audiosample_get_sample_rate(sample);
+    uint8_t channel_count = audiosample_get_channel_count(sample);
 
     // Validate sample parameters
     if (bits_per_sample != 8 && bits_per_sample != 16 && bits_per_sample != 24 && bits_per_sample != 32) {
@@ -224,7 +227,7 @@ void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t *self,
     config.frame_clk_freq = sample_rate;
     config.mem_slab = &self->mem_slab;
     config.block_size = block_size;
-    config.timeout = K_MSEC(1000);
+    config.timeout = 1000; // Not a k_timeout_t. In milliseconds.
 
     int ret = i2s_configure(self->i2s_dev, I2S_DIR_TX, &config);
     if (ret < 0) {
@@ -275,10 +278,10 @@ void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t *self,
 
     // Create and start audio processing thread
     self->thread_id = k_thread_create(&self->thread, self->thread_stack,
-                                      AUDIO_THREAD_STACK_SIZE,
-                                      audio_thread_func,
-                                      self, NULL, NULL,
-                                      AUDIO_THREAD_PRIORITY, 0, K_NO_WAIT);
+        AUDIO_THREAD_STACK_SIZE,
+        audio_thread_func,
+        self, NULL, NULL,
+        AUDIO_THREAD_PRIORITY, 0, K_NO_WAIT);
     if (self->thread_id == NULL) {
         i2s_trigger(self->i2s_dev, I2S_DIR_TX, I2S_TRIGGER_STOP);
         k_mem_slab_free(&self->mem_slab, (void *)&self->current_buffer);
diff --git a/ports/zephyr-cp/common-hal/audiobusio/PDMIn.c b/ports/zephyr-cp/common-hal/audiobusio/PDMIn.c
diff --git a/ports/zephyr-cp/common-hal/audiobusio/PDMIn.h b/ports/zephyr-cp/common-hal/audiobusio/PDMIn.h
diff --git a/ports/zephyr-cp/cptools/build_circuitpython.py b/ports/zephyr-cp/cptools/build_circuitpython.py
diff --git a/ports/zephyr-cp/prj.conf b/ports/zephyr-cp/prj.conf
