aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common/action.c
diff options
context:
space:
mode:
authorErez Zukerman <ezuk@madmimi.com>2015-10-28 04:19:13 +0200
committerErez Zukerman <ezuk@madmimi.com>2015-10-28 04:19:13 +0200
commitf024a462cdaa4a7a345160819bdf2d01fbabc97a (patch)
tree238c278b201ebed69c69c4dc8f07829966cf9b15 /tmk_core/common/action.c
parentd3db8d62f6fc6a7dee43978ddc8356579b502b37 (diff)
downloadqmk_firmware-f024a462cdaa4a7a345160819bdf2d01fbabc97a.tar.gz
qmk_firmware-f024a462cdaa4a7a345160819bdf2d01fbabc97a.zip
Fixes rolling combos for mod-tap keys
Diffstat (limited to 'tmk_core/common/action.c')
-rw-r--r--tmk_core/common/action.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 1f15bd091..77ea39e94 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -142,12 +142,15 @@ void process_action(keyrecord_t *record)
142 default: 142 default:
143 if (event.pressed) { 143 if (event.pressed) {
144 if (tap_count > 0) { 144 if (tap_count > 0) {
145#ifndef IGNORE_MOD_TAP_INTERRUPT
145 if (record->tap.interrupted) { 146 if (record->tap.interrupted) {
146 dprint("MODS_TAP: Tap: Cancel: add_mods\n"); 147 dprint("mods_tap: tap: cancel: add_mods\n");
147 // ad hoc: set 0 to cancel tap 148 // ad hoc: set 0 to cancel tap
148 record->tap.count = 0; 149 record->tap.count = 0;
149 register_mods(mods); 150 register_mods(mods);
150 } else { 151 } else
152#endif
153 {
151 dprint("MODS_TAP: Tap: register_code\n"); 154 dprint("MODS_TAP: Tap: register_code\n");
152 register_code(action.key.code); 155 register_code(action.key.code);
153 } 156 }
@@ -397,7 +400,7 @@ void register_code(uint8_t code)
397 set_mods(tmp_mods); 400 set_mods(tmp_mods);
398 send_keyboard_report(); 401 send_keyboard_report();
399 oneshot_cancel(); 402 oneshot_cancel();
400 } else 403 } else
401*/ 404*/
402#endif 405#endif
403 { 406 {