diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-16 17:53:47 +0100 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-16 17:53:47 +0100 |
| commit | 21f4944426903dfd1c3fda7c1da452ca969dd820 (patch) | |
| tree | 375379cca5a68d53cc187060c6e6770bfcfd8c78 /quantum/quantum_keycodes.h | |
| parent | 96a8e2d5f52c4f9d4c774f820139be726894e70d (diff) | |
| parent | e34c3936b7db8f9d39f1eb0d0f4734fc37d7ebe3 (diff) | |
| download | qmk_firmware-21f4944426903dfd1c3fda7c1da452ca969dd820.tar.gz qmk_firmware-21f4944426903dfd1c3fda7c1da452ca969dd820.tar.xz | |
Merge branch 'master' into promethium
Diffstat (limited to 'quantum/quantum_keycodes.h')
| -rw-r--r-- | quantum/quantum_keycodes.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index cc7a5013f..63b626926 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -41,16 +41,21 @@ enum quantum_keycodes { #endif QK_TAP_DANCE = 0x5700, QK_TAP_DANCE_MAX = 0x57FF, -#ifdef UNICODEMAP_ENABLE - QK_UNICODE_MAP = 0x5800, - QK_UNICODE_MAP_MAX = 0x5BFF, -#endif + QK_LAYER_TAP_TOGGLE = 0x5800, + QK_LAYER_TAP_TOGGLE_MAX = 0x58FF, QK_MOD_TAP = 0x6000, QK_MOD_TAP_MAX = 0x7FFF, +#if defined(UNICODEMAP_ENABLE) && defined(UNICODE_ENABLE) + #error "Cannot enable both UNICODEMAP && UNICODE" +#endif #ifdef UNICODE_ENABLE QK_UNICODE = 0x8000, QK_UNICODE_MAX = 0xFFFF, #endif +#ifdef UNICODEMAP_ENABLE + QK_UNICODE_MAP = 0x8000, + QK_UNICODE_MAP_MAX = 0x83FF, +#endif // Loose keycodes - to be used directly @@ -304,6 +309,9 @@ enum quantum_keycodes { // One-shot mod #define OSM(mod) (mod | QK_ONE_SHOT_MOD) +// Layer tap-toggle +#define TT(layer) (layer | QK_LAYER_TAP_TOGGLE) + // M-od, T-ap - 256 keycode max #define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0x1F) << 8)) |