diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-05-15 00:51:06 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-05-15 00:51:06 -0400 |
| commit | fde477a927edc6b4207a6968d44aeed021e8b300 (patch) | |
| tree | 89a52f005d7d119af31b03261607792aa1f459ff /quantum/keymap_common.h | |
| parent | bf5c2ccee5497523c214dae7aacdc27fdbb0f235 (diff) | |
| download | qmk_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.h')
| -rw-r--r-- | quantum/keymap_common.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h index 0074ab164..07020150a 100644 --- a/quantum/keymap_common.h +++ b/quantum/keymap_common.h | |||
| @@ -195,6 +195,7 @@ extern const uint16_t fn_actions[]; | |||
| 195 | 195 | ||
| 196 | 196 | ||
| 197 | 197 | ||
| 198 | |||
| 198 | // MAGIC keycodes | 199 | // MAGIC keycodes |
| 199 | #define MAGIC_SWAP_CONTROL_CAPSLOCK 0x5002 | 200 | #define MAGIC_SWAP_CONTROL_CAPSLOCK 0x5002 |
| 200 | #define MAGIC_UNSWAP_CONTROL_CAPSLOCK 0x5003 | 201 | #define MAGIC_UNSWAP_CONTROL_CAPSLOCK 0x5003 |
| @@ -232,6 +233,10 @@ extern const uint16_t fn_actions[]; | |||
| 232 | #define MUV_IN 0x5024 | 233 | #define MUV_IN 0x5024 |
| 233 | #define MUV_DE 0x5025 | 234 | #define MUV_DE 0x5025 |
| 234 | 235 | ||
| 236 | // Midi mode on/off | ||
| 237 | #define MI_ON 0x5026 | ||
| 238 | #define MI_OFF 0x5027 | ||
| 239 | |||
| 235 | // GOTO layer - 16 layers max | 240 | // GOTO layer - 16 layers max |
| 236 | // when: | 241 | // when: |
| 237 | // ON_PRESS = 1 | 242 | // ON_PRESS = 1 |
