diff options
author | Erez Zukerman <bulk@ezuk.org> | 2016-05-15 00:27:32 -0400 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2016-05-15 00:27:32 -0400 |
commit | 1a8c0dd22d6a2255511d0db6a456315541b5815b (patch) | |
tree | 6c7d5e9dc66f9ce864cfe87a72dfb47e6f06d3a7 /quantum/keymap_common.h | |
parent | 79d26f331a275c99f76a30d34752fbd65bb3f335 (diff) | |
download | firmware-1a8c0dd22d6a2255511d0db6a456315541b5815b.tar.gz firmware-1a8c0dd22d6a2255511d0db6a456315541b5815b.tar.bz2 firmware-1a8c0dd22d6a2255511d0db6a456315541b5815b.zip |
Leader key implementation (#326)
* implements leader key for planck experimental
* allows override of leader timeout
* adds ability to use the leader key in seq
* fixes leader keycode
* adds chording prototype
* fixes keycode detection
* moves music mode to quantum.c
* disables chording by default
* updates process_action functions to return bool
Diffstat (limited to 'quantum/keymap_common.h')
-rw-r--r-- | quantum/keymap_common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h index 322fda498..2ad1ba6c6 100644 --- a/quantum/keymap_common.h +++ b/quantum/keymap_common.h @@ -159,7 +159,7 @@ extern const uint16_t fn_actions[]; #define S(kc) LSFT(kc) #define F(kc) FUNC(kc) -#define M(kc) kc | 0x3000 +#define M(kc) (kc | 0x3000) #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) @@ -191,6 +191,8 @@ extern const uint16_t fn_actions[]; #define RESET 0x5000 #define DEBUG 0x5001 +#define KC_LEAD 0x5014 + // MAGIC keycodes #define MAGIC_SWAP_CONTROL_CAPSLOCK 0x5002 |