aboutsummaryrefslogtreecommitdiff
path: root/quantum/audio
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-07-22 00:14:26 -0400
committerJack Humbert <jack.humb@gmail.com>2017-07-23 14:59:29 -0400
commit415d38ba9ee20424ce354ed5f8e590fae58b863f (patch)
tree663b609ace954533aff4a964b4c7cb3300bd73cd /quantum/audio
parent9abbbe70890ee0a0c619411c76a2c7b82b1b49d5 (diff)
downloadqmk_firmware-415d38ba9ee20424ce354ed5f8e590fae58b863f.tar.gz
qmk_firmware-415d38ba9ee20424ce354ed5f8e590fae58b863f.zip
adds music mode, music mode songs, music mask
Diffstat (limited to 'quantum/audio')
-rw-r--r--quantum/audio/audio.h4
-rw-r--r--quantum/audio/song_list.h32
2 files changed, 34 insertions, 2 deletions
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index e29770e3b..79e0da229 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -100,8 +100,8 @@ void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat);
100#define NOTE_ARRAY_SIZE(x) ((int16_t)(sizeof(x) / (sizeof(x[0])))) 100#define NOTE_ARRAY_SIZE(x) ((int16_t)(sizeof(x) / (sizeof(x[0]))))
101#define PLAY_NOTE_ARRAY(note_array, note_repeat, deprecated_arg) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), (note_repeat)); \ 101#define PLAY_NOTE_ARRAY(note_array, note_repeat, deprecated_arg) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), (note_repeat)); \
102 _Pragma ("message \"'PLAY_NOTE_ARRAY' macro is deprecated\"") 102 _Pragma ("message \"'PLAY_NOTE_ARRAY' macro is deprecated\"")
103#define PLAY_SONG(note_array) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), false); 103#define PLAY_SONG(note_array) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), false)
104#define PLAY_LOOP(note_array) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), true); 104#define PLAY_LOOP(note_array) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), true)
105 105
106bool is_playing_notes(void); 106bool is_playing_notes(void);
107 107
diff --git a/quantum/audio/song_list.h b/quantum/audio/song_list.h
index 6960bee6d..f355d371b 100644
--- a/quantum/audio/song_list.h
+++ b/quantum/audio/song_list.h
@@ -139,6 +139,38 @@
139 E__NOTE(_B5), \ 139 E__NOTE(_B5), \
140 E__NOTE(_A5 ), 140 E__NOTE(_A5 ),
141 141
142#define VOICE_CHANGE_SOUND \
143 Q__NOTE(_A5 ), \
144 Q__NOTE(_CS6), \
145 Q__NOTE(_E6 ), \
146 Q__NOTE(_A6 ),
147
148#define CHROMATIC_SOUND \
149 Q__NOTE(_A5 ), \
150 Q__NOTE(_AS5 ), \
151 Q__NOTE(_B5), \
152 Q__NOTE(_C6 ), \
153 Q__NOTE(_CS6 ),
154
155#define MAJOR_SOUND \
156 Q__NOTE(_A5 ), \
157 Q__NOTE(_B5 ), \
158 Q__NOTE(_CS6), \
159 Q__NOTE(_D6 ), \
160 Q__NOTE(_E6 ),
161
162#define GUITAR_SOUND \
163 Q__NOTE(_E5 ), \
164 Q__NOTE(_A5), \
165 Q__NOTE(_D6 ), \
166 Q__NOTE(_G6 ),
167
168#define VIOLIN_SOUND \
169 Q__NOTE(_G5 ), \
170 Q__NOTE(_D6), \
171 Q__NOTE(_A6 ), \
172 Q__NOTE(_E7 ),
173
142#define CAPS_LOCK_ON_SOUND \ 174#define CAPS_LOCK_ON_SOUND \
143 E__NOTE(_A3), \ 175 E__NOTE(_A3), \
144 E__NOTE(_B3), 176 E__NOTE(_B3),