From 19145704e4a7a8a7609d697585a6423b67dc5371 Mon Sep 17 00:00:00 2001 From: Stefan Kerkmann Date: Thu, 27 Oct 2022 19:26:16 +0200 Subject: [Core] Adjust PWM hardware audio driver for RP2040 (#17723) --- keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h | 1 - keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h | 1 - keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h | 3 --- keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h | 1 - keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h | 1 - keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h | 3 --- keyboards/handwired/macroboard/f411/config.h | 1 - keyboards/handwired/macroboard/halconf.h | 1 - keyboards/handwired/macroboard/mcuconf.h | 3 --- keyboards/handwired/onekey/rp2040/config.h | 4 ++++ keyboards/handwired/onekey/rp2040/mcuconf.h | 3 +++ keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h | 1 - keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h | 1 - keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h | 3 --- keyboards/yanghu/unicorne/config.h | 1 - keyboards/yanghu/unicorne/f411/halconf.h | 3 --- keyboards/yanghu/unicorne/f411/mcuconf.h | 3 --- 17 files changed, 7 insertions(+), 27 deletions(-) (limited to 'keyboards') diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h index f3e8f83b2a..ad549a5e22 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h @@ -60,7 +60,6 @@ along with this program. If not, see . #define AUDIO_PWM_DRIVER PWMD3 #define AUDIO_PWM_CHANNEL 4 #define AUDIO_PWM_PAL_MODE 2 -#define AUDIO_STATE_TIMER GPTD4 /* serial.c configuration for split keyboard */ #undef SOFT_SERIAL_PIN diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h index 39644726c3..bc07c10527 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h @@ -21,6 +21,5 @@ #define HAL_USE_SPI TRUE #define SPI_USE_WAIT TRUE #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD -#define HAL_USE_GPT TRUE #include_next diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h index 05b5776ac3..fd71b54b77 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h @@ -38,8 +38,5 @@ #undef STM32_SERIAL_USE_USART2 #define STM32_SERIAL_USE_USART2 TRUE -#undef STM32_GPT_USE_TIM4 -#define STM32_GPT_USE_TIM4 TRUE - #undef STM32_ST_USE_TIMER #define STM32_ST_USE_TIMER 5 diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h index 7e47953d63..e29ff644da 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h @@ -56,7 +56,6 @@ #define AUDIO_PWM_DRIVER PWMD4 #define AUDIO_PWM_CHANNEL 2 #define AUDIO_PWM_PAL_MODE 2 -#define AUDIO_STATE_TIMER GPTD3 #define AUDIO_INIT_DELAY #define AUDIO_ENABLE_TONE_MULTIPLEXING #define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10 diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h index 3d9f187317..8aad829e5c 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h @@ -17,7 +17,6 @@ #define HAL_USE_PWM TRUE #define HAL_USE_PAL TRUE -#define HAL_USE_GPT TRUE #define HAL_USE_SERIAL TRUE // #define HAL_USE_I2C TRUE #define HAL_USE_SPI TRUE diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h index 5712bb4574..4f04811e54 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h @@ -36,8 +36,5 @@ #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE -#undef STM32_GPT_USE_TIM3 -#define STM32_GPT_USE_TIM3 TRUE - #undef STM32_ST_USE_TIMER #define STM32_ST_USE_TIMER 5 diff --git a/keyboards/handwired/macroboard/f411/config.h b/keyboards/handwired/macroboard/f411/config.h index 31cb5fa11b..03fd00d182 100644 --- a/keyboards/handwired/macroboard/f411/config.h +++ b/keyboards/handwired/macroboard/f411/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define AUDIO_PWM_DRIVER PWMD2 #define AUDIO_PWM_CHANNEL 3 #define AUDIO_PWM_PAL_MODE 1 -#define AUDIO_STATE_TIMER GPTD1 #define AUDIO_CLICKY #define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f diff --git a/keyboards/handwired/macroboard/halconf.h b/keyboards/handwired/macroboard/halconf.h index 06585c9d5e..02e11e8144 100644 --- a/keyboards/handwired/macroboard/halconf.h +++ b/keyboards/handwired/macroboard/halconf.h @@ -23,6 +23,5 @@ #pragma once #define HAL_USE_PWM TRUE -#define HAL_USE_GPT TRUE #include_next diff --git a/keyboards/handwired/macroboard/mcuconf.h b/keyboards/handwired/macroboard/mcuconf.h index 5b190d7ec2..e62fb3341e 100644 --- a/keyboards/handwired/macroboard/mcuconf.h +++ b/keyboards/handwired/macroboard/mcuconf.h @@ -23,8 +23,5 @@ #undef STM32_PWM_USE_TIM4 #define STM32_PWM_USE_TIM4 TRUE -#undef STM32_GPT_USE_TIM1 -#define STM32_GPT_USE_TIM1 TRUE - #undef STM32_ST_USE_TIMER #define STM32_ST_USE_TIMER 5 diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h index 82c5592dc9..d3e7b5c076 100644 --- a/keyboards/handwired/onekey/rp2040/config.h +++ b/keyboards/handwired/onekey/rp2040/config.h @@ -16,3 +16,7 @@ #define BACKLIGHT_PWM_DRIVER PWMD4 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B + +#define AUDIO_PIN GP16 +#define AUDIO_PWM_DRIVER PWMD0 +#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_A diff --git a/keyboards/handwired/onekey/rp2040/mcuconf.h b/keyboards/handwired/onekey/rp2040/mcuconf.h index 86f821640f..5c2587395d 100644 --- a/keyboards/handwired/onekey/rp2040/mcuconf.h +++ b/keyboards/handwired/onekey/rp2040/mcuconf.h @@ -5,5 +5,8 @@ #include_next "mcuconf.h" +#undef RP_PWM_USE_PWM0 +#define RP_PWM_USE_PWM0 TRUE + #undef RP_PWM_USE_PWM4 #define RP_PWM_USE_PWM4 TRUE diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index f7e9cfb7d6..e93e70f569 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -53,7 +53,6 @@ along with this program. If not, see . #define AUDIO_PWM_DRIVER PWMD3 #define AUDIO_PWM_CHANNEL 4 #define AUDIO_PWM_PAL_MODE 2 -#define AUDIO_STATE_TIMER GPTD4 /* serial.c configuration for split keyboard */ #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h index 39644726c3..bc07c10527 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h @@ -21,6 +21,5 @@ #define HAL_USE_SPI TRUE #define SPI_USE_WAIT TRUE #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD -#define HAL_USE_GPT TRUE #include_next diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h index 05b5776ac3..fd71b54b77 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h @@ -38,8 +38,5 @@ #undef STM32_SERIAL_USE_USART2 #define STM32_SERIAL_USE_USART2 TRUE -#undef STM32_GPT_USE_TIM4 -#define STM32_GPT_USE_TIM4 TRUE - #undef STM32_ST_USE_TIMER #define STM32_ST_USE_TIMER 5 diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h index 285f3209aa..4279f955a9 100644 --- a/keyboards/yanghu/unicorne/config.h +++ b/keyboards/yanghu/unicorne/config.h @@ -46,7 +46,6 @@ #define AUDIO_PWM_PAL_MODE 1 #define AUDIO_PWM_DRIVER PWMD1 #define AUDIO_PWM_CHANNEL 1 -#define AUDIO_STATE_TIMER GPTD4 /* RGB LED */ #define RGB_DI_PIN B1 diff --git a/keyboards/yanghu/unicorne/f411/halconf.h b/keyboards/yanghu/unicorne/f411/halconf.h index d28ae12fde..04fa5f6994 100644 --- a/keyboards/yanghu/unicorne/f411/halconf.h +++ b/keyboards/yanghu/unicorne/f411/halconf.h @@ -18,9 +18,6 @@ /* PWM for AUDIO and RGB LED */ #define HAL_USE_PWM TRUE -/* GPT and PAL for Audio */ -#define HAL_USE_GPT TRUE -#define HAL_USE_PAL TRUE /* I2C for OLED display */ #define HAL_USE_I2C TRUE diff --git a/keyboards/yanghu/unicorne/f411/mcuconf.h b/keyboards/yanghu/unicorne/f411/mcuconf.h index f4dc31bff2..c2763caabc 100644 --- a/keyboards/yanghu/unicorne/f411/mcuconf.h +++ b/keyboards/yanghu/unicorne/f411/mcuconf.h @@ -21,9 +21,6 @@ /* TIM1 PWM used for audio driver */ #undef STM32_PWM_USE_TIM1 #define STM32_PWM_USE_TIM1 TRUE -/* TIM5 GPT used for audio driver */ -#undef STM32_GPT_USE_TIM4 -#define STM32_GPT_USE_TIM4 TRUE /* TIM3 used for WS2812 driver */ #undef STM32_PWM_USE_TIM3 -- cgit v1.2.3