diff options
| author | Gabriel Young <gabeplaysdrums@live.com> | 2017-02-19 23:34:58 +0100 |
|---|---|---|
| committer | Gabriel Young <gabeplaysdrums@live.com> | 2017-02-19 23:34:58 +0100 |
| commit | 40a8a88e72c185eec629973580b72dfaaf71b116 (patch) | |
| tree | 583330bc173017de5e1d4a10ff7100ebc0f1a34b /quantum/quantum_keycodes.h | |
| parent | 1e97f77278b757d740a800ae228c6202de0679b4 (diff) | |
| parent | 49e72632d2200fc3bf71d5ced2aa43058da3b2e0 (diff) | |
| download | qmk_firmware-40a8a88e72c185eec629973580b72dfaaf71b116.tar.gz qmk_firmware-40a8a88e72c185eec629973580b72dfaaf71b116.tar.xz | |
Merge branch 'qmk/master'
Diffstat (limited to 'quantum/quantum_keycodes.h')
| -rw-r--r-- | quantum/quantum_keycodes.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index ab2e79026..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 @@ -86,6 +91,13 @@ enum quantum_keycodes { AU_OFF, AU_TOG, +#ifdef FAUXCLICKY_ENABLE + // Faux clicky + FC_ON, + FC_OFF, + FC_TOG, +#endif + // Music mode on/off/toggle MU_ON, MU_OFF, @@ -297,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)) |