summaryrefslogtreecommitdiff
path: root/quantum/quantum.c
diff options
context:
space:
mode:
authorXyverz2017-04-06 22:07:34 -0700
committerXyverz2017-04-06 22:07:34 -0700
commit303bc6999efc07f38a50c3cdc06503e6fce5fa6a (patch)
tree42f46f79866f9e64254148cca77c20562e52c2f6 /quantum/quantum.c
parent8813365ec5c091c0185563943bbf73ec53d846e0 (diff)
parent154305ce1be16b2c8abce5e5d4dee421f295d6b3 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/quantum.c')
-rw-r--r--quantum/quantum.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 62d9ef923..4f4cee4e9 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -135,7 +135,7 @@ void reset_keyboard(void) {
#endif
static bool shift_interrupted[2] = {0, 0};
-static uint16_t scs_timer = 0;
+static uint16_t scs_timer[2] = {0, 0};
bool process_record_quantum(keyrecord_t *record) {
@@ -395,7 +395,7 @@ bool process_record_quantum(keyrecord_t *record) {
case KC_LSPO: {
if (record->event.pressed) {
shift_interrupted[0] = false;
- scs_timer = timer_read ();
+ scs_timer[0] = timer_read ();
register_mods(MOD_BIT(KC_LSFT));
}
else {
@@ -405,7 +405,7 @@ bool process_record_quantum(keyrecord_t *record) {
shift_interrupted[1] = true;
}
#endif
- if (!shift_interrupted[0] && timer_elapsed(scs_timer) < TAPPING_TERM) {
+ if (!shift_interrupted[0] && timer_elapsed(scs_timer[0]) < TAPPING_TERM) {
register_code(LSPO_KEY);
unregister_code(LSPO_KEY);
}
@@ -418,7 +418,7 @@ bool process_record_quantum(keyrecord_t *record) {
case KC_RSPC: {
if (record->event.pressed) {
shift_interrupted[1] = false;
- scs_timer = timer_read ();
+ scs_timer[1] = timer_read ();
register_mods(MOD_BIT(KC_RSFT));
}
else {
@@ -428,7 +428,7 @@ bool process_record_quantum(keyrecord_t *record) {
shift_interrupted[1] = true;
}
#endif
- if (!shift_interrupted[1] && timer_elapsed(scs_timer) < TAPPING_TERM) {
+ if (!shift_interrupted[1] && timer_elapsed(scs_timer[1]) < TAPPING_TERM) {
register_code(RSPC_KEY);
unregister_code(RSPC_KEY);
}