summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-25 12:20:42 +0000
committerQMK Bot <hello@qmk.fm>2021-03-25 12:20:42 +0000
commit25f1a3d7591c2d9edd1f42caacbada8d6a928c2f (patch)
tree794944eb7ab74d193a3bb374b4346eb1b2360ada /tmk_core
parent5a0be4c6d8dad8cc8b4b1404678c69ed4334cba0 (diff)
parent0a056cfd811ea92384185f06a55b0051948f4860 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/action_tapping.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c
index 25b200448f..56044e096d 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) {
* useful for long TAPPING_TERM but may prevent fast typing.
*/
# if defined(TAPPING_TERM_PER_KEY) || (TAPPING_TERM >= 500) || defined(PERMISSIVE_HOLD) || defined(PERMISSIVE_HOLD_PER_KEY)
- else if (
- ((
+ else if (((
# ifdef TAPPING_TERM_PER_KEY
- get_tapping_term(get_event_keycode(tapping_key.event, false), keyp)
+ get_tapping_term(get_event_keycode(tapping_key.event, false), keyp)
# else
- TAPPING_TERM
+ TAPPING_TERM
# endif
- >= 500 )
+ >= 500)
# ifdef PERMISSIVE_HOLD_PER_KEY
- || get_permissive_hold(get_event_keycode(tapping_key.event, false), keyp)
+ || get_permissive_hold(get_event_keycode(tapping_key.event, false), keyp)
# elif defined(PERMISSIVE_HOLD)
- || true
+ || true
# endif
- ) &&
- IS_RELEASED(event) && waiting_buffer_typed(event)) {
+ ) &&
+ IS_RELEASED(event) && waiting_buffer_typed(event)) {
debug("Tapping: End. No tap. Interfered by typing key\n");
process_record(&tapping_key);
tapping_key = (keyrecord_t){};