Move `FORCE_NKRO` to data driven (#20604)

keyboards/amjkeyboard/amj84/config.h

@@ -8,8 +8,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define FORCE_NKRO
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

keyboards/amjkeyboard/amj84/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x00D8",
         "pid": "0x6068",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "D1"],

keyboards/atlantis/ak81_ve/config.h

@@ -24,7 +24,6 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define FORCE_NKRO
 
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS

keyboards/atlantis/ak81_ve/info.json

@@ -5,7 +5,8 @@
     "usb": {
         "vid": "0x416B",
         "pid": "0x0081",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "WS2812"

keyboards/bear_face/config.h

@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define FORCE_NKRO
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

keyboards/bear_face/info.json

@@ -6,7 +6,8 @@
     "debounce": 6,
     "usb": {
         "vid": "0xFEED",
-        "pid": "0x09F5"
+        "pid": "0x09F5",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["B5", "C7", "C6", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],

keyboards/bt66tech/bt66tech60/config.h

@@ -43,8 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  These options are also useful to firmware size reduction.
  */
 
-#define FORCE_NKRO
-
 /* disable debug print */
 //#define NO_DEBUG
 

keyboards/bt66tech/bt66tech60/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x4254",
         "pid": "0x7070",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12"],

keyboards/bubble75/hotswap/config.h

@@ -22,8 +22,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define FORCE_NKRO
-
 /* WS2812 RGB */
 #ifdef RGB_MATRIX_ENABLE
 #define RGBLED_NUM 81

keyboards/bubble75/hotswap/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x4242",
         "pid": "0x5A4C",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "ws2812": {
         "pin": "B7"

keyboards/cannonkeys/ortho60v2/ortho60v2.c

@@ -1,17 +0,0 @@
-/*
-Copyright 2022 CannonKeys
-
-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/>.
-*/
-#include "ortho60v2.h"

keyboards/cannonkeys/ortho60v2/ortho60v2.h

@@ -1,19 +0,0 @@
-/*
-Copyright 2022 CannonKeys
-
-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
-
-#include "quantum.h"

keyboards/cest73/tkm/config.h

@@ -1,19 +0,0 @@
- /* Copyright 2021 cest73 
-  * 
-  * 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
-
-/* force n-key rollover*/
-#define FORCE_NKRO

keyboards/cest73/tkm/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xBADD",
         "pid": "0xAA55",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4"],

keyboards/chaos65/config.h

@@ -1,20 +0,0 @@
-/* Copyright 2022 kb-elmo<mail@elmo.space>
- *
- * 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
-
-/* NKRO */
-#define FORCE_NKRO

keyboards/chaos65/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xB23B",
         "pid": "0x1688",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4"],

keyboards/clueboard/17/17.c

@@ -1,4 +1,4 @@
-#include "17.h"
+#include "quantum.h"
 
 int pwm_level;
 

keyboards/clueboard/17/17.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#include "quantum.h"

keyboards/clueboard/2x1800/2021/2021.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "2021.h"
+#include "quantum.h"
 #include "max7219.h"
 #include "font.h"
 

keyboards/clueboard/2x1800/2021/2021.h

@@ -1,18 +0,0 @@
-/* Copyright 2017 Zach White <skullydazed@gmail.com>
- *
- * 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
-
-#include "quantum.h"

keyboards/clueboard/66/rev2/rev2.c

@@ -1,4 +1,4 @@
-#include "rev2.h"
+#include "quantum.h"
 #include "print.h"
 
 void backlight_init_ports(void) {

keyboards/clueboard/66/rev2/rev2.h

@@ -1,4 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-

keyboards/clueboard/66/rev3/rev3.c

@@ -1,4 +1,4 @@
-#include "rev3.h"
+#include "quantum.h"
 #include "print.h"
 
 void backlight_init_ports(void) {

keyboards/clueboard/66/rev3/rev3.h

@@ -1,4 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-

keyboards/clueboard/66/rev4/rev4.c

@@ -1,4 +1,4 @@
-#include "rev4.h"
+#include "quantum.h"
 
 void led_init_ports(void) {
     // Set our LED pins as output

keyboards/clueboard/66/rev4/rev4.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#include "quantum.h"

keyboards/clueboard/card/card.c

@@ -1,4 +1,4 @@
-#include "card.h"
+#include "quantum.h"
 
 #define BL_RED OCR1B
 #define BL_GREEN OCR1A

keyboards/clueboard/card/card.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#include "quantum.h"

keyboards/doio/kb16/rev1/config.h

@@ -17,9 +17,6 @@
 
 #pragma once
 
-/* Forcing to use NKRO instead 6KRO */
-#define FORCE_NKRO
-
 /* Use the custom font */
 #define OLED_FONT_H "./lib/glcdfont.c"
 

keyboards/doio/kb16/rev1/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xD010",
         "pid": "0x1601",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "WS2812"

keyboards/doio/kb16/rev2/config.h

@@ -17,9 +17,6 @@
 
 #pragma once
 
-/* Forcing to use NKRO instead 6KRO */
-#define FORCE_NKRO
-
 #ifdef OLED_ENABLE
     /* Mapping I2C2 for OLED */
     #define I2C1_SCL_PIN B10

keyboards/doio/kb16/rev2/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xD010",
         "pid": "0x1601",
-        "device_version": "0.0.2"
+        "device_version": "0.0.2",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "WS2812"

keyboards/dotmod/dymium65/config.h

@@ -22,8 +22,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define FORCE_NKRO
-
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 66
 #define RGB_MATRIX_KEYPRESSES

keyboards/dotmod/dymium65/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x5678",
         "pid": "0x5058",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "diode_direction": "ROW2COL",
     "matrix_pins": {

keyboards/ducky/one2mini/1861st/config.h

@@ -19,6 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} }
 
-#define FORCE_NKRO
-
 #define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L)

keyboards/ducky/one2mini/1861st/info.json

@@ -4,7 +4,8 @@
     "usb": {
         "vid": "0x0416",
         "pid": "0x0123",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B8"],

keyboards/ducky/one2sf/1967st/config.h

@@ -19,6 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} }
 
-#define FORCE_NKRO
-
 #define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L)

keyboards/ducky/one2sf/1967st/info.json

@@ -5,7 +5,8 @@
     "usb": {
         "vid": "0x445B",
         "pid": "0x07AF",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15", "B8"],

keyboards/eason/aeroboard/config.h

@@ -17,9 +17,6 @@
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
 
-#define FORCE_NKRO
-
-
 /* disable debug print */
 //#define NO_DEBUG
 

keyboards/eason/aeroboard/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x8954",
         "pid": "0x8870",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "ws2812": {
         "pin": "B15",

keyboards/frooastboard/walnut/walnut.c

@@ -1,7 +1,7 @@
 // Copyright 2022 Simon Benezan (@Frooastside)
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "walnut.h"
+#include "quantum.h"
 
 #if defined(RGB_MATRIX_ENABLE)
 

keyboards/frooastboard/walnut/walnut.h

@@ -1,6 +0,0 @@
-// Copyright 2022 Simon Benezan (@Frooastside)
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "quantum.h"

keyboards/gboards/butterstick/config.h

@@ -2,5 +2,3 @@
 
 
 #define VERSION 		"Paula Deen"
-
-#define FORCE_NKRO

keyboards/gboards/butterstick/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x1337",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"],

keyboards/gboards/georgi/config.h

@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VERSION "v1.1: ClayM"
 #define VERBOSE
 
-#define FORCE_NKRO
 #define NO_ACTION_ONESHOT
 
 /* key matrix size */

keyboards/gboards/georgi/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x1337",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",

keyboards/gopolar/gg86/config.h

@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* Forcing to use NKRO instead 6KRO */
-#define FORCE_NKRO
-
 /* Use the custom font */
 #define OLED_FONT_H "lib/glcdfont.c"
 

keyboards/gopolar/gg86/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x0007",
         "pid": "0x0007",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "ws2812": {
         "pin": "E2"

keyboards/handwired/10k/10k.h

@@ -1,20 +0,0 @@
-/*
-Copyright 2022 Nabos <nabos at glargh dot fr>
-
-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
-
-#include "quantum.h"
-

keyboards/handwired/3dortho14u/rev1/rev1.h

@@ -1,6 +0,0 @@
-// Copyright 2022 Xiao (@xia0)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"

keyboards/handwired/3dortho14u/rev2/rev2.h

@@ -1,6 +0,0 @@
-// Copyright 2022 Xiao (@xia0)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"

keyboards/handwired/arrow_pad/config.h

@@ -1,36 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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 FORCE_NKRO
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

keyboards/handwired/arrow_pad/info.json

@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0xFEED",
     "pid": "0x4096",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "force_nkro": true
   },
   "matrix_pins": {
     "cols": ["B0", "B1", "B2", "B3"],

keyboards/handwired/baredev/rev1/rev1.h

@@ -1,19 +0,0 @@
-/* Copyright 2021 Fernando "ManoShu" Rodrigues
- *
- * 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
-
-#include "quantum.h"

keyboards/handwired/datahand/config.h

@@ -27,8 +27,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define FORCE_NKRO
-
 /*
  * Command/Windows key option
  *

keyboards/handwired/datahand/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x13BA",
         "pid": "0x0017",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "processor": "at90usb1286",
     "bootloader": "halfkay",

keyboards/handwired/mutepad/config.h

@@ -10,8 +10,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define FORCE_NKRO
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

keyboards/handwired/mutepad/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x0000",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["B1", "B3", "B2", "B6"],

keyboards/handwired/retro_refit/config.h

@@ -22,9 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Force NKRO Mode - If forced on, must be disabled via magic key (default = LShift+RShift+N) */
-#define FORCE_NKRO
-
 /* remap magic keys */
 #define MAGIC_KEY_LOCK             BSLS
 

keyboards/handwired/retro_refit/info.json

@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0xFEED",
     "pid": "0x6060",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "force_nkro": true
   },
   "matrix_pins": {
     "cols": ["B0", "B1", "B2", "B3", "D2", "D3", "C7", "D5"],

keyboards/handwired/twig/twig50/config.h

@@ -5,8 +5,6 @@
 
 #define TAPPING_TERM 150
 
-#define FORCE_NKRO
-
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN A5
   #define AUDIO_PIN_ALT A4

keyboards/handwired/twig/twig50/info.json

@@ -6,7 +6,8 @@
     "usb": {
       "vid": "0xFEED",
       "pid": "0x6060",
-      "device_version": "0.2.1"
+      "device_version": "0.2.1",
+      "force_nkro": true
     },
     "matrix_pins": {
       "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9", "B10", "B11", "B3", "B2", "B1", "B0"],

keyboards/handwired/wulkan/config.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO

keyboards/handwired/wulkan/info.json

@@ -6,7 +6,8 @@
     "usb": {
       "vid": "0xFEED",
       "pid": "0x6060",
-      "device_version": "0.0.1"
+      "device_version": "0.0.1",
+      "force_nkro": true
     },
     "matrix_pins": {
       "cols": ["B13", "B14", "B15", "B9", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],

keyboards/handwired/xealous/config.h

@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 
 //#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
-#define FORCE_NKRO
 
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN C6

keyboards/handwired/xealous/rev1/info.json

@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x4131",
     "pid": "0x5141",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "force_nkro": true
   },
   "matrix_pins": {
     "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],

keyboards/hfdkb/ac001/config.h

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define FORCE_NKRO
-
 #define TAP_CODE_DELAY 5
 
 /* ws2812 RGB LED */

keyboards/hfdkb/ac001/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xFFFE",
         "pid": "0x0001",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "WS2812"

keyboards/hfdkb/keyboard_sw/k83/config.h

@@ -18,8 +18,6 @@
 
 
 #define RGB_TRIGGER_ON_KEYDOWN
-/* Force NKRO on boot up regardless of the setting saved in the EEPROM (uncomment to enable it) */
-#define FORCE_NKRO
 
 /* encoder resolution */
 #define TAP_CODE_DELAY 15

keyboards/hfdkb/keyboard_sw/k83/info.json

@@ -5,7 +5,8 @@
     "usb": {
         "vid": "0xFFFE",
         "pid": "0x0007",
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "IS31FL3733"

keyboards/horrortroll/chinese_pcb/black_e65/config.h

@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* Forcing to use NKRO instead 6KRO */
-#define FORCE_NKRO
-
 #ifdef RGBLIGHT_ENABLE
     /* RGB Lighting config */
     #define RGBLED_NUM 24

keyboards/horrortroll/chinese_pcb/black_e65/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x7516",
         "pid": "0x7000",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],

keyboards/horrortroll/chinese_pcb/devil68_pro/config.h

@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* Forcing to use NKRO instead 6KRO */
-#define FORCE_NKRO
-
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 86
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200

keyboards/horrortroll/chinese_pcb/devil68_pro/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x7516",
         "pid": "0x7001",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "WS2812"

keyboards/horrortroll/handwired_k552/config.h

@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* Forcing to use NKRO instead 6KRO */
-#define FORCE_NKRO
-
 // SPI configuration
 #define SPI_DRIVER SPID1
 #define SPI_SCK_PIN A5

keyboards/horrortroll/handwired_k552/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x7516",
         "pid": "0x5104",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "ws2812": {
         "pin": "C14"

keyboards/horrortroll/lemon40/config.h

@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* Forcing to use NKRO instead 6KRO */
-#define FORCE_NKRO
-
 /* RGB light config */
 #ifdef RGBLIGHT_ENABLE
    

keyboards/horrortroll/lemon40/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x7516",
         "pid": "0x2434",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "ws2812": {
         "pin": "F4"

keyboards/horrortroll/paws60/config.h

@@ -1,20 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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
-
-/* Forcing to use NKRO instead 6KRO */
-#define FORCE_NKRO

keyboards/horrortroll/paws60/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x7516",
         "pid": "0x6060",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],

keyboards/idobao/id42/config.h

@@ -3,13 +3,6 @@
 
 #pragma once
 
-
-/* Other settings */
-
-/* NKRO by default is required to be turned on. This forces it on
-   during keyboard startup regardless of EEPROM setting. */
-#define FORCE_NKRO
-
 /* Change the USB polling rate [default = 1000Hz (1ms)] and
  * use larger value of keys per scan for elite games */
 #define USB_POLLING_INTERVAL_MS  2  // 500Hz

keyboards/idobao/id42/id42.c

@@ -1,7 +1,7 @@
 // Copyright 2022 Vino Rodrigues (@vinorodrigues)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "id42.h"
+#include "quantum.h"
 
 #define __ NO_LED
 

keyboards/idobao/id42/id42.h

@@ -1,6 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"

keyboards/idobao/id42/info.json

@@ -29,7 +29,8 @@
     "usb": {
         "vid": "0x6964",
         "pid": "0x0042",
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "force_nkro": true
       },
     "layouts": {
         "LAYOUT": {

keyboards/idobao/id61/id61.c

@@ -1,7 +1,7 @@
 // Copyright 2022 Vino Rodrigues (@vinorodrigues)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "id61.h"
+#include "quantum.h"
 
 #define __ NO_LED
 

keyboards/idobao/id61/id61.h

@@ -1,6 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"

keyboards/idobao/id63/id63.c

@@ -1,7 +1,7 @@
 // Copyright 2022 Vino Rodrigues (@vinorodrigues)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "id63.h"
+#include "quantum.h"
 
 #define __ NO_LED
 

keyboards/idobao/id63/id63.h

@@ -1,6 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"

keyboards/idobao/id67/id67.c

@@ -3,7 +3,7 @@
 // Copyright 2022 Vino Rodrigues (@vinorodrigues)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "id67.h"
+#include "quantum.h"
 
 #define __ NO_LED
 

keyboards/idobao/id67/id67.h

@@ -1,8 +0,0 @@
-// Copyright 2021 Tybera (@tybera)
-// Copyright 2021 Werther (@thewerther)
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"

keyboards/idobao/id80/v3/ansi/ansi.c

@@ -1,7 +1,7 @@
 // Copyright 2022 Vino Rodrigues (@vinorodrigues)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "ansi.h"
+#include "quantum.h"
 
 #define __ NO_LED
 

keyboards/idobao/id80/v3/ansi/ansi.h

@@ -1,6 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"

keyboards/idobao/id87/v2/v2.c

@@ -1,7 +1,7 @@
 // Copyright 2022 vinorodrigues (@vinorodrigues)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "v2.h"
+#include "quantum.h"
 
 #define __ NO_LED
 

keyboards/idobao/id87/v2/v2.h

@@ -1,6 +0,0 @@
-// Copyright 2022 vinorodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"

keyboards/idobao/montex/v2/v2.c

@@ -1,7 +1,7 @@
 // Copyright 2022 IBNobody (@IBNobody)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "v2.h"
+#include "quantum.h"
 
 #define __ NO_LED
 

keyboards/idobao/montex/v2/v2.h

@@ -1,6 +0,0 @@
-// Copyright 2022 IBNobody (@IBNobody)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"

keyboards/kabedon/kabedon98e/config.h

@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define FORCE_NKRO
-
 #define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD

keyboards/kabedon/kabedon98e/info.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x4B44",
         "pid": "0x3935",
-        "device_version": "0.0.2"
+        "device_version": "0.0.2",
+        "force_nkro": true
     },
     "ws2812": {
         "pin": "B4",

keyboards/kbdfans/kbd75hs/config.h

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define FORCE_NKRO
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

keyboards/kbdfans/kbd75hs/info.json

@@ -5,7 +5,8 @@
     "usb": {
         "vid": "0x4B42",
         "pid": "0x6062",
-        "device_version": "0.0.3"
+        "device_version": "0.0.3",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],