diff options
| author | Joshua T <joshua@sonofone.net> | 2016-10-15 15:14:10 -0500 |
|---|---|---|
| committer | Joshua T <joshua@sonofone.net> | 2016-10-15 15:14:10 -0500 |
| commit | 2e6a1a53d73607030c470b88d3ed7223db5e0004 (patch) | |
| tree | fd8ff310f0dba21f9135cdead49482af2276329b /quantum/keymap.h | |
| parent | 5520b0022fc6cd3dff805eb31ed4bb7e4385ee2a (diff) | |
| parent | 0a9ad8f335f5b5b9d184d9e5e9ece6cda149df7e (diff) | |
| download | firmware-2e6a1a53d73607030c470b88d3ed7223db5e0004.tar.gz firmware-2e6a1a53d73607030c470b88d3ed7223db5e0004.tar.bz2 firmware-2e6a1a53d73607030c470b88d3ed7223db5e0004.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/keymap.h')
| -rw-r--r-- | quantum/keymap.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h index f2d94d75c..85c090972 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -111,6 +111,7 @@ enum quantum_keycodes { MAGIC_UNSWAP_BACKSLASH_BACKSPACE, MAGIC_UNHOST_NKRO, MAGIC_UNSWAP_ALT_GUI, + MAGIC_TOGGLE_NKRO, // Leader key #ifndef DISABLE_LEADER @@ -190,6 +191,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 @@ -294,7 +296,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) |