10 files changed, 8 insertions, 38 deletions
diff --git a/keyboards/kinesis/config.h b/keyboards/kinesis/config.h
index de5f023bb9..52ea641d6e 100644
--- a/keyboards/kinesis/config.h
+++ b/keyboards/kinesis/config.h
@@ -26,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_DELTA 1
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 1
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* 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/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index 4bbc59e44c..7dad99db7a 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -27,13 +27,6 @@
 #define LED_COMPOSE_PIN C3
 #define LED_PIN_ON_STATE 0
 
-/* Well-worn Cherry MX key switches can bounce for up to 20ms, despite the
- * Cherry data sheet specifying 5ms. Because we use the sym_eager_pk debounce
- * algorithm, this debounce latency only affects key releases (not key
- * presses). */
-#undef DEBOUNCE
-#define DEBOUNCE 20
-
 #define IGNORE_MOD_TAP_INTERRUPT
 
 // The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index b44abddfdf..dcc543e0fc 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -5,5 +5,6 @@
         "vid": "0xFEED",
         "pid": "0x6060",
         "device_version": "0.0.2"
-    }
+    },
+    "debounce": 20
 }
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index 9b45484b55..76d3ff31ae 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -37,13 +37,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Well-worn Cherry MX key switches can bounce for up to 20ms, despite the
- * Cherry data sheet specifying 5ms. Because we use the sym_eager_pk debounce
- * algorithm, this debounce latency only affects key releases (not key
- * presses). */
-#undef DEBOUNCE
-#define DEBOUNCE 20
-
 #define IGNORE_MOD_TAP_INTERRUPT
 
 // The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz:
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index 2fbfcc5661..61bd4508a0 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -5,5 +5,6 @@
         "vid": "0x1209",
         "pid": "0x345C",
         "device_version": "0.0.1"
-    }
+    },
+    "debounce": 20
 }
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 6df789d631..7050eadd41 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -64,13 +64,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Well-worn Cherry MX key switches can bounce for up to 20ms, despite the
- * Cherry data sheet specifying 5ms. Because we use the sym_eager_pk debounce
- * algorithm, this debounce latency only affects key releases (not key
- * presses). */
-#undef DEBOUNCE
-#define DEBOUNCE 20
-
 #define IGNORE_MOD_TAP_INTERRUPT
 
 // The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json
index 45481a5b84..70ee14bad3 100644
--- a/keyboards/kinesis/kint41/info.json
+++ b/keyboards/kinesis/kint41/info.json
@@ -5,5 +5,6 @@
         "vid": "0x1209",
         "pid": "0x345C",
         "device_version": "0.0.1"
-    }
+    },
+    "debounce": 20
 }
diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h
index 4ee9f9ca6f..537cb399d8 100644
--- a/keyboards/kinesis/kintlc/config.h
+++ b/keyboards/kinesis/kintlc/config.h
@@ -64,13 +64,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Well-worn Cherry MX key switches can bounce for up to 20ms, despite the
- * Cherry data sheet specifying 5ms. Because we use the sym_eager_pk debounce
- * algorithm, this debounce latency only affects key releases (not key
- * presses). */
-#undef DEBOUNCE
-#define DEBOUNCE 20
-
 #define IGNORE_MOD_TAP_INTERRUPT
 
 // The Teensy LC power consumption is unknown as per
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index 721ebbfe82..d937ad902d 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -5,5 +5,6 @@
         "vid": "0x1209",
         "pid": "0x345C",
         "device_version": "0.0.1"
-    }
+    },
+    "debounce": 20
 }
diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h
index bb47d26947..01108b8e89 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -28,9 +28,6 @@
 #define LED_COMPOSE_PIN F0
 #define LED_PIN_ON_STATE 0
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* don't know if this should be defined at the board or top level. Assuming board 
 #define MOUSEKEY_DELAY          100
 #define MOUSEKEY_INTERVAL       20