aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-06-21 22:55:54 -0400
committerJack Humbert <jack.humb@gmail.com>2016-06-21 22:55:54 -0400
commit98f0807359cfa78d25442b91ff4c5bbfc5679661 (patch)
treedf27f63f12c5710d1743280f8aac454eab795747
parent649b33d7783cf3021928534b7ae127e0a89e8807 (diff)
downloadqmk_firmware-98f0807359cfa78d25442b91ff4c5bbfc5679661.tar.gz
qmk_firmware-98f0807359cfa78d25442b91ff4c5bbfc5679661.zip
increase leader seq size to 5
-rw-r--r--quantum/quantum.c4
-rw-r--r--quantum/quantum.h10
2 files changed, 9 insertions, 5 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 49ac20d61..006464e5a 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -54,7 +54,7 @@ int offset = 7;
54bool leading = false; 54bool leading = false;
55uint16_t leader_time = 0; 55uint16_t leader_time = 0;
56 56
57uint16_t leader_sequence[3] = {0, 0, 0}; 57uint16_t leader_sequence[5] = {0, 0, 0, 0, 0};
58uint8_t leader_sequence_size = 0; 58uint8_t leader_sequence_size = 0;
59 59
60// Chording stuff 60// Chording stuff
@@ -335,6 +335,8 @@ bool process_record_quantum(keyrecord_t *record) {
335 leader_sequence[0] = 0; 335 leader_sequence[0] = 0;
336 leader_sequence[1] = 0; 336 leader_sequence[1] = 0;
337 leader_sequence[2] = 0; 337 leader_sequence[2] = 0;
338 leader_sequence[3] = 0;
339 leader_sequence[4] = 0;
338 return false; 340 return false;
339 } 341 }
340 if (leading && timer_elapsed(leader_time) < LEADER_TIMEOUT) { 342 if (leading && timer_elapsed(leader_time) < LEADER_TIMEOUT) {
diff --git a/quantum/quantum.h b/quantum/quantum.h
index e15003805..1f78f3717 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -54,11 +54,13 @@ extern uint32_t default_layer_state;
54 #ifndef LEADER_TIMEOUT 54 #ifndef LEADER_TIMEOUT
55 #define LEADER_TIMEOUT 200 55 #define LEADER_TIMEOUT 200
56 #endif 56 #endif
57 #define SEQ_ONE_KEY(key) if (leader_sequence[0] == (key) && leader_sequence[1] == 0 && leader_sequence[2] == 0) 57 #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)
58 #define SEQ_TWO_KEYS(key1, key2) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == 0) 58 #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)
59 #define SEQ_THREE_KEYS(key1, key2, key3) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3)) 59 #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)
60 #define SEQ_FOUR_KEYS(key1, key2, key3, key4) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3) && leader_sequence[3] == (key4) && leader_sequence[4] == 0)
61 #define SEQ_FIVE_KEYS(key1, key2, key3, key4, key5) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3) && leader_sequence[3] == (key4) && leader_sequence[4] == (key5))
60 62
61 #define LEADER_EXTERNS() extern bool leading; extern uint16_t leader_time; extern uint16_t leader_sequence[3]; extern uint8_t leader_sequence_size 63 #define LEADER_EXTERNS() extern bool leading; extern uint16_t leader_time; extern uint16_t leader_sequence[5]; extern uint8_t leader_sequence_size
62 #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT) 64 #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT)
63#endif 65#endif
64 66