mirror/hsdaoh-rp2350
1
0
Fork 0
mirror of https://github.com/steve-m/hsdaoh-rp2350.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

decrease ringbuffer for audio

Browse source
This commit is contained in:
Steve Markgraf 2025-03-02 00:33:18 +01:00
parent 95a7b73bda
commit e293c0c075
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/dual_external_adc/dual_external_adc.c
View file

@ -58,6 +58,7 @@
// Same here for 2x32 bit words
#define AUDIO_DATA_LEN (RBUF_SLICE_LEN - 4)
#define AUDIO_RBUF_SLICES 8
// ADC is attached to GP0 - GP11 with clock on GP20
#define PIO_INPUT_PIN_BASE 23
@ -143,11 +144,11 @@ void init_pio_input(void)
#define DMACH_AUDIO1_PIO_PONG 3
static bool audio1_pio_dma_pong = false;
uint16_t audio1_ringbuffer[RBUF_DEFAULT_TOTAL_LEN];
uint16_t audio1_ringbuffer[AUDIO_RBUF_SLICES * RBUF_SLICE_LEN];
int audio1_ringbuf_head = 2;
static bool audio2_pio_dma_pong = false;
uint16_t audio2_ringbuffer[RBUF_DEFAULT_TOTAL_LEN];
uint16_t audio2_ringbuffer[AUDIO_RBUF_SLICES * RBUF_SLICE_LEN];
int audio2_ringbuf_head = 2;
void __scratch_y("") audio1_pio_dma_irq_handler()
@ -157,7 +158,7 @@ void __scratch_y("") audio1_pio_dma_irq_handler()
dma_hw->intr = 1u << ch_num;
audio1_pio_dma_pong = !audio1_pio_dma_pong;
audio1_ringbuf_head = (audio1_ringbuf_head + 1) % RBUF_DEFAULT_SLICES;
audio1_ringbuf_head = (audio1_ringbuf_head + 1) % AUDIO_RBUF_SLICES;
ch->write_addr = (uintptr_t)&audio1_ringbuffer[audio1_ringbuf_head * RBUF_SLICE_LEN];
ch->transfer_count = AUDIO_DATA_LEN/2;
@ -227,7 +228,7 @@ void __scratch_y("") audio2_pio_dma_irq_handler()
dma_hw->intr = 1u << ch_num;
audio2_pio_dma_pong = !audio2_pio_dma_pong;
audio2_ringbuf_head = (audio2_ringbuf_head + 1) % RBUF_DEFAULT_SLICES;
audio2_ringbuf_head = (audio2_ringbuf_head + 1) % AUDIO_RBUF_SLICES;
ch->write_addr = (uintptr_t)&audio2_ringbuffer[audio2_ringbuf_head * RBUF_SLICE_LEN];
ch->transfer_count = AUDIO_DATA_LEN/2;
@ -313,11 +314,10 @@ int main()
clock_gpio_init(21, CLOCKS_CLK_GPOUT0_CTRL_AUXSRC_VALUE_CLKSRC_PLL_USB, 10);
stdio_init_all();
hsdaoh_init(GPIO_DRIVE_STRENGTH_4MA, GPIO_SLEW_RATE_SLOW);
hsdaoh_add_stream(0, PIO_12BIT_DUAL, (SYS_CLK/8) * 1000, ADC_DATA_LEN, RBUF_DEFAULT_SLICES, ringbuffer);
hsdaoh_add_stream(AUDIO1_STREAM_ID, PIO_PCM1802_AUDIO, 75000, AUDIO_DATA_LEN, RBUF_DEFAULT_SLICES, audio1_ringbuffer);
hsdaoh_add_stream(AUDIO2_STREAM_ID, PIO_PCM1802_AUDIO, 75000, AUDIO_DATA_LEN, RBUF_DEFAULT_SLICES, audio2_ringbuffer);
hsdaoh_add_stream(AUDIO1_STREAM_ID, PIO_PCM1802_AUDIO, 75000, AUDIO_DATA_LEN, AUDIO_RBUF_SLICES, audio1_ringbuffer);
hsdaoh_add_stream(AUDIO2_STREAM_ID, PIO_PCM1802_AUDIO, 75000, AUDIO_DATA_LEN, AUDIO_RBUF_SLICES, audio2_ringbuffer);
hsdaoh_start();
init_pio_input();
init_audio1_pio_input();

7
apps/external_adc/external_adc.c
View file

@ -57,6 +57,7 @@
// Same here for 2x32 bit words
#define AUDIO_DATA_LEN (RBUF_SLICE_LEN - 4)
#define AUDIO_RBUF_SLICES 8
// ADC is attached to GP0 - GP11 with clock on GP20
#define PIO_INPUT_PIN_BASE 0
@ -137,7 +138,7 @@ void init_pio_input(void)
#define DMACH_AUDIO_PIO_PONG 3
static bool audio_pio_dma_pong = false;
uint16_t audio_ringbuffer[RBUF_DEFAULT_TOTAL_LEN];
uint16_t audio_ringbuffer[AUDIO_RBUF_SLICES * RBUF_SLICE_LEN];
int audio_ringbuf_head = 2;
void __scratch_y("") audio_pio_dma_irq_handler()
@ -147,7 +148,7 @@ void __scratch_y("") audio_pio_dma_irq_handler()
dma_hw->intr = 1u << ch_num;
audio_pio_dma_pong = !audio_pio_dma_pong;
audio_ringbuf_head = (audio_ringbuf_head + 1) % RBUF_DEFAULT_SLICES;
audio_ringbuf_head = (audio_ringbuf_head + 1) % AUDIO_RBUF_SLICES;
ch->write_addr = (uintptr_t)&audio_ringbuffer[audio_ringbuf_head * RBUF_SLICE_LEN];
ch->transfer_count = AUDIO_DATA_LEN/2;
@ -231,7 +232,7 @@ int main()
hsdaoh_init(GPIO_DRIVE_STRENGTH_4MA, GPIO_SLEW_RATE_SLOW);
hsdaoh_add_stream(0, PIO_12BIT, (SYS_CLK/4) * 1000, ADC_DATA_LEN, RBUF_DEFAULT_SLICES, ringbuffer);
hsdaoh_add_stream(1, PIO_PCM1802_AUDIO, 75000, AUDIO_DATA_LEN, RBUF_DEFAULT_SLICES, audio_ringbuffer);
hsdaoh_add_stream(2, PIO_PCM1802_AUDIO, 75000, AUDIO_DATA_LEN, AUDIO_RBUF_SLICES, audio_ringbuffer);
hsdaoh_start();
init_pio_input();
init_audio_pio_input();