summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Young <gabeplaysdrums@live.com>2017-03-02 11:40:06 -0800
committerGabriel Young <gabeplaysdrums@live.com>2017-03-02 11:40:06 -0800
commitd11962aeb27c73b87f8154d7f2cee747c8858d09 (patch)
tree6cdbe00dd2c18f408fb9be01d6f7d5a6762b2c5f
parent976c856966841cd0be6e514c6365c73164f5b96d (diff)
fix 'stop_all_notes' naming to be more consistent
-rw-r--r--quantum/process_keycode/process_audio.c2
-rw-r--r--quantum/process_keycode/process_audio.h2
-rw-r--r--quantum/process_keycode/process_midi.c2
-rw-r--r--quantum/process_keycode/process_midi.h2
-rw-r--r--quantum/process_keycode/process_music.c4
-rw-r--r--quantum/template/keymaps/default/Makefile2
6 files changed, 7 insertions, 7 deletions
diff --git a/quantum/process_keycode/process_audio.c b/quantum/process_keycode/process_audio.c
index 71c0297ee2..0b6380ed39 100644
--- a/quantum/process_keycode/process_audio.c
+++ b/quantum/process_keycode/process_audio.c
@@ -54,7 +54,7 @@ void process_audio_noteoff(uint8_t note) {
stop_note(compute_freq_for_midi_note(note));
}
-void process_audio_stop_all_notes(void) {
+void process_audio_all_notes_off(void) {
stop_all_notes();
}
diff --git a/quantum/process_keycode/process_audio.h b/quantum/process_keycode/process_audio.h
index 59a17725a7..7ac15b7330 100644
--- a/quantum/process_keycode/process_audio.h
+++ b/quantum/process_keycode/process_audio.h
@@ -4,7 +4,7 @@
bool process_audio(uint16_t keycode, keyrecord_t *record);
void process_audio_noteon(uint8_t note);
void process_audio_noteoff(uint8_t note);
-void process_audio_stop_all_notes(void);
+void process_audio_all_notes_off(void);
void audio_on_user(void);
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index 214bba9020..700c6ce8e6 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -15,7 +15,7 @@ void process_midi_basic_noteoff(uint8_t note)
midi_send_noteoff(&midi_device, 0, note, 0);
}
-void process_midi_basic_stop_all_notes(void)
+void process_midi_all_notes_off(void)
{
midi_send_cc(&midi_device, 0, 0x7B, 0);
}
diff --git a/quantum/process_keycode/process_midi.h b/quantum/process_keycode/process_midi.h
index 0f559ec23a..58b7650c67 100644
--- a/quantum/process_keycode/process_midi.h
+++ b/quantum/process_keycode/process_midi.h
@@ -8,7 +8,7 @@
#ifdef MIDI_BASIC
void process_midi_basic_noteon(uint8_t note);
void process_midi_basic_noteoff(uint8_t note);
-void process_midi_basic_stop_all_notes(void);
+void process_midi_all_notes_off(void);
#endif
#ifdef MIDI_ADVANCED
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index 4b86b91f00..f89a04ee31 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -44,10 +44,10 @@ static void music_noteoff(uint8_t note) {
void music_all_notes_off(void) {
#ifdef AUDIO_ENABLE
- process_audio_stop_all_notes();
+ process_audio_all_notes_off();
#endif
#if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
- process_midi_basic_stop_all_notes();
+ process_midi_all_notes_off();
#endif
}
diff --git a/quantum/template/keymaps/default/Makefile b/quantum/template/keymaps/default/Makefile
index 24442db37d..29f11bbc77 100644
--- a/quantum/template/keymaps/default/Makefile
+++ b/quantum/template/keymaps/default/Makefile
@@ -9,7 +9,7 @@ CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-MIDI_ENABLE = no # MIDI support (+3800)
+MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID