diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-06 06:45:23 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-06 06:45:23 +0000 |
| commit | c375a8d75be08ea0699c1e13b29a49d6889e8e3a (patch) | |
| tree | 25dbe757516df4d4eb4af259431d45b709f43587 /quantum | |
| parent | b7f2f40ae5bf9ad148e2de58757a14813f37a779 (diff) | |
| parent | 23d6ca99427de0fa8dabb0c4d70a7d1ebc4c9fdf (diff) | |
| download | qmk_firmware-c375a8d75be08ea0699c1e13b29a49d6889e8e3a.tar.gz qmk_firmware-c375a8d75be08ea0699c1e13b29a49d6889e8e3a.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/quantum_keycodes.h | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 89a7cf7f84..a21d0959bb 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -73,29 +73,22 @@ enum quantum_keycodes { QK_LAYER_TAP_TOGGLE_MAX = 0x58FF, QK_LAYER_MOD = 0x5900, QK_LAYER_MOD_MAX = 0x59FF, -#ifdef STENO_ENABLE - QK_STENO = 0x5A00, - QK_STENO_BOLT = 0x5A30, - QK_STENO_GEMINI = 0x5A31, - QK_STENO_MAX = 0x5A3F, -#endif - QK_SWAP_HANDS = 0x5B00, - QK_SWAP_HANDS_MAX = 0x5BFF, - QK_MOD_TAP = 0x6000, - QK_MOD_TAP_MAX = 0x7FFF, -#ifdef UNICODE_ENABLE - QK_UNICODE = 0x8000, - QK_UNICODE_MAX = 0xFFFF, -#endif -#ifdef UNICODEMAP_ENABLE - QK_UNICODEMAP = 0x8000, - QK_UNICODEMAP_MAX = 0xBFFF, - QK_UNICODEMAP_PAIR = 0xC000, - QK_UNICODEMAP_PAIR_MAX = 0xFFFF, -#endif + QK_STENO = 0x5A00, + QK_STENO_BOLT = 0x5A30, + QK_STENO_GEMINI = 0x5A31, + QK_STENO_MAX = 0x5A3F, + QK_SWAP_HANDS = 0x5B00, + QK_SWAP_HANDS_MAX = 0x5BFF, + QK_MOD_TAP = 0x6000, + QK_MOD_TAP_MAX = 0x7FFF, + QK_UNICODE = 0x8000, + QK_UNICODE_MAX = 0xFFFF, + QK_UNICODEMAP = 0x8000, + QK_UNICODEMAP_MAX = 0xBFFF, + QK_UNICODEMAP_PAIR = 0xC000, + QK_UNICODEMAP_PAIR_MAX = 0xFFFF, // Loose keycodes - to be used directly - RESET = 0x5C00, DEBUG, MAGIC_SWAP_CONTROL_CAPSLOCK, |