diff options
| author | IBNobody <protospherex@gmail.com> | 2016-10-29 11:13:15 -0500 |
|---|---|---|
| committer | IBNobody <protospherex@gmail.com> | 2016-10-29 11:13:15 -0500 |
| commit | e40c33f754a86c4dd7bd3c7b5c7efe822f2893bc (patch) | |
| tree | bf372a8afead88128f68d373435025a16fbf53c2 /quantum/keymap.h | |
| parent | 973f526bb4928bf3aec6067aa444b31ace997c8a (diff) | |
| parent | 32f88c07173b795c6981c779057dceba00aeb1cb (diff) | |
| download | firmware-e40c33f754a86c4dd7bd3c7b5c7efe822f2893bc.tar.gz firmware-e40c33f754a86c4dd7bd3c7b5c7efe822f2893bc.tar.bz2 firmware-e40c33f754a86c4dd7bd3c7b5c7efe822f2893bc.zip | |
Merge branch 'master' of https://github.com/IBNobody/qmk_firmware
Diffstat (limited to 'quantum/keymap.h')
| -rw-r--r-- | quantum/keymap.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h index 98ddfd0c5..a01bbfbd1 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -84,6 +84,10 @@ enum quantum_keycodes { QK_MOD_TAP_MAX = 0x6FFF, QK_TAP_DANCE = 0x7100, QK_TAP_DANCE_MAX = 0x71FF, +#ifdef UNICODEMAP_ENABLE + QK_UNICODE_MAP = 0x7800, + QK_UNICODE_MAP_MAX = 0x7FFF, +#endif #ifdef UNICODE_ENABLE QK_UNICODE = 0x8000, QK_UNICODE_MAX = 0xFFFF, @@ -191,6 +195,7 @@ enum quantum_keycodes { #define HYPR(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI) #define MEH(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT) #define LCAG(kc) (kc | QK_LCTL | QK_LALT | QK_LGUI) +#define ALTG(kc) (kc | QK_RCTL | QK_RALT) #define MOD_HYPR 0xf #define MOD_MEH 0x7 @@ -295,7 +300,10 @@ enum quantum_keycodes { // ON_PRESS = 1 // ON_RELEASE = 2 // Unless you have a good reason not to do so, prefer ON_PRESS (1) as your default. -#define TO(layer, when) (layer | QK_TO | (when << 0x4)) +// In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own +// keycode modeled after the old version, kept below for this. +/* #define TO(layer, when) (layer | QK_TO | (when << 0x4)) */ +#define TO(layer) (layer | QK_TO | (ON_PRESS << 0x4)) // Momentary switch layer - 256 layer max #define MO(layer) (layer | QK_MOMENTARY) @@ -335,5 +343,8 @@ enum quantum_keycodes { #define UC(n) UNICODE(n) #endif +#ifdef UNICODEMAP_ENABLE + #define X(n) (n | QK_UNICODE_MAP) +#endif #endif |