From 94ff968a1481f1678e9c50be23f290ba43c1cba7 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 24 Jun 2023 17:44:21 +1000
Subject: [PATCH] Move `TAPPING_TERM` to data driven (#21296)

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 keyboards/25keys/zinc/rev1/config.h           |  1 -
 keyboards/25keys/zinc/rev1/info.json          |  3 ++
 keyboards/25keys/zinc/reva/config.h           |  1 -
 keyboards/25keys/zinc/reva/info.json          |  3 ++
 keyboards/adkb96/info.json                    |  3 ++
 keyboards/adkb96/rev1/config.h                |  3 --
 keyboards/bemeier/bmek/config.h               |  3 --
 keyboards/bemeier/bmek/rev1/info.json         |  3 ++
 keyboards/bemeier/bmek/rev2/info.json         |  3 ++
 keyboards/bemeier/bmek/rev3/info.json         |  3 ++
 keyboards/clickety_split/leeloo/info.json     |  3 ++
 keyboards/clickety_split/leeloo/rev1/config.h | 37 -------------------
 keyboards/fc660c/config.h                     |  4 --
 keyboards/fc660c/info.json                    |  3 ++
 keyboards/h0oni/deskpad/config.h              |  3 --
 keyboards/h0oni/deskpad/info.json             |  3 ++
 keyboards/halokeys/elemental75/config.h       |  3 --
 keyboards/halokeys/elemental75/info.json      |  3 ++
 keyboards/handwired/2x5keypad/config.h        |  3 --
 keyboards/handwired/2x5keypad/info.json       |  3 ++
 keyboards/handwired/3dp660/config.h           |  3 --
 keyboards/handwired/3dp660/info.json          |  3 ++
 keyboards/handwired/42/config.h               |  2 -
 keyboards/handwired/42/info.json              |  3 ++
 keyboards/handwired/aek64/config.h            |  3 --
 keyboards/handwired/aek64/info.json           |  3 ++
 keyboards/handwired/ergocheap/config.h        |  1 -
 keyboards/handwired/ergocheap/info.json       |  3 ++
 keyboards/handwired/k_numpad17/config.h       |  3 --
 keyboards/handwired/k_numpad17/info.json      |  3 ++
 keyboards/handwired/onekey/config.h           |  1 -
 keyboards/handwired/onekey/info.json          |  3 ++
 keyboards/handwired/riblee_f401/config.h      |  2 -
 keyboards/handwired/riblee_f401/info.json     |  3 ++
 keyboards/handwired/riblee_f411/config.h      |  2 -
 keyboards/handwired/riblee_f411/info.json     |  3 ++
 keyboards/handwired/terminus_mini/config.h    |  3 --
 keyboards/handwired/terminus_mini/info.json   |  3 ++
 keyboards/handwired/twig/twig50/config.h      |  2 -
 keyboards/handwired/twig/twig50/info.json     |  3 ++
 keyboards/handwired/uthol/rev3/config.h       |  1 -
 keyboards/handwired/uthol/rev3/info.json      |  3 ++
 keyboards/helix/pico/config.h                 |  1 -
 keyboards/helix/pico/info.json                |  3 ++
 keyboards/helix/rev2/config.h                 |  1 -
 keyboards/helix/rev2/info.json                |  3 ++
 keyboards/kagizaraya/halberd/config.h         |  2 -
 keyboards/kagizaraya/halberd/info.json        |  3 ++
 keyboards/kagizaraya/scythe/config.h          |  2 -
 keyboards/kagizaraya/scythe/info.json         |  3 ++
 keyboards/late9/rev1/config.h                 |  3 --
 keyboards/late9/rev1/info.json                |  3 ++
 keyboards/latincompass/latin47ble/config.h    |  2 -
 keyboards/latincompass/latin47ble/info.json   |  3 ++
 keyboards/lime/rev1/config.h                  |  2 -
 keyboards/lime/rev1/info.json                 |  3 ++
 keyboards/malevolti/lyra/rev1/config.h        | 18 ---------
 keyboards/malevolti/lyra/rev1/info.json       |  3 ++
 keyboards/malevolti/superlyra/rev1/config.h   | 18 ---------
 keyboards/malevolti/superlyra/rev1/info.json  |  3 ++
 keyboards/mechwild/puckbuddy/config.h         |  5 ---
 keyboards/mechwild/puckbuddy/info.json        |  3 ++
 keyboards/mechwild/sugarglider/config.h       |  4 --
 keyboards/mechwild/sugarglider/info.json      |  3 ++
 keyboards/omkbd/ergodash/mini/config.h        |  3 --
 keyboards/omkbd/ergodash/mini/info.json       |  3 ++
 keyboards/omkbd/ergodash/rev1/config.h        |  3 --
 keyboards/omkbd/ergodash/rev1/info.json       |  3 ++
 keyboards/omkbd/runner3680/3x6/config.h       |  3 --
 keyboards/omkbd/runner3680/3x6/info.json      |  3 ++
 keyboards/omkbd/runner3680/3x7/config.h       |  3 --
 keyboards/omkbd/runner3680/3x7/info.json      |  3 ++
 keyboards/omkbd/runner3680/3x8/config.h       |  3 --
 keyboards/omkbd/runner3680/3x8/info.json      |  3 ++
 keyboards/omkbd/runner3680/4x6/config.h       |  3 --
 keyboards/omkbd/runner3680/4x6/info.json      |  3 ++
 keyboards/omkbd/runner3680/4x7/config.h       |  3 --
 keyboards/omkbd/runner3680/4x7/info.json      |  3 ++
 keyboards/omkbd/runner3680/4x8/config.h       |  3 --
 keyboards/omkbd/runner3680/4x8/info.json      |  3 ++
 keyboards/omkbd/runner3680/5x6/config.h       |  3 --
 keyboards/omkbd/runner3680/5x6/info.json      |  3 ++
 keyboards/omkbd/runner3680/5x6_5x8/config.h   |  3 --
 keyboards/omkbd/runner3680/5x6_5x8/info.json  |  3 ++
 keyboards/omkbd/runner3680/5x7/config.h       |  3 --
 keyboards/omkbd/runner3680/5x7/info.json      |  3 ++
 keyboards/omkbd/runner3680/5x8/config.h       |  3 --
 keyboards/omkbd/runner3680/5x8/info.json      |  3 ++
 keyboards/rgbkb/sol/config.h                  |  3 --
 keyboards/rgbkb/sol/rev1/info.json            |  3 ++
 keyboards/rgbkb/sol/rev2/info.json            |  3 ++
 keyboards/rpiguy9907/southpaw66/config.h      |  3 --
 keyboards/rpiguy9907/southpaw66/info.json     |  3 ++
 keyboards/sofle/rev1/config.h                 |  2 -
 keyboards/sofle/rev1/info.json                |  3 ++
 .../thevankeyboards/bananasplit/config.h      |  2 -
 .../thevankeyboards/bananasplit/info.json     |  3 ++
 keyboards/yushakobo/navpad/10/config.h        |  1 -
 keyboards/yushakobo/navpad/10/info.json       |  3 ++
 .../yushakobo/navpad/10_helix_r/config.h      |  1 -
 .../yushakobo/navpad/10_helix_r/info.json     |  3 ++
 keyboards/zfrontier/big_switch/config.h       |  2 -
 keyboards/zfrontier/big_switch/info.json      |  3 ++
 103 files changed, 159 insertions(+), 189 deletions(-)
 delete mode 100644 keyboards/clickety_split/leeloo/rev1/config.h
 delete mode 100644 keyboards/malevolti/lyra/rev1/config.h
 delete mode 100644 keyboards/malevolti/superlyra/rev1/config.h

diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index e4b0d02f753e..27755e64c6a5 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
 
 /* Select hand configuration */
 #define MASTER_LEFT
diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
index 63c838f53d71..47fb1f2e98e2 100644
--- a/keyboards/25keys/zinc/rev1/info.json
+++ b/keyboards/25keys/zinc/rev1/info.json
@@ -8,6 +8,9 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "tapping": {
+    "term": 100
+  },
   "rgblight": {
     "hue_steps": 10
   },
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index e4b0d02f753e..27755e64c6a5 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
 
 /* Select hand configuration */
 #define MASTER_LEFT
diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
index d40ebd35debe..1ab2fb7e38f3 100644
--- a/keyboards/25keys/zinc/reva/info.json
+++ b/keyboards/25keys/zinc/reva/info.json
@@ -8,6 +8,9 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "tapping": {
+    "term": 100
+  },
   "rgblight": {
     "hue_steps": 10
   },
diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json
index 47e08a7ed7d4..aa7e5a6921e9 100644
--- a/keyboards/adkb96/info.json
+++ b/keyboards/adkb96/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "tapping": {
+        "term": 100
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layout_aliases": {
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
index 89de3d9a643a..0b8941e77606 100644
--- a/keyboards/adkb96/rev1/config.h
+++ b/keyboards/adkb96/rev1/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/bemeier/bmek/config.h b/keyboards/bemeier/bmek/config.h
index 9b0c404fada7..be8ac6c0fd92 100755
--- a/keyboards/bemeier/bmek/config.h
+++ b/keyboards/bemeier/bmek/config.h
@@ -22,6 +22,3 @@
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_MODE_STATIC_GRADIENT
-
-//#define RETRO_TAPPING
-#define TAPPING_TERM 175
diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json
index 7bafa14201fb..b3aa3b238260 100644
--- a/keyboards/bemeier/bmek/rev1/info.json
+++ b/keyboards/bemeier/bmek/rev1/info.json
@@ -7,6 +7,9 @@
         "brightness_steps": 8,
         "led_count": 6
     },
+    "tapping": {
+        "term": 175
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json
index 4c84aa0edca3..34c3df6470ae 100644
--- a/keyboards/bemeier/bmek/rev2/info.json
+++ b/keyboards/bemeier/bmek/rev2/info.json
@@ -7,6 +7,9 @@
         "brightness_steps": 8,
         "led_count": 6
     },
+    "tapping": {
+        "term": 175
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json
index 80bd3f1f623e..d2840af89371 100644
--- a/keyboards/bemeier/bmek/rev3/info.json
+++ b/keyboards/bemeier/bmek/rev3/info.json
@@ -7,6 +7,9 @@
         "brightness_steps": 8,
         "led_count": 6
     },
+    "tapping": {
+        "term": 175
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/clickety_split/leeloo/info.json b/keyboards/clickety_split/leeloo/info.json
index 78794cbddb8f..a2510f9f7f25 100644
--- a/keyboards/clickety_split/leeloo/info.json
+++ b/keyboards/clickety_split/leeloo/info.json
@@ -28,6 +28,9 @@
       }
     }
   },
+  "tapping": {
+    "term": 100
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/clickety_split/leeloo/rev1/config.h b/keyboards/clickety_split/leeloo/rev1/config.h
deleted file mode 100644
index 96c6b71d3743..000000000000
--- a/keyboards/clickety_split/leeloo/rev1/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 Clickety Split Ltd.
- *                https://clicketysplit.ca
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* define tapping term */
-#define TAPPING_TERM 100
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
diff --git a/keyboards/fc660c/config.h b/keyboards/fc660c/config.h
index 670b0f8e3866..cd23bdb2b82c 100644
--- a/keyboards/fc660c/config.h
+++ b/keyboards/fc660c/config.h
@@ -22,10 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
 
-//#define DIODE_DIRECTION
-
-#define TAPPING_TERM      175
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json
index 8250619bdc83..e65ed35dae70 100644
--- a/keyboards/fc660c/info.json
+++ b/keyboards/fc660c/info.json
@@ -8,6 +8,9 @@
         "pid": "0x660C",
         "device_version": "1.0.0"
     },
+    "tapping": {
+        "term": 175
+    },
     "indicators": {
         "caps_lock": "B6",
         "on_state": 0
diff --git a/keyboards/h0oni/deskpad/config.h b/keyboards/h0oni/deskpad/config.h
index ddcf0ebe4af5..441e3b8c1a66 100644
--- a/keyboards/h0oni/deskpad/config.h
+++ b/keyboards/h0oni/deskpad/config.h
@@ -20,6 +20,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Defining tapping term */
-#define TAPPING_TERM 250
\ No newline at end of file
diff --git a/keyboards/h0oni/deskpad/info.json b/keyboards/h0oni/deskpad/info.json
index 96a23f7f615f..e51aa7e7dfc3 100644
--- a/keyboards/h0oni/deskpad/info.json
+++ b/keyboards/h0oni/deskpad/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4450",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 250
+    },
     "matrix_pins": {
         "cols": ["D0", "D4", "D1"],
         "rows": ["D7", "C6"]
diff --git a/keyboards/halokeys/elemental75/config.h b/keyboards/halokeys/elemental75/config.h
index a9bb7a15e5f6..66bdf7c5adb3 100644
--- a/keyboards/halokeys/elemental75/config.h
+++ b/keyboards/halokeys/elemental75/config.h
@@ -31,9 +31,6 @@
 
 //#define RGBLIGHT_DISABLE_KEYCODES
 
-// Tap dance term declaration
-#define TAPPING_TERM 300
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/info.json
index bc160671ee5f..deea8b247943 100644
--- a/keyboards/halokeys/elemental75/info.json
+++ b/keyboards/halokeys/elemental75/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "B6", "pin_b": "B5"}
         ]
     },
+    "tapping": {
+        "term": 300
+    },
     "ws2812": {
         "pin": "A10"
     },
diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h
index 819f0f640f52..5f360813239b 100644
--- a/keyboards/handwired/2x5keypad/config.h
+++ b/keyboards/handwired/2x5keypad/config.h
@@ -5,6 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Tap dancing params */
-#define TAPPING_TERM 250
diff --git a/keyboards/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/info.json
index 1df0ccbdee5c..b33273e19dbb 100644
--- a/keyboards/handwired/2x5keypad/info.json
+++ b/keyboards/handwired/2x5keypad/info.json
@@ -8,6 +8,9 @@
         "pid": "0x2020",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 250
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4"],
         "rows": ["B3", "B2"]
diff --git a/keyboards/handwired/3dp660/config.h b/keyboards/handwired/3dp660/config.h
index f804456960f6..c2949ab3a7a4 100644
--- a/keyboards/handwired/3dp660/config.h
+++ b/keyboards/handwired/3dp660/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define TAPPING_TERM 400
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/3dp660/info.json b/keyboards/handwired/3dp660/info.json
index c3bc103d773d..6d380fc3c609 100644
--- a/keyboards/handwired/3dp660/info.json
+++ b/keyboards/handwired/3dp660/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3660",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 400
+    },
     "matrix_pins": {
         "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"],
         "rows": ["B0", "B1", "B2", "B3", "B7"]
diff --git a/keyboards/handwired/42/config.h b/keyboards/handwired/42/config.h
index 57a8664649be..fa9a83d08ec4 100644
--- a/keyboards/handwired/42/config.h
+++ b/keyboards/handwired/42/config.h
@@ -4,5 +4,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define TAPPING_TERM 100
diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json
index dccafc6d86ad..fae660de9345 100644
--- a/keyboards/handwired/42/info.json
+++ b/keyboards/handwired/42/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0000",
         "device_version": "0.0.3"
     },
+    "tapping": {
+        "term": 100
+    },
     "matrix_pins": {
         "cols": ["F5", "F6", "F7", "F0", "F1", "F4", "B6", "B5", "D7", "C7", "D6", "B7"],
         "rows": ["D2", "D3", "D0", "D1"]
diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h
index 629111515849..fa8d618c7476 100644
--- a/keyboards/handwired/aek64/config.h
+++ b/keyboards/handwired/aek64/config.h
@@ -22,6 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RCPC_KEYS KC_RCTL, KC_TRNS, KC_PGDN
 #define LSPO_KEYS KC_LSFT, KC_TRNS, KC_HOME
 #define LCPO_KEYS KC_LCTL, KC_TRNS, KC_END
-
-/* Enable double tab */
-#define TAPPING_TERM 175
diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json
index dfa762ce817e..e71156e9882f 100644
--- a/keyboards/handwired/aek64/info.json
+++ b/keyboards/handwired/aek64/info.json
@@ -18,6 +18,9 @@
     "levels": 5,
     "breathing": true
   },
+  "tapping": {
+    "term": 175
+  },
   "processor": "at90usb1286",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/handwired/ergocheap/config.h b/keyboards/handwired/ergocheap/config.h
index 445892274611..23b6e9bad96d 100644
--- a/keyboards/handwired/ergocheap/config.h
+++ b/keyboards/handwired/ergocheap/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TERM 500
 #define PERMISSIVE_HOLD
 
 /*
diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/info.json
index 12bff57b3e06..17d786323770 100644
--- a/keyboards/handwired/ergocheap/info.json
+++ b/keyboards/handwired/ergocheap/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6942",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 500
+    },
     "matrix_pins": {
         "cols": ["A8", "A9", "B14", "B12", "B13", "B15", "B3", "B11", "A4", "A5", "A6", "A7", "B0", "B1", "B10"],
         "rows": ["B5", "B6", "B7", "B9", "B8"]
diff --git a/keyboards/handwired/k_numpad17/config.h b/keyboards/handwired/k_numpad17/config.h
index 9bcc1ca12edf..9f71a07f90c4 100644
--- a/keyboards/handwired/k_numpad17/config.h
+++ b/keyboards/handwired/k_numpad17/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define TAPPING_TERM 400
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/k_numpad17/info.json b/keyboards/handwired/k_numpad17/info.json
index e0cd79a9c000..97d5f38774ba 100644
--- a/keyboards/handwired/k_numpad17/info.json
+++ b/keyboards/handwired/k_numpad17/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 400
+    },
     "matrix_pins": {
         "cols": ["B2", "B1", "F6", "F4"],
         "rows": ["D1", "D4", "C6", "D7", "E6"]
diff --git a/keyboards/handwired/onekey/config.h b/keyboards/handwired/onekey/config.h
index 7ef807c5d111..09cf96594124 100644
--- a/keyboards/handwired/onekey/config.h
+++ b/keyboards/handwired/onekey/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define TAPPING_TERM 500
 #define PERMISSIVE_HOLD
 
 /*
diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json
index 339dfe5974e0..17bb84a82c14 100644
--- a/keyboards/handwired/onekey/info.json
+++ b/keyboards/handwired/onekey/info.json
@@ -7,6 +7,9 @@
         "pid": "0x6465",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 500
+    },
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": false,
diff --git a/keyboards/handwired/riblee_f401/config.h b/keyboards/handwired/riblee_f401/config.h
index 09a304e1c735..c39cbc87f5e9 100644
--- a/keyboards/handwired/riblee_f401/config.h
+++ b/keyboards/handwired/riblee_f401/config.h
@@ -17,5 +17,3 @@
 #pragma once
 
 #define MOUSEKEY_INTERVAL 32
-
-#define TAPPING_TERM 175
\ No newline at end of file
diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json
index 7b9b320b98be..4ff8ec21f63a 100644
--- a/keyboards/handwired/riblee_f401/info.json
+++ b/keyboards/handwired/riblee_f401/info.json
@@ -8,6 +8,9 @@
         "pid": "0x002A",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 175
+    },
     "matrix_pins": {
         "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
         "rows": ["A6", "A5", "A4", "A3", "A2"]
diff --git a/keyboards/handwired/riblee_f411/config.h b/keyboards/handwired/riblee_f411/config.h
index 425b35f266ad..c39cbc87f5e9 100644
--- a/keyboards/handwired/riblee_f411/config.h
+++ b/keyboards/handwired/riblee_f411/config.h
@@ -17,5 +17,3 @@
 #pragma once
 
 #define MOUSEKEY_INTERVAL 32
-
-#define TAPPING_TERM 175
diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/info.json
index d13dfb229190..1c957e994043 100644
--- a/keyboards/handwired/riblee_f411/info.json
+++ b/keyboards/handwired/riblee_f411/info.json
@@ -8,6 +8,9 @@
         "pid": "0x002B",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 175
+    },
     "matrix_pins": {
         "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B14", "A0", "B8", "B9"],
         "rows": ["A6", "A5", "A4", "A3", "A2"]
diff --git a/keyboards/handwired/terminus_mini/config.h b/keyboards/handwired/terminus_mini/config.h
index 67fec77018af..6243804dc58b 100644
--- a/keyboards/handwired/terminus_mini/config.h
+++ b/keyboards/handwired/terminus_mini/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//define maximum duration of hold required to register a tap vs hold default is 200
-#define TAPPING_TERM 150 //reduce time required to register a held key
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/terminus_mini/info.json b/keyboards/handwired/terminus_mini/info.json
index c59192ac1268..6ceaa8e16151 100644
--- a/keyboards/handwired/terminus_mini/info.json
+++ b/keyboards/handwired/terminus_mini/info.json
@@ -8,6 +8,9 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "tapping": {
+    "term": 150
+  },
   "matrix_pins": {
     "cols": ["B0", "D0", "D5", "B6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
     "rows": ["B5", "B4", "D7", "D6"]
diff --git a/keyboards/handwired/twig/twig50/config.h b/keyboards/handwired/twig/twig50/config.h
index d3d188ef4257..e4347a75b521 100644
--- a/keyboards/handwired/twig/twig50/config.h
+++ b/keyboards/handwired/twig/twig50/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define TAPPING_TERM 150
-
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN A5
   #define AUDIO_PIN_ALT A4
diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json
index c32734cecb45..24eb51d03c17 100644
--- a/keyboards/handwired/twig/twig50/info.json
+++ b/keyboards/handwired/twig/twig50/info.json
@@ -9,6 +9,9 @@
       "device_version": "0.2.1",
       "force_nkro": true
     },
+    "tapping": {
+        "term": 150
+    },
     "matrix_pins": {
       "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9", "B10", "B11", "B3", "B2", "B1", "B0"],
       "rows": ["B7", "B6", "B5", "B4"]
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index a1fcd50f8921..4e58bd9da409 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -31,7 +31,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define TAPPING_TERM 500
 #define PERMISSIVE_HOLD
 
 // RGB Stuff
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
index 47d586abb01f..74d26c15a5fb 100644
--- a/keyboards/handwired/uthol/rev3/info.json
+++ b/keyboards/handwired/uthol/rev3/info.json
@@ -6,6 +6,9 @@
     "rgblight": {
         "led_count": 39
     },
+    "tapping": {
+        "term": 500
+    },
     "ws2812": {
         "pin": "B0"
     },
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index 9d7a787c136d..f5eb4c13e101 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
 
 #define SERIAL_SLAVE_BUFFER_LENGTH  ((MATRIX_ROWS)/2)
 #define SERIAL_MASTER_BUFFER_LENGTH ((MATRIX_ROWS)/2)
diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json
index bd24bd00358a..34305944bd19 100644
--- a/keyboards/helix/pico/info.json
+++ b/keyboards/helix/pico/info.json
@@ -11,6 +11,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 100
+    },
     "rgblight": {
         "hue_steps": 10
     },
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 1e15f8259988..212d0e1e3847 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
 
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index ad33f5b47601..0cdc10815dc0 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 100
+    },
     "rgblight": {
         "hue_steps": 10
     },
diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
index 3a2c74be2584..4af8c12dc8d1 100644
--- a/keyboards/kagizaraya/halberd/config.h
+++ b/keyboards/kagizaraya/halberd/config.h
@@ -47,5 +47,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define TAPPING_TERM    100
diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/info.json
index dcbfeb249969..de9b119e8968 100644
--- a/keyboards/kagizaraya/halberd/info.json
+++ b/keyboards/kagizaraya/halberd/info.json
@@ -13,6 +13,9 @@
         "brightness_steps": 8,
         "led_count": 40
     },
+    "tapping": {
+        "term": 100
+    },
     "ws2812": {
         "pin": "F0"
     },
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
index 7730e5ec8fec..d8ab9fc9f45e 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/config.h
@@ -52,5 +52,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define EE_HANDS
 #define I2C_MASTER_LEFT
 //#define I2C_MASTER_RIGHT
-
-#define TAPPING_TERM    120
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
index 79620e144441..5b95a776e37a 100644
--- a/keyboards/kagizaraya/scythe/info.json
+++ b/keyboards/kagizaraya/scythe/info.json
@@ -25,6 +25,9 @@
         "led_count": 9,
         "split": true
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "F0"
     },
diff --git a/keyboards/late9/rev1/config.h b/keyboards/late9/rev1/config.h
index e6fcd30ebeac..8c9a5702f26b 100644
--- a/keyboards/late9/rev1/config.h
+++ b/keyboards/late9/rev1/config.h
@@ -16,8 +16,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* Tap interval for tap dance */
-#define TAPPING_TERM 400
-
 /* Oneshot interval */
 #define ONESHOT_TIMEOUT 5000
diff --git a/keyboards/late9/rev1/info.json b/keyboards/late9/rev1/info.json
index 7d3a710bc544..408bb746bf16 100644
--- a/keyboards/late9/rev1/info.json
+++ b/keyboards/late9/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3777",
         "device_version": "0.1.0"
     },
+    "tapping": {
+        "term": 400
+    },
     "matrix_pins": {
         "cols": ["B5", "C6", "D4"],
         "rows": ["B4", "E6", "D7", "B3", "B2", "B6"]
diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
index 7c5c78b6089b..f9b76ecd880b 100644
--- a/keyboards/latincompass/latin47ble/config.h
+++ b/keyboards/latincompass/latin47ble/config.h
@@ -27,8 +27,6 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define TAPPING_TERM 250
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json
index 12ed4cbfd892..befa51fdab0a 100644
--- a/keyboards/latincompass/latin47ble/info.json
+++ b/keyboards/latincompass/latin47ble/info.json
@@ -18,6 +18,9 @@
         "brightness_steps": 8,
         "led_count": 3
     },
+    "tapping": {
+        "term": 250
+    },
     "ws2812": {
         "pin": "B7"
     },
diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h
index 6ecfdf3034ae..3915f72c29e8 100644
--- a/keyboards/lime/rev1/config.h
+++ b/keyboards/lime/rev1/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define TAPPING_TERM 100
-
 /* joystick support */
 #ifdef JOYSTICK_ENABLE
 #   define JOYSTICK_AXIS_COUNT 2
diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json
index 215b47e10383..a3da36665624 100644
--- a/keyboards/lime/rev1/info.json
+++ b/keyboards/lime/rev1/info.json
@@ -28,6 +28,9 @@
             }
         }
     },
+    "tapping": {
+        "term": 100
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h
deleted file mode 100644
index 38a1a09cd343..000000000000
--- a/keyboards/malevolti/lyra/rev1/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#pragma once
-
-#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
index 2b7f8fbd7130..7a9aa305acb1 100644
--- a/keyboards/malevolti/lyra/rev1/info.json
+++ b/keyboards/malevolti/lyra/rev1/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 100
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h
deleted file mode 100644
index cffc2e9ff2e2..000000000000
--- a/keyboards/malevolti/superlyra/rev1/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json
index 59cd50af421a..989e6baaa753 100644
--- a/keyboards/malevolti/superlyra/rev1/info.json
+++ b/keyboards/malevolti/superlyra/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4C53",
         "device_version": "30.3.1"
     },
+    "tapping": {
+        "term": 100
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
         "rows": ["B7", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index 0f1569fa3b41..d48c42628e74 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -13,11 +13,6 @@
 /* set the tapping term for glidepoint pad to register a tap click */
 //#define CIRQUE_PINNACLE_TAPPING_TERM 0 // This is set to 0 to disable it
 
-/* TAPPING_TERM value is used for the CIRQUE_PINNACLE_TAPPING_TERM as well by default
- * defining it this way allows us to easily modify it with DYNAMIC_TAPPING_TERM_ENABLE
- */
-#define TAPPING_TERM 0
-
 /* spi config */
 #define SPI_DRIVER SPID1
 #define SPI_SCK_PIN A5
diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json
index d5714dedb419..684ddcb9c17c 100644
--- a/keyboards/mechwild/puckbuddy/info.json
+++ b/keyboards/mechwild/puckbuddy/info.json
@@ -29,6 +29,9 @@
         "led_count": 3,
         "sleep": true
     },
+    "tapping": {
+        "term": 0
+    },
     "ws2812": {
         "pin": "A3"
     },
diff --git a/keyboards/mechwild/sugarglider/config.h b/keyboards/mechwild/sugarglider/config.h
index 1512cc1528be..75aa26956cf1 100644
--- a/keyboards/mechwild/sugarglider/config.h
+++ b/keyboards/mechwild/sugarglider/config.h
@@ -19,10 +19,6 @@
 /* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */
 #define DIP_SWITCH_PINS { A0 }
 
-/* TAPPING_TERM value is used for the CIRQUE_PINNACLE_TAPPING_TERM as well by default
- * defining it this way allows us to easily modify it with DYNAMIC_TAPPING_TERM_ENABLE
- */
-#define TAPPING_TERM 0
 #define CIRQUE_PINNACLE_TAP_ENABLE
 #define POINTING_DEVICE_GESTURES_SCROLL_ENABLE
 
diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json
index 046776be4913..834260058851 100644
--- a/keyboards/mechwild/sugarglider/info.json
+++ b/keyboards/mechwild/sugarglider/info.json
@@ -42,6 +42,9 @@
             "twinkle": true
         }
     },
+    "tapping": {
+        "term": 0
+    },
     "ws2812": {
         "pin": "B5"
     },
diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h
index 0f7df79b2776..42c07ce4ac15 100644
--- a/keyboards/omkbd/ergodash/mini/config.h
+++ b/keyboards/omkbd/ergodash/mini/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 #define AUDIO_PIN C6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json
index 45f66b538114..91e73a97a8ba 100644
--- a/keyboards/omkbd/ergodash/mini/info.json
+++ b/keyboards/omkbd/ergodash/mini/info.json
@@ -20,6 +20,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "tapping": {
+        "term": 120
+    },
     "rgblight": {
         "led_count": 20,
         "split_count": [10, 10]
diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h
index 0f7df79b2776..42c07ce4ac15 100644
--- a/keyboards/omkbd/ergodash/rev1/config.h
+++ b/keyboards/omkbd/ergodash/rev1/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 #define AUDIO_PIN C6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json
index 25d82553ae82..d34d4f79b168 100644
--- a/keyboards/omkbd/ergodash/rev1/info.json
+++ b/keyboards/omkbd/ergodash/rev1/info.json
@@ -20,6 +20,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "tapping": {
+        "term": 120
+    },
     "rgblight": {
         "led_count": 24,
         "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12],
diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h
index 516c08d0618e..127483886e18 100644
--- a/keyboards/omkbd/runner3680/3x6/config.h
+++ b/keyboards/omkbd/runner3680/3x6/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json
index 10af33d9554e..d8217108be0e 100644
--- a/keyboards/omkbd/runner3680/3x6/info.json
+++ b/keyboards/omkbd/runner3680/3x6/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h
index 516c08d0618e..127483886e18 100644
--- a/keyboards/omkbd/runner3680/3x7/config.h
+++ b/keyboards/omkbd/runner3680/3x7/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json
index 48fd1bb81f70..ef025ccdf04a 100644
--- a/keyboards/omkbd/runner3680/3x7/info.json
+++ b/keyboards/omkbd/runner3680/3x7/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h
index 516c08d0618e..127483886e18 100644
--- a/keyboards/omkbd/runner3680/3x8/config.h
+++ b/keyboards/omkbd/runner3680/3x8/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json
index 4c4d227a79cf..e360b1de4839 100644
--- a/keyboards/omkbd/runner3680/3x8/info.json
+++ b/keyboards/omkbd/runner3680/3x8/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h
index 516c08d0618e..127483886e18 100644
--- a/keyboards/omkbd/runner3680/4x6/config.h
+++ b/keyboards/omkbd/runner3680/4x6/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json
index 7d284dead0cc..c052c6891ce0 100644
--- a/keyboards/omkbd/runner3680/4x6/info.json
+++ b/keyboards/omkbd/runner3680/4x6/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h
index 516c08d0618e..127483886e18 100644
--- a/keyboards/omkbd/runner3680/4x7/config.h
+++ b/keyboards/omkbd/runner3680/4x7/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json
index a40442fd579e..dc445a7a4f64 100644
--- a/keyboards/omkbd/runner3680/4x7/info.json
+++ b/keyboards/omkbd/runner3680/4x7/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h
index 516c08d0618e..127483886e18 100644
--- a/keyboards/omkbd/runner3680/4x8/config.h
+++ b/keyboards/omkbd/runner3680/4x8/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json
index e9bedb76a55c..1ac4ca08a75a 100644
--- a/keyboards/omkbd/runner3680/4x8/info.json
+++ b/keyboards/omkbd/runner3680/4x8/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h
index 516c08d0618e..127483886e18 100644
--- a/keyboards/omkbd/runner3680/5x6/config.h
+++ b/keyboards/omkbd/runner3680/5x6/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json
index 67cc3d98abe6..a93571c981b4 100644
--- a/keyboards/omkbd/runner3680/5x6/info.json
+++ b/keyboards/omkbd/runner3680/5x6/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h
index e62710264ffa..c360e27e4236 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json
index c4fce3c600eb..19430d76c915 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json
@@ -19,6 +19,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h
index 516c08d0618e..127483886e18 100644
--- a/keyboards/omkbd/runner3680/5x7/config.h
+++ b/keyboards/omkbd/runner3680/5x7/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json
index 579596e8a8cf..1b2240948cda 100644
--- a/keyboards/omkbd/runner3680/5x7/info.json
+++ b/keyboards/omkbd/runner3680/5x7/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h
index 516c08d0618e..127483886e18 100644
--- a/keyboards/omkbd/runner3680/5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x8/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json
index 7e35f883a8d0..a957352e5eb7 100644
--- a/keyboards/omkbd/runner3680/5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x8/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index 5c327fd760da..a0a2202afa37 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define TAPPING_TERM 150
-
 #define EE_HANDS
 
 #ifdef IOS_DEVICE_ENABLE
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index b0b8fc12d023..ebd23f4e1d27 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -24,6 +24,9 @@
     "split": {
         "soft_serial_pin": "D3"
     },
+    "tapping": {
+        "term": 150
+    },
     "ws2812": {
         "pin": "B3"
     },
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 1eec8a393035..508ba1ea057b 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -19,6 +19,9 @@
     "split": {
         "soft_serial_pin": "D3"
     },
+    "tapping": {
+        "term": 150
+    },
     "ws2812": {
         "pin": "B7"
     },
diff --git a/keyboards/rpiguy9907/southpaw66/config.h b/keyboards/rpiguy9907/southpaw66/config.h
index 99fb7f54ea54..b4da5d530f8e 100644
--- a/keyboards/rpiguy9907/southpaw66/config.h
+++ b/keyboards/rpiguy9907/southpaw66/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-
-#define TAPPING_TERM 400
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rpiguy9907/southpaw66/info.json b/keyboards/rpiguy9907/southpaw66/info.json
index 3cebdcb4a8c0..6c90980e7c5b 100644
--- a/keyboards/rpiguy9907/southpaw66/info.json
+++ b/keyboards/rpiguy9907/southpaw66/info.json
@@ -16,6 +16,9 @@
     "bootmagic": {
         "matrix": [1, 0]
     },
+    "tapping": {
+        "term": 400
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h
index be6454974844..a444e5490339 100644
--- a/keyboards/sofle/rev1/config.h
+++ b/keyboards/sofle/rev1/config.h
@@ -1,5 +1,3 @@
 #pragma once
 
-#define TAPPING_TERM 100
-
 #define TAP_CODE_DELAY 10
diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json
index 23d411602eb4..9863fcd98392 100644
--- a/keyboards/sofle/rev1/info.json
+++ b/keyboards/sofle/rev1/info.json
@@ -28,6 +28,9 @@
             }
         }
     },
+    "tapping": {
+        "term": 100
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/thevankeyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h
index d9dc5a84015d..c2949ab3a7a4 100644
--- a/keyboards/thevankeyboards/bananasplit/config.h
+++ b/keyboards/thevankeyboards/bananasplit/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TERM      175
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/thevankeyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/info.json
index 37f5dec719bc..36fcc06af220 100644
--- a/keyboards/thevankeyboards/bananasplit/info.json
+++ b/keyboards/thevankeyboards/bananasplit/info.json
@@ -16,6 +16,9 @@
     "backlight": {
         "pin": "B7"
     },
+    "tapping": {
+        "term": 175
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_iso"],
diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h
index 32aa944d8f7f..d73f5307d399 100644
--- a/keyboards/yushakobo/navpad/10/config.h
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -33,5 +33,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 132
 #define TAPPING_LAYER_TERM 90
diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json
index 99b0890a48e2..640ee5b043b9 100644
--- a/keyboards/yushakobo/navpad/10/info.json
+++ b/keyboards/yushakobo/navpad/10/info.json
@@ -12,6 +12,9 @@
             {"pin_a": "B5", "pin_b": "B6"}
         ]
     },
+    "tapping": {
+        "term": 132
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h
index fd98f34ca8d8..2cfce6107963 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/config.h
@@ -34,5 +34,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 132
 #define TAPPING_LAYER_TERM 90
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
index a2617ac5e39f..4e1686f430f2 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/info.json
+++ b/keyboards/yushakobo/navpad/10_helix_r/info.json
@@ -34,6 +34,9 @@
             }
         }
     },
+    "tapping": {
+        "term": 132
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h
index 0a445e835973..4b26698659fd 100644
--- a/keyboards/zfrontier/big_switch/config.h
+++ b/keyboards/zfrontier/big_switch/config.h
@@ -31,6 +31,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 2.0
 #define RGBLIGHT_EFFECT_BREATHE_MAX 255
 
-/* long tapping config */
-#define TAPPING_TERM 500
 #define PERMISSIVE_HOLD
diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json
index ac957c413c2e..746ffc803428 100644
--- a/keyboards/zfrontier/big_switch/info.json
+++ b/keyboards/zfrontier/big_switch/info.json
@@ -15,6 +15,9 @@
     "rgblight": {
         "led_count": 4
     },
+    "tapping": {
+        "term": 500
+    },
     "ws2812": {
         "pin": "B6"
     },