Move FORCE_NKRO to data driven (qmk#20604)

freznel10 · May 1, 2023 · 12d42ce · 12d42ce
1 parent 3bc4aea
commit 12d42ce
Show file tree

Hide file tree

Showing 228 changed files with 209 additions and 781 deletions.
diff --git a/keyboards/amjkeyboard/amj84/config.h b/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.

diff --git a/keyboards/amjkeyboard/amj84/info.json b/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"],

diff --git a/keyboards/atlantis/ak81_ve/config.h b/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

diff --git a/keyboards/atlantis/ak81_ve/info.json b/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"

diff --git a/keyboards/bear_face/config.h b/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.

diff --git a/keyboards/bear_face/info.json b/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"],

diff --git a/keyboards/bt66tech/bt66tech60/config.h b/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
 

diff --git a/keyboards/bt66tech/bt66tech60/info.json b/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"],

diff --git a/keyboards/bubble75/hotswap/config.h b/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

diff --git a/keyboards/bubble75/hotswap/info.json b/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"

diff --git a/keyboards/cannonkeys/ortho60v2/ortho60v2.c b/keyboards/cannonkeys/ortho60v2/ortho60v2.c
diff --git a/keyboards/cannonkeys/ortho60v2/ortho60v2.h b/keyboards/cannonkeys/ortho60v2/ortho60v2.h
diff --git a/keyboards/cest73/tkm/config.h b/keyboards/cest73/tkm/config.h
diff --git a/keyboards/cest73/tkm/info.json b/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"],

diff --git a/keyboards/chaos65/config.h b/keyboards/chaos65/config.h
diff --git a/keyboards/chaos65/info.json b/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"],

diff --git a/keyboards/clueboard/17/17.c b/keyboards/clueboard/17/17.c
@@ -1,4 +1,4 @@
-#include "17.h"
+#include "quantum.h"
 
 int pwm_level;
 

diff --git a/keyboards/clueboard/17/17.h b/keyboards/clueboard/17/17.h
diff --git a/keyboards/clueboard/2x1800/2021/2021.c b/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"
 

diff --git a/keyboards/clueboard/2x1800/2021/2021.h b/keyboards/clueboard/2x1800/2021/2021.h
diff --git a/keyboards/clueboard/66/rev2/rev2.c b/keyboards/clueboard/66/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "rev2.h"
+#include "quantum.h"
 #include "print.h"
 
 void backlight_init_ports(void) {

diff --git a/keyboards/clueboard/66/rev2/rev2.h b/keyboards/clueboard/66/rev2/rev2.h
diff --git a/keyboards/clueboard/66/rev3/rev3.c b/keyboards/clueboard/66/rev3/rev3.c
@@ -1,4 +1,4 @@
-#include "rev3.h"
+#include "quantum.h"
 #include "print.h"
 
 void backlight_init_ports(void) {

diff --git a/keyboards/clueboard/66/rev3/rev3.h b/keyboards/clueboard/66/rev3/rev3.h
diff --git a/keyboards/clueboard/66/rev4/rev4.c b/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

diff --git a/keyboards/clueboard/66/rev4/rev4.h b/keyboards/clueboard/66/rev4/rev4.h
diff --git a/keyboards/clueboard/card/card.c b/keyboards/clueboard/card/card.c
@@ -1,4 +1,4 @@
-#include "card.h"
+#include "quantum.h"
 
 #define BL_RED OCR1B
 #define BL_GREEN OCR1A

diff --git a/keyboards/clueboard/card/card.h b/keyboards/clueboard/card/card.h
diff --git a/keyboards/doio/kb16/rev1/config.h b/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"
 

diff --git a/keyboards/doio/kb16/rev1/info.json b/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"

diff --git a/keyboards/doio/kb16/rev2/config.h b/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

diff --git a/keyboards/doio/kb16/rev2/info.json b/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"

diff --git a/keyboards/dotmod/dymium65/config.h b/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

diff --git a/keyboards/dotmod/dymium65/info.json b/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": {

diff --git a/keyboards/ducky/one2mini/1861st/config.h b/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)
diff --git a/keyboards/ducky/one2mini/1861st/info.json b/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"],

diff --git a/keyboards/ducky/one2sf/1967st/config.h b/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)
diff --git a/keyboards/ducky/one2sf/1967st/info.json b/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"],

diff --git a/keyboards/eason/aeroboard/config.h b/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
 

diff --git a/keyboards/eason/aeroboard/info.json b/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",

diff --git a/keyboards/frooastboard/walnut/walnut.c b/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)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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)