diff options
author | QMK Bot <hello@qmk.fm> | 2021-03-25 12:20:42 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-03-25 12:20:42 +0000 |
commit | 25f1a3d7591c2d9edd1f42caacbada8d6a928c2f (patch) | |
tree | 794944eb7ab74d193a3bb374b4346eb1b2360ada | |
parent | 5a0be4c6d8dad8cc8b4b1404678c69ed4334cba0 (diff) | |
parent | 0a056cfd811ea92384185f06a55b0051948f4860 (diff) | |
download | qmk_firmware-25f1a3d7591c2d9edd1f42caacbada8d6a928c2f.tar.gz qmk_firmware-25f1a3d7591c2d9edd1f42caacbada8d6a928c2f.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | tmk_core/common/action_tapping.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c index 25b200448..56044e096 100644 --- a/tmk_core/common/action_tapping.c +++ b/tmk_core/common/action_tapping.c | |||
@@ -120,22 +120,21 @@ bool process_tapping(keyrecord_t *keyp) { | |||
120 | * useful for long TAPPING_TERM but may prevent fast typing. | 120 | * useful for long TAPPING_TERM but may prevent fast typing. |
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 | (( | ||
125 | # ifdef TAPPING_TERM_PER_KEY | 124 | # ifdef TAPPING_TERM_PER_KEY |
126 | get_tapping_term(get_event_keycode(tapping_key.event, false), keyp) | 125 | get_tapping_term(get_event_keycode(tapping_key.event, false), keyp) |
127 | # else | 126 | # else |
128 | TAPPING_TERM | 127 | TAPPING_TERM |
129 | # endif | 128 | # endif |
130 | >= 500 ) | 129 | >= 500) |
131 | 130 | ||
132 | # ifdef PERMISSIVE_HOLD_PER_KEY | 131 | # ifdef PERMISSIVE_HOLD_PER_KEY |
133 | || get_permissive_hold(get_event_keycode(tapping_key.event, false), keyp) | 132 | || get_permissive_hold(get_event_keycode(tapping_key.event, false), keyp) |
134 | # elif defined(PERMISSIVE_HOLD) | 133 | # elif defined(PERMISSIVE_HOLD) |
135 | || true | 134 | || true |
136 | # endif | 135 | # endif |
137 | ) && | 136 | ) && |
138 | IS_RELEASED(event) && waiting_buffer_typed(event)) { | 137 | IS_RELEASED(event) && waiting_buffer_typed(event)) { |
139 | debug("Tapping: End. No tap. Interfered by typing key\n"); | 138 | debug("Tapping: End. No tap. Interfered by typing key\n"); |
140 | process_record(&tapping_key); | 139 | process_record(&tapping_key); |
141 | tapping_key = (keyrecord_t){}; | 140 | tapping_key = (keyrecord_t){}; |