qmk_settings: wrap TAP_CODE_DELAY and TAP_HOLD_CAPS_DELAY

quantum/process_keycode/process_auto_shift.c

@@ -110,9 +110,7 @@ if (QS_auto_shift_repeat && !QS_auto_shift_no_auto_repeat) {
 }
         }
 
-#    if TAP_CODE_DELAY > 0
-        wait_ms(TAP_CODE_DELAY);
-#    endif
+        wait_ms(QS_tap_code_delay);
         unregister_code(autoshift_lastkey);
         del_weak_mods(MOD_BIT(KC_LSFT));
     } else {

quantum/qmk_settings.c

@@ -48,6 +48,8 @@ static const qmk_settings_proto_t protos[] PROGMEM = {
    DECLARE_SETTING_CB(15, mousekey_wheel_interval, mousekey_apply),
    DECLARE_SETTING_CB(16, mousekey_wheel_max_speed, mousekey_apply),
    DECLARE_SETTING_CB(17, mousekey_wheel_time_to_max, mousekey_apply),
+   DECLARE_SETTING(18, tap_code_delay),
+   DECLARE_SETTING(19, tap_hold_caps_delay),
 };
 
 static const qmk_settings_proto_t *find_setting(uint16_t qsid) {
@@ -106,6 +108,8 @@ void qmk_settings_reset(void) {
     QS.combo_term = COMBO_TERM;
     QS.tapping_term = TAPPING_TERM;
     QS.tapping = 0;
+    QS.tap_code_delay = TAP_CODE_DELAY;
+    QS.tap_hold_caps_delay = TAP_HOLD_CAPS_DELAY;
 
     save_settings();
     /* to trigger all callbacks */

quantum/qmk_settings.h

@@ -5,6 +5,13 @@
 
 /* take qmk config macros and set up helper variables for default settings */
 
+#ifndef TAP_CODE_DELAY
+#    define TAP_CODE_DELAY 0
+#endif
+#ifndef TAP_HOLD_CAPS_DELAY
+#    define TAP_HOLD_CAPS_DELAY 80
+#endif
+
 /* ========================================================================== */
 /* Grave escape                                                               */
 /* ========================================================================== */
@@ -111,8 +118,10 @@ typedef struct {
     uint8_t auto_shift;
     uint8_t osk_tap_toggle;
     uint8_t tapping;
+    uint16_t tap_code_delay;
+    uint16_t tap_hold_caps_delay;
 } qmk_settings_t;
-_Static_assert(sizeof(qmk_settings_t) == 30, "unexpected size of the qmk_settings_t structure");
+_Static_assert(sizeof(qmk_settings_t) == 34, "unexpected size of the qmk_settings_t structure");
 
 typedef void (*qmk_setting_callback_t)(void);
 
@@ -157,6 +166,10 @@ extern qmk_settings_t QS;
 /* Combo */
 #define QS_combo_term (QS.combo_term)
 
+/* Tap delays */
+#define QS_tap_code_delay (QS.tap_code_delay)
+#define QS_tap_hold_caps_delay (QS.tap_hold_caps_delay)
+
 #else
 /* dynamic settings framework is disabled => hardcode the settings and let the compiler optimize extra branches out */
 
@@ -185,4 +198,8 @@ extern qmk_settings_t QS;
 /* Combo */
 #define QS_combo_term COMBO_TERM
 
+/* Tap delays */
+#define QS_tap_code_delay TAP_CODE_DELAY
+#define QS_tap_hold_caps_delay TAP_HOLD_CAPS_DELAY
+
 #endif

quantum/quantum.c

@@ -16,6 +16,7 @@
 
 #include "quantum.h"
 #include "magic.h"
+#include "qmk_settings.h"
 
 #ifdef BLUETOOTH_ENABLE
 #    include "outputselect.h"
@@ -107,9 +108,7 @@ void unregister_code16(uint16_t code) {
 
 void tap_code16(uint16_t code) {
     register_code16(code);
-#if TAP_CODE_DELAY > 0
-    wait_ms(TAP_CODE_DELAY);
-#endif
+    wait_ms(QS_tap_code_delay);
     unregister_code16(code);
 }
 

quantum/vial.c

@@ -286,11 +286,7 @@ static void vial_keycode_tap(uint16_t keycode) __attribute__((unused));
 
 static void vial_keycode_tap(uint16_t keycode) {
     vial_keycode_down(keycode);
-
-#if TAP_CODE_DELAY > 0
-    wait_ms(TAP_CODE_DELAY);
-#endif
-
+    wait_ms(QS_tap_code_delay);
     vial_keycode_up(keycode);
 }
 
@@ -429,6 +425,7 @@ static void on_dance_reset(qk_tap_dance_state_t *state, void *user_data) {
     uint8_t index = (uintptr_t)user_data;
     if (dynamic_keymap_get_tap_dance(index, &td_entry) != 0)
         return;
+    wait_ms(QS_tap_code_delay);
     uint8_t st = dance_state[index];
     state->count = 0;
     dance_state[index] = 0;