aboutsummaryrefslogtreecommitdiff
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-05-15 00:51:06 -0400
committerJack Humbert <jack.humb@gmail.com>2016-05-15 00:51:06 -0400
commitfde477a927edc6b4207a6968d44aeed021e8b300 (patch)
tree89a52f005d7d119af31b03261607792aa1f459ff /quantum/keymap_common.c
parentbf5c2ccee5497523c214dae7aacdc27fdbb0f235 (diff)
downloadqmk_firmware-fde477a927edc6b4207a6968d44aeed021e8b300.tar.gz
qmk_firmware-fde477a927edc6b4207a6968d44aeed021e8b300.zip
updates midi functionality (#331)
* implements leader key for planck experimental * allows override of leader timeout * adds ability to use the leader key in seq * fixes leader keycode * adds chording prototype * fixes keycode detection * moves music mode to quantum.c * disables chording by default * adds music sequencer functionality * implements audio/music functions in quantum.c * splits up process_action to allow independent processing of actions * moves midi stuff to quantum.c * adds additional scales for midi
Diffstat (limited to 'quantum/keymap_common.c')
-rw-r--r--quantum/keymap_common.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 0184770c4..2aae13e67 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -282,11 +282,6 @@ static action_t keycode_to_action(uint16_t keycode)
282 action.code = ACTION_MODS_ONESHOT(mod); 282 action.code = ACTION_MODS_ONESHOT(mod);
283 } 283 }
284 break; 284 break;
285 #ifdef MIDI_ENABLE
286 case 0x6000 ... 0x6FFF:
287 action.code = ACTION_FUNCTION_OPT(keycode & 0xFF, (keycode & 0x0F00) >> 8);
288 break;
289 #endif
290 case 0x7000 ... 0x7FFF: 285 case 0x7000 ... 0x7FFF:
291 action.code = ACTION_MODS_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF); 286 action.code = ACTION_MODS_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF);
292 break; 287 break;