summaryrefslogtreecommitdiff
path: root/keyboards/handwired
diff options
context:
space:
mode:
authorStefan Kerkmann <karlk90@pm.me>2022-10-27 19:26:16 +0200
committerGitHub <noreply@github.com>2022-10-27 19:26:16 +0200
commit19145704e4a7a8a7609d697585a6423b67dc5371 (patch)
treefb690df5c8ee842f5ffc73827c563450594ff35c /keyboards/handwired
parentefe520645ec8b67d306eb63f54b0a52380269596 (diff)
[Core] Adjust PWM hardware audio driver for RP2040 (#17723)
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/macroboard/f411/config.h1
-rw-r--r--keyboards/handwired/macroboard/halconf.h1
-rw-r--r--keyboards/handwired/macroboard/mcuconf.h3
-rw-r--r--keyboards/handwired/onekey/rp2040/config.h4
-rw-r--r--keyboards/handwired/onekey/rp2040/mcuconf.h3
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h1
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h1
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h3
8 files changed, 7 insertions, 10 deletions
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 <http://www.gnu.org/licenses/>.
#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 <halconf.h>
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 <http://www.gnu.org/licenses/>.
#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 <halconf.h>
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