alvierahman90/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add the ability to disable Music Mode completely (#2339)

Browse Source 
* 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
This commit is contained in:
Drashna Jaelre 2018-02-08 12:16:06 -08:00 committed by Jack Humbert
parent c5d81a84a0
commit 6835ae8209
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/feature_audio.md
View File

@ -82,6 +82,10 @@ The pitch standard (`PITCH_STANDARD_A`) is 440.0f by default - to change this, a
#define PITCH_STANDARD_A 432.0f #define PITCH_STANDARD_A 432.0f
You can completely disable Music Mode as well. This is useful, if you're pressed for space on your controller. To disable it, add this to your `confid.h`:
#define NO_MUSIC_MODE
## MIDI Functionality ## MIDI Functionality
This is still a WIP, but check out `quantum/keymap_midi.c` to see what's happening. Enable from the Makefile. This is still a WIP, but check out `quantum/keymap_midi.c` to see what's happening. Enable from the Makefile.

1
keyboards/orthodox/keymaps/drashna/config.h
View File

@ -69,6 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#define C6_AUDIO #define C6_AUDIO
#define STARTUP_SONG SONG(IMPERIAL_MARCH) #define STARTUP_SONG SONG(IMPERIAL_MARCH)
#define NO_MUSIC_MODE
#endif #endif
#undef PRODUCT #undef PRODUCT

6
quantum/quantum.c
View File

@ -147,7 +147,7 @@ void reset_keyboard(void) {
#if defined(MIDI_ENABLE) && defined(MIDI_BASIC) #if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
process_midi_all_notes_off(); process_midi_all_notes_off();
#endif #endif
#if defined(AUDIO_ENABLE) #if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
music_all_notes_off(); music_all_notes_off();
uint16_t timer_start = timer_read(); uint16_t timer_start = timer_read();
PLAY_SONG(goodbye_song); PLAY_SONG(goodbye_song);
@ -236,7 +236,7 @@ bool process_record_quantum(keyrecord_t *record) {
#ifdef STENO_ENABLE #ifdef STENO_ENABLE
process_steno(keycode, record) && process_steno(keycode, record) &&
#endif #endif
#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) #if ( defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))) && !defined(NO_MUSIC_MODE)
process_music(keycode, record) && process_music(keycode, record) &&
#endif #endif
#ifdef TAP_DANCE_ENABLE #ifdef TAP_DANCE_ENABLE
@ -834,7 +834,7 @@ void matrix_init_quantum() {
} }
void matrix_scan_quantum() { void matrix_scan_quantum() {
#ifdef AUDIO_ENABLE #if defined(AUDIO_ENABLE)
matrix_scan_music(); matrix_scan_music();
#endif #endif