diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-02-08 12:16:06 -0800 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-02-08 15:16:06 -0500 |
| commit | 6835ae82095427b2b5d5b3839a8d54845244169b (patch) | |
| tree | ebd3a740ea7cc58b6ecc82a18044ec44c8eebb77 /quantum/quantum.c | |
| parent | c5d81a84a0519c78de1b5e165f5f2c1eb773bc11 (diff) | |
| download | qmk_firmware-6835ae82095427b2b5d5b3839a8d54845244169b.tar.gz qmk_firmware-6835ae82095427b2b5d5b3839a8d54845244169b.zip | |
Add the ability to disable Music Mode completely (#2339)
* Skip process_music in NO_MUSIC_MODE is defined
* Skip matrix_scan_music if NO_MUSIC_MODE is defined
* Skip music_all_notes_off if NO_MUSIC_MODE is defined
* Leave matrix_scan_music in, because it reduces firmware size by 150b....
* Add docs for NO_MUSIC_MODE
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index bd95d5ea8..66feca2f2 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -147,7 +147,7 @@ void reset_keyboard(void) { | |||
| 147 | #if defined(MIDI_ENABLE) && defined(MIDI_BASIC) | 147 | #if defined(MIDI_ENABLE) && defined(MIDI_BASIC) |
| 148 | process_midi_all_notes_off(); | 148 | process_midi_all_notes_off(); |
| 149 | #endif | 149 | #endif |
| 150 | #if defined(AUDIO_ENABLE) | 150 | #if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE) |
| 151 | music_all_notes_off(); | 151 | music_all_notes_off(); |
| 152 | uint16_t timer_start = timer_read(); | 152 | uint16_t timer_start = timer_read(); |
| 153 | PLAY_SONG(goodbye_song); | 153 | PLAY_SONG(goodbye_song); |
| @@ -236,7 +236,7 @@ bool process_record_quantum(keyrecord_t *record) { | |||
| 236 | #ifdef STENO_ENABLE | 236 | #ifdef STENO_ENABLE |
| 237 | process_steno(keycode, record) && | 237 | process_steno(keycode, record) && |
| 238 | #endif | 238 | #endif |
| 239 | #if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) | 239 | #if ( defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))) && !defined(NO_MUSIC_MODE) |
| 240 | process_music(keycode, record) && | 240 | process_music(keycode, record) && |
| 241 | #endif | 241 | #endif |
| 242 | #ifdef TAP_DANCE_ENABLE | 242 | #ifdef TAP_DANCE_ENABLE |
| @@ -834,7 +834,7 @@ void matrix_init_quantum() { | |||
| 834 | } | 834 | } |
| 835 | 835 | ||
| 836 | void matrix_scan_quantum() { | 836 | void matrix_scan_quantum() { |
| 837 | #ifdef AUDIO_ENABLE | 837 | #if defined(AUDIO_ENABLE) |
| 838 | matrix_scan_music(); | 838 | matrix_scan_music(); |
| 839 | #endif | 839 | #endif |
| 840 | 840 | ||
