diff options
author | Drashna Jaelre <drashna@live.com> | 2021-01-27 09:33:52 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-28 04:33:52 +1100 |
commit | bab9849a8bc799f43e4dc18674c07625630cab0d (patch) | |
tree | 2c1320f378175780ee180242848805aa805d47d5 /quantum/audio/audio_chibios.c | |
parent | 30b46fad5764b54ab4d47e9c4024f8030e1bf1a7 (diff) | |
download | qmk_firmware-bab9849a8bc799f43e4dc18674c07625630cab0d.tar.gz qmk_firmware-bab9849a8bc799f43e4dc18674c07625630cab0d.zip |
Backport ChibiOS Audio changes from ZSA (#11687)
Diffstat (limited to 'quantum/audio/audio_chibios.c')
-rw-r--r-- | quantum/audio/audio_chibios.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/quantum/audio/audio_chibios.c b/quantum/audio/audio_chibios.c index 1f147f2c9..1863ae140 100644 --- a/quantum/audio/audio_chibios.c +++ b/quantum/audio/audio_chibios.c | |||
@@ -86,13 +86,21 @@ static void gpt_cb8(GPTDriver *gptp); | |||
86 | 86 | ||
87 | #define START_CHANNEL_1() \ | 87 | #define START_CHANNEL_1() \ |
88 | gptStart(&GPTD6, &gpt6cfg1); \ | 88 | gptStart(&GPTD6, &gpt6cfg1); \ |
89 | gptStartContinuous(&GPTD6, 2U) | 89 | gptStartContinuous(&GPTD6, 2U); \ |
90 | palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG) | ||
90 | #define START_CHANNEL_2() \ | 91 | #define START_CHANNEL_2() \ |
91 | gptStart(&GPTD7, &gpt7cfg1); \ | 92 | gptStart(&GPTD7, &gpt7cfg1); \ |
92 | gptStartContinuous(&GPTD7, 2U) | 93 | gptStartContinuous(&GPTD7, 2U); \ |
93 | #define STOP_CHANNEL_1() gptStopTimer(&GPTD6) | 94 | palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG) |
94 | #define STOP_CHANNEL_2() gptStopTimer(&GPTD7) | 95 | #define STOP_CHANNEL_1() \ |
95 | #define RESTART_CHANNEL_1() \ | 96 | gptStopTimer(&GPTD6); \ |
97 | palSetPadMode(GPIOA, 4, PAL_MODE_OUTPUT_PUSHPULL); \ | ||
98 | palSetPad(GPIOA, 4) | ||
99 | #define STOP_CHANNEL_2() \ | ||
100 | gptStopTimer(&GPTD7); \ | ||
101 | palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \ | ||
102 | palSetPad(GPIOA, 5) | ||
103 | #define RESTART_CHANNEL_1() \ | ||
96 | STOP_CHANNEL_1(); \ | 104 | STOP_CHANNEL_1(); \ |
97 | START_CHANNEL_1() | 105 | START_CHANNEL_1() |
98 | #define RESTART_CHANNEL_2() \ | 106 | #define RESTART_CHANNEL_2() \ |