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 | |
| parent | 30b46fad5764b54ab4d47e9c4024f8030e1bf1a7 (diff) | |
Backport ChibiOS Audio changes from ZSA (#11687)
| -rw-r--r-- | quantum/audio/audio_chibios.c | 18 | ||||
| -rw-r--r-- | quantum/audio/musical_notes.h | 9 |
2 files changed, 19 insertions, 8 deletions
diff --git a/quantum/audio/audio_chibios.c b/quantum/audio/audio_chibios.c index 1f147f2c92..1863ae140b 100644 --- a/quantum/audio/audio_chibios.c +++ b/quantum/audio/audio_chibios.c @@ -86,13 +86,21 @@ static void gpt_cb8(GPTDriver *gptp); #define START_CHANNEL_1() \ gptStart(&GPTD6, &gpt6cfg1); \ - gptStartContinuous(&GPTD6, 2U) + gptStartContinuous(&GPTD6, 2U); \ + palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG) #define START_CHANNEL_2() \ gptStart(&GPTD7, &gpt7cfg1); \ - gptStartContinuous(&GPTD7, 2U) -#define STOP_CHANNEL_1() gptStopTimer(&GPTD6) -#define STOP_CHANNEL_2() gptStopTimer(&GPTD7) -#define RESTART_CHANNEL_1() \ + gptStartContinuous(&GPTD7, 2U); \ + palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG) +#define STOP_CHANNEL_1() \ + gptStopTimer(&GPTD6); \ + palSetPadMode(GPIOA, 4, PAL_MODE_OUTPUT_PUSHPULL); \ + palSetPad(GPIOA, 4) +#define STOP_CHANNEL_2() \ + gptStopTimer(&GPTD7); \ + palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \ + palSetPad(GPIOA, 5) + #define RESTART_CHANNEL_1() \ STOP_CHANNEL_1(); \ START_CHANNEL_1() #define RESTART_CHANNEL_2() \ diff --git a/quantum/audio/musical_notes.h b/quantum/audio/musical_notes.h index 8ac6aafd38..0ba572c346 100644 --- a/quantum/audio/musical_notes.h +++ b/quantum/audio/musical_notes.h @@ -17,7 +17,9 @@ #pragma once // Tempo Placeholder -#define TEMPO_DEFAULT 100 +#ifndef TEMPO_DEFAULT +# define TEMPO_DEFAULT 100 +#endif #define SONG(notes...) \ { notes } @@ -60,8 +62,9 @@ #define TIMBRE_25 0.250f #define TIMBRE_50 0.500f #define TIMBRE_75 0.750f -#define TIMBRE_DEFAULT TIMBRE_50 - +#ifndef TIMBRE_DEFAULT +# define TIMBRE_DEFAULT TIMBRE_50 +#endif // Notes - # = Octave #ifdef __arm__ |