drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge pull request #477 from Smilliam/master

Browse source 
Canceling Space Cadet state with opposite shift key
This commit is contained in:
Jack Humbert 2016-07-11 09:14:43 -04:00 • committed by GitHub
commit a998a48673
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
quantum/quantum.c
View file

@ -212,6 +212,12 @@ bool process_record_quantum(keyrecord_t *record) {
register_mods(MOD_BIT(KC_LSFT));
}
else {
#ifdef DISABLE_SPACE_CADET_ROLLOVER
if (get_mods() & MOD_BIT(KC_RSFT)) {
shift_interrupted[0] = true;
shift_interrupted[1] = true;
}
#endif
if (!shift_interrupted[0]) {
register_code(LSPO_KEY);
unregister_code(LSPO_KEY);
@ -228,6 +234,12 @@ bool process_record_quantum(keyrecord_t *record) {
register_mods(MOD_BIT(KC_RSFT));
}
else {
#ifdef DISABLE_SPACE_CADET_ROLLOVER
if (get_mods() & MOD_BIT(KC_LSFT)) {
shift_interrupted[0] = true;
shift_interrupted[1] = true;
}
#endif
if (!shift_interrupted[1]) {
register_code(RSPC_KEY);
unregister_code(RSPC_KEY);