drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7

Browse source
This commit is contained in:
Jack Humbert 2016-11-21 20:17:45 -05:00
commit 450a8fb5b6
22 changed files with 1226 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

11
quantum/quantum.c
View file

@ -1,5 +1,9 @@
#include "quantum.h"
#ifndef TAPPING_TERM
#define TAPPING_TERM 200
#endif
static void do_code16 (uint16_t code, void (*f) (uint8_t)) {
switch (code) {
case QK_MODS ... QK_MODS_MAX:
@ -75,6 +79,7 @@ void reset_keyboard(void) {
#endif
static bool shift_interrupted[2] = {0, 0};
static uint16_t scs_timer = 0;
bool process_record_quantum(keyrecord_t *record) {
@ -286,6 +291,7 @@ bool process_record_quantum(keyrecord_t *record) {
case KC_LSPO: {
if (record->event.pressed) {
shift_interrupted[0] = false;
scs_timer = timer_read ();
register_mods(MOD_BIT(KC_LSFT));
}
else {
@ -295,7 +301,7 @@ bool process_record_quantum(keyrecord_t *record) {
shift_interrupted[1] = true;
}
#endif
if (!shift_interrupted[0]) {
if (!shift_interrupted[0] && timer_elapsed(scs_timer) < TAPPING_TERM) {
register_code(LSPO_KEY);
unregister_code(LSPO_KEY);
}
@ -308,6 +314,7 @@ bool process_record_quantum(keyrecord_t *record) {
case KC_RSPC: {
if (record->event.pressed) {
shift_interrupted[1] = false;
scs_timer = timer_read ();
register_mods(MOD_BIT(KC_RSFT));
}
else {
@ -317,7 +324,7 @@ bool process_record_quantum(keyrecord_t *record) {
shift_interrupted[1] = true;
}
#endif
if (!shift_interrupted[1]) {
if (!shift_interrupted[1] && timer_elapsed(scs_timer) < TAPPING_TERM) {
register_code(RSPC_KEY);
unregister_code(RSPC_KEY);
}