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/musical_notes.h | |
| 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/musical_notes.h')
| -rw-r--r-- | quantum/audio/musical_notes.h | 9 |
1 files changed, 6 insertions, 3 deletions
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__ |