Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
drashna authored and jackhumbert committed Feb 8, 2018
1 parent c5d81a8 commit 6835ae8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions docs/feature_audio.md
Expand Up @@ -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

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

This is still a WIP, but check out `quantum/keymap_midi.c` to see what's happening. Enable from the Makefile.
Expand Down
1 change: 1 addition & 0 deletions keyboards/orthodox/keymaps/drashna/config.h
Expand Up @@ -69,6 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef AUDIO_ENABLE
#define C6_AUDIO
#define STARTUP_SONG SONG(IMPERIAL_MARCH)
#define NO_MUSIC_MODE
#endif

#undef PRODUCT
Expand Down
6 changes: 3 additions & 3 deletions quantum/quantum.c
Expand Up @@ -147,7 +147,7 @@ void reset_keyboard(void) {
#if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
process_midi_all_notes_off();
#endif
#if defined(AUDIO_ENABLE)
#if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
music_all_notes_off();
uint16_t timer_start = timer_read();
PLAY_SONG(goodbye_song);
Expand Down Expand Up @@ -236,7 +236,7 @@ bool process_record_quantum(keyrecord_t *record) {
#ifdef STENO_ENABLE
process_steno(keycode, record) &&
#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) &&
#endif
#ifdef TAP_DANCE_ENABLE
Expand Down Expand Up @@ -834,7 +834,7 @@ void matrix_init_quantum() {
}

void matrix_scan_quantum() {
#ifdef AUDIO_ENABLE
#if defined(AUDIO_ENABLE)
matrix_scan_music();
#endif

Expand Down

0 comments on commit 6835ae8

Please sign in to comment.