Format code according to conventions (#12380 )

Co-authored-by: QMK Bot <hello@qmk.fm>
fix permissive hold when both PERMISSIVE_HOLD_PER_KEY and TAPPING_TERM_PER_KEY are defined (#12125 )
2021-03-25 23:18:59 +11:00 · 2021-03-25 23:13:41 +11:00
1 changed files with 11 additions and 4 deletions
--- a/tmk_core/common/action_tapping.c
+++ b/tmk_core/common/action_tapping.c
@ -120,14 +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) >= 500) &&
+                              get_tapping_term(get_event_keycode(tapping_key.event, false), keyp)
+#        else
+                              TAPPING_TERM
 #        endif
+                              >= 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
 #        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){};
Author	SHA1	Message	Date
github-actions[bot]	0a056cfd81	Format code according to conventions (#12380 ) Co-authored-by: QMK Bot <hello@qmk.fm>	2021-03-25 23:18:59 +11:00
purple-rw	5c1442766c	fix permissive hold when both PERMISSIVE_HOLD_PER_KEY and TAPPING_TERM_PER_KEY are defined (#12125 ) Co-authored-by: checyr <32964049+checyr@users.noreply.github.com>	2021-03-25 23:13:41 +11:00