Merge remote-tracking branch 'qmk/master' into merge-2022-07-11

2022-07-11 18:29:50 -06:00 · 2022-07-11 18:29:50 -06:00 · fde0c10bae
commit fde0c10bae
parent b37649af36 2714c70bd7
7121 changed files with 170388 additions and 28118 deletions
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@ -183,12 +183,7 @@ if (!QS_auto_shift_modifiers) {
 #            endif
        ) &&
 #        endif
-        TIMER_DIFF_16(now, autoshift_time) <
-#        ifdef TAPPING_TERM_PER_KEY
-        get_tapping_term(autoshift_lastkey, record)
-#        else
-        TAPPING_TERM
-#        endif
+        TIMER_DIFF_16(now, autoshift_time) < GET_TAPPING_TERM(autoshift_lastkey, record)
    ) {
        // clang-format on
        // Allow a tap-then-hold for keyrepeat.