diff options
| -rw-r--r-- | tmk_core/common/action_tapping.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c index fe545c79a..25b200448 100644 --- a/tmk_core/common/action_tapping.c +++ b/tmk_core/common/action_tapping.c | |||
| @@ -121,12 +121,20 @@ bool process_tapping(keyrecord_t *keyp) { | |||
| 121 | */ | 121 | */ |
| 122 | # if defined(TAPPING_TERM_PER_KEY) || (TAPPING_TERM >= 500) || defined(PERMISSIVE_HOLD) || defined(PERMISSIVE_HOLD_PER_KEY) | 122 | # if defined(TAPPING_TERM_PER_KEY) || (TAPPING_TERM >= 500) || defined(PERMISSIVE_HOLD) || defined(PERMISSIVE_HOLD_PER_KEY) |
| 123 | else if ( | 123 | else if ( |
| 124 | (( | ||
| 124 | # ifdef TAPPING_TERM_PER_KEY | 125 | # ifdef TAPPING_TERM_PER_KEY |
| 125 | (get_tapping_term(get_event_keycode(tapping_key.event, false), keyp) >= 500) && | 126 | get_tapping_term(get_event_keycode(tapping_key.event, false), keyp) |
| 127 | # else | ||
| 128 | TAPPING_TERM | ||
| 126 | # endif | 129 | # endif |
| 130 | >= 500 ) | ||
| 131 | |||
| 127 | # ifdef PERMISSIVE_HOLD_PER_KEY | 132 | # ifdef PERMISSIVE_HOLD_PER_KEY |
| 128 | !get_permissive_hold(get_event_keycode(tapping_key.event, false), keyp) && | 133 | || get_permissive_hold(get_event_keycode(tapping_key.event, false), keyp) |
| 134 | # elif defined(PERMISSIVE_HOLD) | ||
| 135 | || true | ||
| 129 | # endif | 136 | # endif |
| 137 | ) && | ||
| 130 | IS_RELEASED(event) && waiting_buffer_typed(event)) { | 138 | IS_RELEASED(event) && waiting_buffer_typed(event)) { |
| 131 | debug("Tapping: End. No tap. Interfered by typing key\n"); | 139 | debug("Tapping: End. No tap. Interfered by typing key\n"); |
| 132 | process_record(&tapping_key); | 140 | process_record(&tapping_key); |
