summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorDamien <Dbroqua@users.noreply.github.com>2016-09-30 22:55:07 +0200
committerGitHub <noreply@github.com>2016-09-30 22:55:07 +0200
commit7abd3b4ddd0eb4ae4da6cce9283cfcf8089ac449 (patch)
tree7b92a1e899976a94e1846d8c0b1bd0e1039ca705 /quantum
parenteb0f21a984eff2a8c4ad15f91fb18b456373e921 (diff)
parent35e6870e5c8943c044187256e01c96ef400ca067 (diff)
downloadqmk_firmware-7abd3b4ddd0eb4ae4da6cce9283cfcf8089ac449.tar.gz
qmk_firmware-7abd3b4ddd0eb4ae4da6cce9283cfcf8089ac449.tar.xz
Merge pull request #7 from jackhumbert/master
Merge from jackhumbert
Diffstat (limited to 'quantum')
-rw-r--r--quantum/process_keycode/process_midi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index 8784e64f3..577dad43a 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -7,7 +7,9 @@ int midi_offset = 7;
bool process_midi(uint16_t keycode, keyrecord_t *record) {
if (keycode == MI_ON && record->event.pressed) {
midi_activated = true;
+#ifdef AUDIO_ENABLE
music_scale_user();
+#endif
return false;
}
@@ -63,4 +65,4 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
return false;
}
return true;
-} \ No newline at end of file
+}