diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-04-13 13:26:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-13 13:26:02 +0200 |
| commit | a43cb6c0af3ac616903172c4b8932bfc5ee4939b (patch) | |
| tree | c3ca94b544ab832507b37b6268bb04f7f7eedb4a /quantum/quantum.c | |
| parent | 3e41cde9f99778ca30c03b97470c32780379db43 (diff) | |
| parent | d3301c0f8b0005738ab9aa2030d83739ffb5c4b6 (diff) | |
| download | qmk_firmware-a43cb6c0af3ac616903172c4b8932bfc5ee4939b.tar.gz qmk_firmware-a43cb6c0af3ac616903172c4b8932bfc5ee4939b.tar.xz | |
Merge pull request #20 from qmk/master
Merge from QMK
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 10 |
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); } |