increase leader seq size to 5

master
Jack Humbert 2016-06-21 22:55:54 -04:00
parent 649b33d778
commit 98f0807359
2 changed files with 9 additions and 5 deletions

View File

@ -54,7 +54,7 @@ int offset = 7;
bool leading = false; bool leading = false;
uint16_t leader_time = 0; uint16_t leader_time = 0;
uint16_t leader_sequence[3] = {0, 0, 0}; uint16_t leader_sequence[5] = {0, 0, 0, 0, 0};
uint8_t leader_sequence_size = 0; uint8_t leader_sequence_size = 0;
// Chording stuff // Chording stuff
@ -335,6 +335,8 @@ bool process_record_quantum(keyrecord_t *record) {
leader_sequence[0] = 0; leader_sequence[0] = 0;
leader_sequence[1] = 0; leader_sequence[1] = 0;
leader_sequence[2] = 0; leader_sequence[2] = 0;
leader_sequence[3] = 0;
leader_sequence[4] = 0;
return false; return false;
} }
if (leading && timer_elapsed(leader_time) < LEADER_TIMEOUT) { if (leading && timer_elapsed(leader_time) < LEADER_TIMEOUT) {

View File

@ -54,11 +54,13 @@ extern uint32_t default_layer_state;
#ifndef LEADER_TIMEOUT #ifndef LEADER_TIMEOUT
#define LEADER_TIMEOUT 200 #define LEADER_TIMEOUT 200
#endif #endif
#define SEQ_ONE_KEY(key) if (leader_sequence[0] == (key) && leader_sequence[1] == 0 && leader_sequence[2] == 0) #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)
#define SEQ_TWO_KEYS(key1, key2) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == 0) #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)
#define SEQ_THREE_KEYS(key1, key2, key3) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3)) #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)
#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)
#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))
#define LEADER_EXTERNS() extern bool leading; extern uint16_t leader_time; extern uint16_t leader_sequence[3]; extern uint8_t leader_sequence_size #define LEADER_EXTERNS() extern bool leading; extern uint16_t leader_time; extern uint16_t leader_sequence[5]; extern uint8_t leader_sequence_size
#define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT) #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT)
#endif #endif