diff options
author | Callum Oakley <callum@pusher.com> | 2017-08-19 10:34:45 +0100 |
---|---|---|
committer | Callum Oakley <callum@pusher.com> | 2017-08-19 10:34:45 +0100 |
commit | a6845036e25c4f4d936dcd12cd0ddedd2894b30e (patch) | |
tree | b23b4e8d9d757aa3c0d42be561572533ae0d126c /quantum/quantum_keycodes.h | |
parent | 84a8aabe5bf8807595f98de44d18f6a31b892edf (diff) | |
parent | 7277f09bbadcce120f819132dec8ff7172caacc4 (diff) | |
download | qmk_firmware-a6845036e25c4f4d936dcd12cd0ddedd2894b30e.tar.gz qmk_firmware-a6845036e25c4f4d936dcd12cd0ddedd2894b30e.zip |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'quantum/quantum_keycodes.h')
-rw-r--r-- | quantum/quantum_keycodes.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 6038e31c46..1bb6706ba4 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -26,6 +26,10 @@ #endif #endif +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + enum quantum_keycodes { // Ranges used in shortucuts - not to be used directly QK_TMK = 0x0000, @@ -67,6 +71,12 @@ enum quantum_keycodes { QK_TAP_DANCE_MAX = 0x57FF, QK_LAYER_TAP_TOGGLE = 0x5800, QK_LAYER_TAP_TOGGLE_MAX = 0x58FF, +#ifdef STENO_ENABLE + QK_STENO = 0x5A00, + QK_STENO_BOLT = 0x5A30, + QK_STENO_GEMINI = 0x5A31, + QK_STENO_MAX = 0x5A3F, +#endif QK_MOD_TAP = 0x6000, QK_MOD_TAP_MAX = 0x7FFF, #if defined(UNICODEMAP_ENABLE) && defined(UNICODE_ENABLE) @@ -128,6 +138,9 @@ enum quantum_keycodes { MU_OFF, MU_TOG, + // Music mode cycle + MU_MOD, + // Music voice iterate MUV_IN, MUV_DE, @@ -406,6 +419,10 @@ enum quantum_keycodes { OUT_BT, #endif +#ifdef KEY_LOCK_ENABLE + KC_LOCK, +#endif + // always leave at the end SAFE_RANGE }; |