diff options
-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 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() \ |
diff --git a/quantum/audio/musical_notes.h b/quantum/audio/musical_notes.h index 8ac6aafd3..0ba572c34 100644 --- a/quantum/audio/musical_notes.h +++ b/quantum/audio/musical_notes.h | |||
@@ -17,7 +17,9 @@ | |||
17 | #pragma once | 17 | #pragma once |
18 | 18 | ||
19 | // Tempo Placeholder | 19 | // Tempo Placeholder |
20 | #define TEMPO_DEFAULT 100 | 20 | #ifndef TEMPO_DEFAULT |
21 | # define TEMPO_DEFAULT 100 | ||
22 | #endif | ||
21 | 23 | ||
22 | #define SONG(notes...) \ | 24 | #define SONG(notes...) \ |
23 | { notes } | 25 | { notes } |
@@ -60,8 +62,9 @@ | |||
60 | #define TIMBRE_25 0.250f | 62 | #define TIMBRE_25 0.250f |
61 | #define TIMBRE_50 0.500f | 63 | #define TIMBRE_50 0.500f |
62 | #define TIMBRE_75 0.750f | 64 | #define TIMBRE_75 0.750f |
63 | #define TIMBRE_DEFAULT TIMBRE_50 | 65 | #ifndef TIMBRE_DEFAULT |
64 | 66 | # define TIMBRE_DEFAULT TIMBRE_50 | |
67 | #endif | ||
65 | // Notes - # = Octave | 68 | // Notes - # = Octave |
66 | 69 | ||
67 | #ifdef __arm__ | 70 | #ifdef __arm__ |