diff options
author | Drashna Jaelre <drashna@live.com> | 2018-05-15 19:33:53 -0700 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-05-15 22:33:53 -0400 |
commit | a572323f94b533582edab4402867dc994cc8c75f (patch) | |
tree | 9d2f9e497f6edc149add5c1a0e9525aaf128e54f /quantum | |
parent | 323cd357674ebd9ab6ac025ec8e015faeaa751e4 (diff) | |
download | qmk_firmware-a572323f94b533582edab4402867dc994cc8c75f.tar.gz qmk_firmware-a572323f94b533582edab4402867dc994cc8c75f.zip |
Add default to LEADER_TIMEOUT in case it's not defined (#2818)
* Add default to LEADER_TIMEOUT in case it's not defined
* Update Leader Timeout default
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/process_keycode/process_leader.c | 4 | ||||
-rw-r--r-- | quantum/process_keycode/process_leader.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/quantum/process_keycode/process_leader.c b/quantum/process_keycode/process_leader.c index e0fe47654..c87ef115a 100644 --- a/quantum/process_keycode/process_leader.c +++ b/quantum/process_keycode/process_leader.c | |||
@@ -18,6 +18,10 @@ | |||
18 | 18 | ||
19 | #include "process_leader.h" | 19 | #include "process_leader.h" |
20 | 20 | ||
21 | #ifndef LEADER_TIMEOUT | ||
22 | #define LEADER_TIMEOUT 300 | ||
23 | #endif | ||
24 | |||
21 | __attribute__ ((weak)) | 25 | __attribute__ ((weak)) |
22 | void leader_start(void) {} | 26 | void leader_start(void) {} |
23 | 27 | ||
diff --git a/quantum/process_keycode/process_leader.h b/quantum/process_keycode/process_leader.h index da7a3d2ef..59c3eed1b 100644 --- a/quantum/process_keycode/process_leader.h +++ b/quantum/process_keycode/process_leader.h | |||
@@ -19,14 +19,13 @@ | |||
19 | 19 | ||
20 | #include "quantum.h" | 20 | #include "quantum.h" |
21 | 21 | ||
22 | |||
22 | bool process_leader(uint16_t keycode, keyrecord_t *record); | 23 | bool process_leader(uint16_t keycode, keyrecord_t *record); |
23 | 24 | ||
24 | void leader_start(void); | 25 | void leader_start(void); |
25 | void leader_end(void); | 26 | void leader_end(void); |
26 | 27 | ||
27 | #ifndef LEADER_TIMEOUT | 28 | |
28 | #define LEADER_TIMEOUT 200 | ||
29 | #endif | ||
30 | #define SEQ_ONE_KEY(key) if (leader_sequence[0] == (key) && leader_sequence[1] == 0 && leader_sequence[2] == 0 && leader_sequence[3] == 0 && leader_sequence[4] == 0) | 29 | #define SEQ_ONE_KEY(key) if (leader_sequence[0] == (key) && leader_sequence[1] == 0 && leader_sequence[2] == 0 && leader_sequence[3] == 0 && leader_sequence[4] == 0) |
31 | #define SEQ_TWO_KEYS(key1, key2) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == 0 && leader_sequence[3] == 0 && leader_sequence[4] == 0) | 30 | #define SEQ_TWO_KEYS(key1, key2) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == 0 && leader_sequence[3] == 0 && leader_sequence[4] == 0) |
32 | #define SEQ_THREE_KEYS(key1, key2, key3) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3) && leader_sequence[3] == 0 && leader_sequence[4] == 0) | 31 | #define SEQ_THREE_KEYS(key1, key2, key3) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3) && leader_sequence[3] == 0 && leader_sequence[4] == 0) |