Skip to content

Allow overriding of default config for pico_audio #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kilograham merged 1 commit into from
Apr 2, 2025
Merged

Allow overriding of default config for pico_audio #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/rp2_common/pico_audio_pwm/audio_pwm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ const audio_pwm_channel_config_t default_left_channel_config =
{
.core = {
.base_pin = PICO_AUDIO_PWM_L_PIN,
.pio_sm = 0,
.dma_channel = 0
.pio_sm = PICO_AUDIO_PWM_L_PIO_SM,
.dma_channel = PICO_AUDIO_PWM_L_DMA_CH
},
.pattern = 1,
};
Expand All @@ -78,8 +78,8 @@ const audio_pwm_channel_config_t default_right_channel_config =
{
.core = {
.base_pin = PICO_AUDIO_PWM_R_PIN,
.pio_sm = 1,
.dma_channel = 1
.pio_sm = PICO_AUDIO_PWM_R_PIO_SM,
.dma_channel = PICO_AUDIO_PWM_R_DMA_CH,
},
.pattern = 1,
};
Expand All @@ -88,8 +88,8 @@ const audio_pwm_channel_config_t default_mono_channel_config =
{
.core = {
.base_pin = PICO_AUDIO_PWM_MONO_PIN,
.pio_sm = 0,
.dma_channel = 0
.pio_sm = PICO_AUDIO_PWM_MONO_PIO_SM,
.dma_channel = PICO_AUDIO_PWM_MONO_DMA_CH
},
.pattern = 3,
};
Expand Down
24 changes: 24 additions & 0 deletions src/rp2_common/pico_audio_pwm/include/pico/audio_pwm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,38 @@ extern "C" {
#define PICO_AUDIO_PWM_L_PIN 0
#endif

#ifndef PICO_AUDIO_PWM_L_PIO_SM
#define PICO_AUDIO_PWM_L_PIO_SM 0
#endif

#ifndef PICO_AUDIO_PWM_L_DMA_CH
#define PICO_AUDIO_PWM_L_DMA_CH 0
#endif

#ifndef PICO_AUDIO_PWM_R_PIN
#define PICO_AUDIO_PWM_R_PIN 1
#endif

#ifndef PICO_AUDIO_PWM_R_PIO_SM
#define PICO_AUDIO_PWM_R_PIO_SM 0
#endif

#ifndef PICO_AUDIO_PWM_R_DMA_CH
#define PICO_AUDIO_PWM_R_DMA_CH 1
#endif

#ifndef PICO_AUDIO_PWM_MONO_PIN
#define PICO_AUDIO_PWM_MONO_PIN PICO_AUDIO_PWM_L_PIN
#endif

#ifndef PICO_AUDIO_PWM_MONO_PIO_SM
#define PICO_AUDIO_PWM_MONO_PIO_SM PICO_AUDIO_PWM_L_PIO_SM
#endif

#ifndef PICO_AUDIO_PWM_MONO_DMA_CH
#define PICO_AUDIO_PWM_MONO_DMA_CH PICO_AUDIO_PWM_L_DMA_CH
#endif

#ifndef PIO_AUDIO_PWM_INTERP_SAVE
#define PIO_AUDIO_PWM_INTERP_SAVE 1
#endif
Expand Down