diff options
| author | Ryan <fauxpark@gmail.com> | 2023-05-01 13:33:10 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-01 13:33:10 +1000 |
| commit | 12d42cedd2624db0d5cfe6f538211f9dfcd19822 (patch) | |
| tree | 6220d782fbfa4fa231184532009b95076ea9cae5 | |
| parent | 3bc4aeac6cc940d10bc73589ea67e0eaa7c7a878 (diff) | |
Move `FORCE_NKRO` to data driven (#20604)
228 files changed, 209 insertions, 781 deletions
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h index da28e92400..86415b251a 100644 --- 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 index 26a3fad1bc..98c4a7e447 100644 --- 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 index 994c0fd82f..f300362917 100644 --- 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 index b5ef4538d8..0dc2db9072 100644 --- 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 index 2f3742c5d0..81ada21b71 100644 --- 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 index 357847f418..0c3e614803 100644 --- 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 index 6f951724f1..687baec509 100644 --- 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 index 75ab70164a..e4a2d5b1d6 100644 --- 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 index a637e9e335..df83257ebd 100644 --- 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 index f57e41df46..dcf98006a1 100644 --- 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 deleted file mode 100644 index 3e0248abda..0000000000 --- a/keyboards/cannonkeys/ortho60v2/ortho60v2.c +++ /dev/null @@ -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" diff --git a/keyboards/cannonkeys/ortho60v2/ortho60v2.h b/keyboards/cannonkeys/ortho60v2/ortho60v2.h deleted file mode 100644 index a9ca3d7e47..0000000000 --- a/keyboards/cannonkeys/ortho60v2/ortho60v2.h +++ /dev/null @@ -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" diff --git a/keyboards/cest73/tkm/config.h b/keyboards/cest73/tkm/config.h deleted file mode 100644 index 9b6132cbdb..0000000000 --- a/keyboards/cest73/tkm/config.h +++ /dev/null @@ -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 diff --git a/keyboards/cest73/tkm/info.json b/keyboards/cest73/tkm/info.json index 234d31d75a..b8560879f9 100644 --- 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 deleted file mode 100644 index caf3e9d4e4..0000000000 --- a/keyboards/chaos65/config.h +++ /dev/null @@ -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 diff --git a/keyboards/chaos65/info.json b/keyboards/chaos65/info.json index 7b7e6d91f8..bd88ac3f5f 100644 --- 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 index 44b55a323b..5cf2238d78 100644 --- 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 deleted file mode 100644 index ef5b3f3e04..0000000000 --- a/keyboards/clueboard/17/17.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "quantum.h" diff --git a/keyboards/clueboard/2x1800/2021/2021.c b/keyboards/clueboard/2x1800/2021/2021.c index 40f2a2ed67..2a3f1304c7 100644 --- 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 deleted file mode 100644 index ecb9e00c4e..0000000000 --- a/keyboards/clueboard/2x1800/2021/2021.h +++ /dev/null @@ -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" diff --git a/keyboards/clueboard/66/rev2/rev2.c b/keyboards/clueboard/66/rev2/rev2.c index a533c550aa..7e3ed5c9dd 100644 --- 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 deleted file mode 100644 index 00bdf1e032..0000000000 --- a/keyboards/clueboard/66/rev2/rev2.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#include "quantum.h" - diff --git a/keyboards/clueboard/66/rev3/rev3.c b/keyboards/clueboard/66/rev3/rev3.c index 7ec8dcb681..7e3ed5c9dd 100644 --- 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 deleted file mode 100644 index 00bdf1e032..0000000000 --- a/keyboards/clueboard/66/rev3/rev3.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#include "quantum.h" - diff --git a/keyboards/clueboard/66/rev4/rev4.c b/keyboards/clueboard/66/rev4/rev4.c index 5101818270..75befc5230 100644 --- 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 deleted file mode 100644 index ef5b3f3e04..0000000000 --- a/keyboards/clueboard/66/rev4/rev4.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "quantum.h" diff --git a/keyboards/clueboard/card/card.c b/keyboards/clueboard/card/card.c index 33a4cc3cdc..214f3b6a91 100644 --- 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 deleted file mode 100644 index ef5b3f3e04..0000000000 --- a/keyboards/clueboard/card/card.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "quantum.h" diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h index 8739474326..460fa439f6 100644 --- 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 index f37a58e157..4d2852fe05 100644 --- 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 index 9580435e5c..cc8d0a6830 100644 --- 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 index 6d11cadaac..1e83ca77cc 100644 --- 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 index 45853902b7..fa5999ca48 100644 --- 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 index 7c0674a86d..c9dd368f4f 100644 --- 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 index 123779a7ab..92448f54d1 100644 --- 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 index b8cfe9d892..1f1783f635 100644 --- 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 index 123779a7ab..92448f54d1 100644 --- 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 index bceb5d3507..6c26c11a05 100644 --- 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 index 6c9312eafb..5ba690ee95 100644 --- 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 index 83908b1bed..c7383aa160 100644 --- 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 index da398205a0..7163af011d 100644 --- 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) diff --git a/keyboards/frooastboard/walnut/walnut.h b/keyboards/frooastboard/walnut/walnut.h deleted file mode 100644 index 3ceb9bd689..0000000000 --- a/keyboards/frooastboard/walnut/walnut.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Simon Benezan (@Frooastside) -// SPDX-License-Identifier: GPL-3.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h index a3516ccedb..a89e672aea 100644 --- a/keyboards/gboards/butterstick/config.h +++ b/keyboards/gboards/butterstick/config.h @@ -2,5 +2,3 @@ #define VERSION "Paula Deen" - -#define FORCE_NKRO diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index d2fc3d3f40..1695ca0e23 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/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"], diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h index 3e090f9e57..99bdd06bb5 100644 --- a/keyboards/gboards/georgi/config.h +++ b/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 */ diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json index 7ede9d1f43..0a654eaa4a 100644 --- a/keyboards/gboards/georgi/info.json +++ b/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", diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h index 065010fa52..e925b2b384 100644 --- a/keyboards/gopolar/gg86/config.h +++ b/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" diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json index 8886063045..7400917333 100644 --- a/keyboards/gopolar/gg86/info.json +++ b/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" diff --git a/keyboards/handwired/10k/10k.h b/keyboards/handwired/10k/10k.h deleted file mode 100644 index 8fbabcf6ca..0000000000 --- a/keyboards/handwired/10k/10k.h +++ /dev/null @@ -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" - diff --git a/keyboards/handwired/3dortho14u/rev1/rev1.h b/keyboards/handwired/3dortho14u/rev1/rev1.h deleted file mode 100644 index d8f47c43f8..0000000000 --- a/keyboards/handwired/3dortho14u/rev1/rev1.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Xiao (@xia0) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/handwired/3dortho14u/rev2/rev2.h b/keyboards/handwired/3dortho14u/rev2/rev2.h deleted file mode 100644 index d8f47c43f8..0000000000 --- a/keyboards/handwired/3dortho14u/rev2/rev2.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Xiao (@xia0) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/handwired/arrow_pad/config.h b/keyboards/handwired/arrow_pad/config.h deleted file mode 100644 index 2ed5b28c87..0000000000 --- a/keyboards/handwired/arrow_pad/config.h +++ /dev/null @@ -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 diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/info.json index b9d705f3bf..79016d5d21 100644 --- a/keyboards/handwired/arrow_pad/info.json +++ b/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"], diff --git a/keyboards/handwired/baredev/rev1/rev1.h b/keyboards/handwired/baredev/rev1/rev1.h deleted file mode 100644 index 62a4829060..0000000000 --- a/keyboards/handwired/baredev/rev1/rev1.h +++ /dev/null @@ -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"
\ No newline at end of file diff --git a/keyboards/handwired/datahand/config.h b/keyboards/handwired/datahand/config.h index 1cea39a739..0b2de61490 100644 --- a/keyboards/handwired/datahand/config.h +++ b/keyboards/handwired/datahand/config.h @@ -27,8 +27,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define FORCE_NKRO - /* * Command/Windows key option * diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json index 590eb090bd..372619565d 100644 --- a/keyboards/handwired/datahand/info.json +++ b/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", diff --git a/keyboards/handwired/mutepad/config.h b/keyboards/handwired/mutepad/config.h index 9dcdd90bb7..83c78b1634 100644 --- a/keyboards/handwired/mutepad/config.h +++ b/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. diff --git a/keyboards/handwired/mutepad/info.json b/keyboards/handwired/mutepad/info.json index b0bcfe4829..e8df528eff 100644 --- a/keyboards/handwired/mutepad/info.json +++ b/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"], diff --git a/keyboards/handwired/retro_refit/config.h b/keyboards/handwired/retro_refit/config.h index 3dc99447ee..8f6d8d5193 100644 --- a/keyboards/handwired/retro_refit/config.h +++ b/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 diff --git a/keyboards/handwired/retro_refit/info.json b/keyboards/handwired/retro_refit/info.json index c7cef78c19..ca0dffdc83 100644 --- a/keyboards/handwired/retro_refit/info.json +++ b/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"], diff --git a/keyboards/handwired/twig/twig50/config.h b/keyboards/handwired/twig/twig50/config.h index 25236b2a2f..d3d188ef42 100644 --- a/keyboards/handwired/twig/twig50/config.h +++ b/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 diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json index 9ed5c92d46..c32734cecb 100644 --- a/keyboards/handwired/twig/twig50/info.json +++ b/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"], diff --git a/keyboards/handwired/wulkan/config.h b/keyboards/handwired/wulkan/config.h deleted file mode 100644 index 1c801d7e3c..0000000000 --- a/keyboards/handwired/wulkan/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define FORCE_NKRO diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/info.json index 02c7ef1d5c..9bb1d9cd94 100644 --- a/keyboards/handwired/wulkan/info.json +++ b/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"], diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h index 72e031c8de..a8788a8ad7 100644 --- a/keyboards/handwired/xealous/config.h +++ b/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 diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json index 7401cb24c9..e233404347 100644 --- a/keyboards/handwired/xealous/rev1/info.json +++ b/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"], diff --git a/keyboards/hfdkb/ac001/config.h b/keyboards/hfdkb/ac001/config.h index ee03dd1e17..899a134762 100644 --- a/keyboards/hfdkb/ac001/config.h +++ b/keyboards/hfdkb/ac001/config.h @@ -16,8 +16,6 @@ #pragma once -#define FORCE_NKRO - #define TAP_CODE_DELAY 5 /* ws2812 RGB LED */ diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json index d46deb9d0d..2efee90deb 100644 --- a/keyboards/hfdkb/ac001/info.json +++ b/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" diff --git a/keyboards/hfdkb/keyboard_sw/k83/config.h b/keyboards/hfdkb/keyboard_sw/k83/config.h index f5525a9943..a4660c93be 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/config.h +++ b/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 diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json index 330a7d551f..0fc817ffdc 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/info.json +++ b/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" diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h index 3b5cf84cbd..de5824e222 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h +++ b/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 diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json index 11b53d695c..2ceb38706f 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json +++ b/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"], diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h index 266cc0ea78..adba031af5 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h +++ b/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 diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json index 0a4f93e10d..192e9285fc 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json +++ b/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" diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h index cae7c8b11a..bec0ac055b 100644 --- a/keyboards/horrortroll/handwired_k552/config.h +++ b/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 diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json index 2d97949c82..6bdd2ee2fc 100644 --- a/keyboards/horrortroll/handwired_k552/info.json +++ b/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" diff --git a/keyboards/horrortroll/lemon40/config.h b/keyboards/horrortroll/lemon40/config.h index 14ae995d43..9037487173 100644 --- a/keyboards/horrortroll/lemon40/config.h +++ b/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 diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json index ade1731d94..f4b4c383c9 100644 --- a/keyboards/horrortroll/lemon40/info.json +++ b/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" diff --git a/keyboards/horrortroll/paws60/config.h b/keyboards/horrortroll/paws60/config.h deleted file mode 100644 index 5d9f1d9dc6..0000000000 --- a/keyboards/horrortroll/paws60/config.h +++ /dev/null @@ -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 diff --git a/keyboards/horrortroll/paws60/info.json b/keyboards/horrortroll/paws60/info.json index 83fa85eda3..a8da9ee2c2 100644 --- a/keyboards/horrortroll/paws60/info.json +++ b/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"], diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h index 6f43a71054..501fd1f996 100755 --- a/keyboards/idobao/id42/config.h +++ b/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 diff --git a/keyboards/idobao/id42/id42.c b/keyboards/idobao/id42/id42.c index 15cc0b41b0..5e76e4c5be 100755 --- a/keyboards/idobao/id42/id42.c +++ b/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 diff --git a/keyboards/idobao/id42/id42.h b/keyboards/idobao/id42/id42.h deleted file mode 100755 index d9bef6d021..0000000000 --- a/keyboards/idobao/id42/id42.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Vino Rodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json index ea37dd3322..47f40ce119 100644 --- a/keyboards/idobao/id42/info.json +++ b/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": { diff --git a/keyboards/idobao/id61/id61.c b/keyboards/idobao/id61/id61.c index f6338c7133..bd2271049b 100644 --- a/keyboards/idobao/id61/id61.c +++ b/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 diff --git a/keyboards/idobao/id61/id61.h b/keyboards/idobao/id61/id61.h deleted file mode 100644 index d9bef6d021..0000000000 --- a/keyboards/idobao/id61/id61.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Vino Rodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/id63/id63.c b/keyboards/idobao/id63/id63.c index d9b7fdef39..f425eb4fe4 100644 --- a/keyboards/idobao/id63/id63.c +++ b/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 diff --git a/keyboards/idobao/id63/id63.h b/keyboards/idobao/id63/id63.h deleted file mode 100644 index d9bef6d021..0000000000 --- a/keyboards/idobao/id63/id63.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Vino Rodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/id67/id67.c b/keyboards/idobao/id67/id67.c index 17bcd9a943..dab6347eb3 100644 --- a/keyboards/idobao/id67/id67.c +++ b/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 diff --git a/keyboards/idobao/id67/id67.h b/keyboards/idobao/id67/id67.h deleted file mode 100644 index cd5ab8de09..0000000000 --- a/keyboards/idobao/id67/id67.h +++ /dev/null @@ -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" diff --git a/keyboards/idobao/id80/v3/ansi/ansi.c b/keyboards/idobao/id80/v3/ansi/ansi.c index 2b298924cf..75f995fbbe 100644 --- a/keyboards/idobao/id80/v3/ansi/ansi.c +++ b/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 diff --git a/keyboards/idobao/id80/v3/ansi/ansi.h b/keyboards/idobao/id80/v3/ansi/ansi.h deleted file mode 100644 index d9bef6d021..0000000000 --- a/keyboards/idobao/id80/v3/ansi/ansi.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Vino Rodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/id87/v2/v2.c b/keyboards/idobao/id87/v2/v2.c index 34f0a74669..7992fb6295 100644 --- a/keyboards/idobao/id87/v2/v2.c +++ b/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 diff --git a/keyboards/idobao/id87/v2/v2.h b/keyboards/idobao/id87/v2/v2.h deleted file mode 100644 index 38b3c9dfda..0000000000 --- a/keyboards/idobao/id87/v2/v2.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 vinorodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/montex/v2/v2.c b/keyboards/idobao/montex/v2/v2.c index 0f06aa708e..ad6e32a692 100755 --- a/keyboards/idobao/montex/v2/v2.c +++ b/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 diff --git a/keyboards/idobao/montex/v2/v2.h b/keyboards/idobao/montex/v2/v2.h deleted file mode 100755 index 3f486480db..0000000000 --- a/keyboards/idobao/montex/v2/v2.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 IBNobody (@IBNobody) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h index 8988d940e1..c8ae65099b 100644 --- a/keyboards/kabedon/kabedon98e/config.h +++ b/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 diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json index d72aafd2a6..cbe83c98ee 100644 --- a/keyboards/kabedon/kabedon98e/info.json +++ b/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", diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h index c6e7db6bcd..4bc0c6dcff 100644 --- a/keyboards/kbdfans/kbd75hs/config.h +++ b/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 diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json index 452caa9aa8..b84f63a967 100644 --- a/keyboards/kbdfans/kbd75hs/info.json +++ b/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"], diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json index 7b98521985..e4fbf055f2 100644 --- a/keyboards/keychron/q1/ansi/info.json +++ b/keyboards/keychron/q1/ansi/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x3434", "pid": "0x0100", - "device_version": "1.0.0" + "device_version": "1.0.0", + "force_nkro": true }, "rgb_matrix": { "driver": "IS31FL3733" diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json index 8220bd3323..d9e2fdff60 100644 --- a/keyboards/keychron/q1/ansi_encoder/info.json +++ b/keyboards/keychron/q1/ansi_encoder/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x3434", "pid": "0x0101", - "device_version": "1.0.0" + "device_version": "1.0.0", + "force_nkro": true }, "rgb_matrix": { "driver": "IS31FL3733" diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h index a87754e9f2..c78453dc5f 100644 --- a/keyboards/keychron/q1/config.h +++ b/keyboards/keychron/q1/config.h @@ -27,9 +27,6 @@ /* Disable DIP switch in matrix data */ #define MATRIX_MASKED -/* NKRO */ -#define FORCE_NKRO - /* Disable RGB lighting when PC is in suspend */ #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json index cc8f74bc75..a99ef16ba9 100644 --- a/keyboards/keychron/q1/iso/info.json +++ b/keyboards/keychron/q1/iso/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x3434", "pid": "0x0102", - "device_version": "1.0.0" + "device_version": "1.0.0", + "force_nkro": true }, "rgb_matrix": { "driver": "IS31FL3733" diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json index 5bc470e102..38a5da1994 100644 --- a/keyboards/keychron/q1/iso_encoder/info.json +++ b/keyboards/keychron/q1/iso_encoder/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x3434", "pid": "0x0103", - "device_version": "1.0.2" + "device_version": "1.0.2", + "force_nkro": true }, "rgb_matrix": { "driver": "IS31FL3733" diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h index 719f192955..fe391e91a1 100644 --- a/keyboards/kingly_keys/little_foot/config.h +++ b/keyboards/kingly_keys/little_foot/config.h @@ -16,8 +16,6 @@ #pragma once -#define FORCE_NKRO - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json index c3cde9243f..c3dfe66910 100644 --- a/keyboards/kingly_keys/little_foot/info.json +++ b/keyboards/kingly_keys/little_foot/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x6060", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "F4" diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h index 3982ef54e6..cb3fcd2e0d 100644 --- a/keyboards/kingly_keys/smd_milk/config.h +++ b/keyboards/kingly_keys/smd_milk/config.h @@ -15,8 +15,6 @@ */ #pragma once -#define FORCE_NKRO - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json index 2fee4b2603..d2f408e51f 100644 --- a/keyboards/kingly_keys/smd_milk/info.json +++ b/keyboards/kingly_keys/smd_milk/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0xB195", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "B3" diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h index 5fb9ee0e98..2814a6609a 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Force NKRO */ -#define FORCE_NKRO - #define RGB_MATRIX_LED_COUNT 74 #define RGBLED_NUM 74 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json index dc5c2235a8..8c3536db6b 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4B50", "pid": "0x0653", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "E2" diff --git a/keyboards/linworks/dolice/config.h b/keyboards/linworks/dolice/config.h deleted file mode 100644 index 446ade0fcc..0000000000 --- a/keyboards/linworks/dolice/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2021 Moritz Plattner -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 USB NKRO */ -#define FORCE_NKRO diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json index ae201fd50e..c628200298 100644 --- a/keyboards/linworks/dolice/info.json +++ b/keyboards/linworks/dolice/info.json @@ -5,7 +5,8 @@ "usb": { "vid": "0x4C58", "pid": "0x0005", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["E6", "F0", "F1", "B4", "D5", "D3", "D2", "B2"], diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h index fb227ca802..c46332b007 100644 --- a/keyboards/linworks/fave87/config.h +++ b/keyboards/linworks/fave87/config.h @@ -14,10 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Force USB NKRO */ -#define FORCE_NKRO - /* Underglow */ #define RGBLED_NUM 40 #define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json index 2694d09930..e77af6d10d 100644 --- a/keyboards/linworks/fave87/info.json +++ b/keyboards/linworks/fave87/info.json @@ -5,7 +5,8 @@ "usb": { "vid": "0x4C58", "pid": "0x0002", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["F1", "F0", "E6", "B0", "B1", "B2", "B3", "D6", "D7"], diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h index 66c5212371..e21a6d3974 100644 --- a/keyboards/linworks/whale75/config.h +++ b/keyboards/linworks/whale75/config.h @@ -14,10 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Force USB NKRO */ -#define FORCE_NKRO - #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 6 diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json index 2ac2accced..b08d77e307 100644 --- a/keyboards/linworks/whale75/info.json +++ b/keyboards/linworks/whale75/info.json @@ -5,7 +5,8 @@ "usb": { "vid": "0x4C58", "pid": "0x0001", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "B9", diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h deleted file mode 100644 index e3e2bf2fa1..0000000000 --- a/keyboards/mechllama/g35/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2019 Kaylyn Bogle - -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 diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json index 739957342a..dbcdef1e94 100644 --- a/keyboards/mechllama/g35/info.json +++ b/keyboards/mechllama/g35/info.json @@ -5,7 +5,8 @@ "maintainer": "kaylynb", "usb": { "vid": "0xCEEB", - "pid": "0x0035" + "pid": "0x0035", + "force_nkro": true }, "ws2812": { "pin": "F7" diff --git a/keyboards/mechwild/bbs/config.h b/keyboards/mechwild/bbs/config.h index a8c1b6243a..d19f39dd13 100644 --- a/keyboards/mechwild/bbs/config.h +++ b/keyboards/mechwild/bbs/config.h @@ -12,8 +12,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/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json index beafbac222..499a9d1537 100644 --- a/keyboards/mechwild/bbs/info.json +++ b/keyboards/mechwild/bbs/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x6D77", "pid": "0x170E", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["B0", "A7", "A6", "A5", "A4", "A3"], diff --git a/keyboards/mechwild/sugarglider/config.h b/keyboards/mechwild/sugarglider/config.h index dc3a85a728..1512cc1528 100644 --- a/keyboards/mechwild/sugarglider/config.h +++ b/keyboards/mechwild/sugarglider/config.h @@ -36,6 +36,3 @@ #define SPI_MISO_PAL_MODE 5 #define CIRQUE_PINNACLE_SPI_DIVISOR 8 #define CIRQUE_PINNACLE_SPI_CS_PIN A3 - -/* Force NKRO */ -#define FORCE_NKRO diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json index 49e8c7d459..5f7916822c 100644 --- a/keyboards/mechwild/sugarglider/info.json +++ b/keyboards/mechwild/sugarglider/info.json @@ -19,7 +19,8 @@ "usb": { "vid": "0x6D77", "pid": "0x1710", - "device_version": "0.2.0" + "device_version": "0.2.0", + "force_nkro": true }, "diode_direction": "COL2ROW", "rgblight": { diff --git a/keyboards/millipad/config.h b/keyboards/millipad/config.h index 7d416ae8db..8ceeef163d 100644 --- a/keyboards/millipad/config.h +++ b/keyboards/millipad/config.h @@ -18,5 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once #define LOCKING_RESYNC_ENABLE - -#define FORCE_NKRO diff --git a/keyboards/millipad/info.json b/keyboards/millipad/info.json index 975c41481b..5ac2e32221 100644 --- a/keyboards/millipad/info.json +++ b/keyboards/millipad/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x1A1B", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["F0", "F1", "F4", "D7", "D6", "D4"], diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h index c50e01bbe0..55e57fb872 100644 --- a/keyboards/misonoworks/chocolatebar/config.h +++ b/keyboards/misonoworks/chocolatebar/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define FORCE_NKRO - #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json index abb58f29f5..65087ac481 100644 --- a/keyboards/misonoworks/chocolatebar/info.json +++ b/keyboards/misonoworks/chocolatebar/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x6D77", "pid": "0xC456", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "B1" diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h index 0b1dbb4c57..eba5475d83 100644 --- a/keyboards/misonoworks/karina/config.h +++ b/keyboards/misonoworks/karina/config.h @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define FORCE_NKRO #define MK_3_SPEED #define TERMINAL_HELP diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json index 5ebaf68692..2fc140cba6 100644 --- a/keyboards/misonoworks/karina/info.json +++ b/keyboards/misonoworks/karina/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0xC456", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "D1" diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h index 96516121d3..564819588f 100644 --- a/keyboards/ml/gas75/config.h +++ b/keyboards/ml/gas75/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 3 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json index 48e0abb14e..990b45f1ce 100644 --- a/keyboards/ml/gas75/info.json +++ b/keyboards/ml/gas75/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xC0B0", "pid": "0x6060", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "rgb_matrix": { "driver": "WS2812" diff --git a/keyboards/mmkzoo65/config.h b/keyboards/mmkzoo65/config.h index 24b79416a8..99f9e80b3e 100644 --- a/keyboards/mmkzoo65/config.h +++ b/keyboards/mmkzoo65/config.h @@ -16,7 +16,5 @@ #pragma once -#define FORCE_NKRO - /* 将USB 轮询速率更改为 1000hz 并为精英游戏每次扫描使用更大的密钥*/ #define USB_POLLING_INTERVAL_MS 2 diff --git a/keyboards/mmkzoo65/info.json b/keyboards/mmkzoo65/info.json index 837a82916b..558d1fa0dc 100644 --- a/keyboards/mmkzoo65/info.json +++ b/keyboards/mmkzoo65/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x7BA1", "pid": "0x6505", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h index 5250c1c84f..5fa148d748 100644 --- a/keyboards/mss_studio/m63_rgb/config.h +++ b/keyboards/mss_studio/m63_rgb/config.h @@ -17,9 +17,6 @@ #pragma once -/* Forcing to use NKRO instead 6KRO */ -#define FORCE_NKRO - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 75 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 diff --git a/keyboards/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json index 1f9a8a71c4..16577a21e8 100644 --- a/keyboards/mss_studio/m63_rgb/info.json +++ b/keyboards/mss_studio/m63_rgb/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4D4B", "pid": "0x6063", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "B15" diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h index 7270ccb4b3..4c6549ec3a 100644 --- a/keyboards/mss_studio/m64_rgb/config.h +++ b/keyboards/mss_studio/m64_rgb/config.h @@ -17,9 +17,6 @@ #pragma once -/* Forcing to use NKRO instead 6KRO */ -#define FORCE_NKRO - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 76 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 diff --git a/keyboards/mss_studio/m64_rgb/info.json b/keyboards/mss_studio/m64_rgb/info.json index bd0acc9645..6f300fbbb2 100644 --- a/keyboards/mss_studio/m64_rgb/info.json +++ b/keyboards/mss_studio/m64_rgb/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4D4B", "pid": "0x6064", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "B15" diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h index 53ac3aa161..ad7d9c37b1 100644 --- a/keyboards/mwstudio/alicekk/config.h +++ b/keyboards/mwstudio/alicekk/config.h @@ -16,8 +16,6 @@ #pragma once -#define FORCE_NKRO - #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS #define RGBLED_NUM 87 diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json index 523444ffa6..b0d9e5b858 100644 --- a/keyboards/mwstudio/alicekk/info.json +++ b/keyboards/mwstudio/alicekk/info.json @@ -4,7 +4,8 @@ "usb": { "vid": "0x7BA1", "pid": "0x3201", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "A4", "A2", "A1", "B6", "B5", "B4", "B3", "A15"], diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h index 9603e1db2b..8c5cad9bef 100644 --- a/keyboards/mwstudio/mw660/config.h +++ b/keyboards/mwstudio/mw660/config.h @@ -16,8 +16,6 @@ #pragma once -#define FORCE_NKRO - #define DRIVER_LED_TOTAL 34 #define RGBLED_NUM 34 diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/info.json index 8bf0f3f2fc..3cf9f972fc 100644 --- a/keyboards/mwstudio/mw660/info.json +++ b/keyboards/mwstudio/mw660/info.json @@ -25,7 +25,8 @@ "usb": { "device_version": "1.0.0", "pid": "0x6601", - "vid": "0x7BA1" + "vid": "0x7BA1", + "force_nkro": true }, "layouts": { "LAYOUT": { diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h index daacf8f8a6..c4edb8427c 100644 --- a/keyboards/omnikeyish/config.h +++ b/keyboards/omnikeyish/config.h @@ -20,9 +20,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* force n-key rollover*/ -#define FORCE_NKRO - #define DYNAMIC_MACRO_COUNT 12 #define DYNAMIC_MACRO_SIZE 48 #define DYNAMIC_MACRO_EEPROM_STORAGE diff --git a/keyboards/omnikeyish/info.json b/keyboards/omnikeyish/info.json index f97ed3ca56..e5c59d5590 100644 --- a/keyboards/omnikeyish/info.json +++ b/keyboards/omnikeyish/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x0666", - "device_version": "13.3.7" + "device_version": "13.3.7", + "force_nkro": true }, "indicators": { "caps_lock": "E1", diff --git a/keyboards/opendeck/32/info.json b/keyboards/opendeck/32/info.json index 137a988c6d..4d340985d3 100644 --- a/keyboards/opendeck/32/info.json +++ b/keyboards/opendeck/32/info.json @@ -4,6 +4,7 @@ "usb": { "vid": "0x4345", "pid": "0x2EC0", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true } } diff --git a/keyboards/opendeck/32/rev1/config.h b/keyboards/opendeck/32/rev1/config.h index fbea082c78..a85a3db8b9 100644 --- a/keyboards/opendeck/32/rev1/config.h +++ b/keyboards/opendeck/32/rev1/config.h @@ -71,8 +71,6 @@ #define ENABLE_RGB_MATRIX_SOLID_SPLASH #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#define FORCE_NKRO - // Slim down the ROM #define NO_ACTION_LAYER #define NO_ACTION_TAPPING diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h index b1176fc6b8..d37e70df34 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/config.h +++ b/keyboards/owlab/jelly_epoch/hotswap/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* NKRO */ -#define FORCE_NKRO - /* RGB Strip*/ # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json index 0c348d0cdc..c30c06fb67 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/info.json +++ b/keyboards/owlab/jelly_epoch/hotswap/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4F53", "pid": "0x4A4C", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "B11", "B8", "B9", "C13"], diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h index b1176fc6b8..d37e70df34 100644 --- a/keyboards/owlab/jelly_epoch/soldered/config.h +++ b/keyboards/owlab/jelly_epoch/soldered/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* NKRO */ -#define FORCE_NKRO - /* RGB Strip*/ # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json index 4e001d03c0..4c66855d6b 100644 --- a/keyboards/owlab/jelly_epoch/soldered/info.json +++ b/keyboards/owlab/jelly_epoch/soldered/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4F53", "pid": "0x4A53", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "B11", "B8", "B9", "C13"], diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h index c1dab1c71f..8da939a2af 100644 --- a/keyboards/owlab/spring/config.h +++ b/keyboards/owlab/spring/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* NKRO */ -#define FORCE_NKRO - /* RGB Strip*/ # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json index 1a01d11656..1930b04ff5 100644 --- a/keyboards/owlab/spring/info.json +++ b/keyboards/owlab/spring/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4F53", "pid": "0x5350", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"], diff --git a/keyboards/owlab/suit80/ansi/config.h b/keyboards/owlab/suit80/ansi/config.h deleted file mode 100644 index a62df28fc3..0000000000 --- a/keyboards/owlab/suit80/ansi/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 owlab - -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 diff --git a/keyboards/owlab/suit80/ansi/info.json b/keyboards/owlab/suit80/ansi/info.json index a8ca09b4c6..d43c788302 100644 --- a/keyboards/owlab/suit80/ansi/info.json +++ b/keyboards/owlab/suit80/ansi/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4F53", "pid": "0x5355", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"], diff --git a/keyboards/owlab/suit80/iso/config.h b/keyboards/owlab/suit80/iso/config.h deleted file mode 100644 index a62df28fc3..0000000000 --- a/keyboards/owlab/suit80/iso/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 owlab - -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 diff --git a/keyboards/owlab/suit80/iso/info.json b/keyboards/owlab/suit80/iso/info.json index 6e8016c490..55761a4c89 100644 --- a/keyboards/owlab/suit80/iso/info.json +++ b/keyboards/owlab/suit80/iso/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4F53", "pid": "0x5349", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"], diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h index 76fc80e242..884f456044 100644 --- a/keyboards/owlab/voice65/hotswap/config.h +++ b/keyboards/owlab/voice65/hotswap/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* NKRO */ -#define FORCE_NKRO - /* RGB stripe */ # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json index ea365441bd..5e977da5e9 100644 --- a/keyboards/owlab/voice65/hotswap/info.json +++ b/keyboards/owlab/voice65/hotswap/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4F53", "pid": "0x564F", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "rgb_matrix": { "driver": "IS31FL3741" diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h index fa2291fb4f..1eec867f2f 100644 --- a/keyboards/owlab/voice65/soldered/config.h +++ b/keyboards/owlab/voice65/soldered/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* NKRO */ -#define FORCE_NKRO - /* RGB stripe */ # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json index 587cdc80fb..9061a28e82 100644 --- a/keyboards/owlab/voice65/soldered/info.json +++ b/keyboards/owlab/voice65/soldered/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4F53", "pid": "0x5657", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "rgb_matrix": { "driver": "IS31FL3741" diff --git a/keyboards/pica40/rev1/rev1.c b/keyboards/pica40/rev1/rev1.c index f8a03dde3b..fff89d48f2 100644 --- a/keyboards/pica40/rev1/rev1.c +++ b/keyboards/pica40/rev1/rev1.c @@ -1,7 +1,7 @@ // Copyright 2022 zzeneg (@zzeneg) // SPDX-License-Identifier: GPL-2.0-or-later -#include "rev1.h" +#include "quantum.h" #ifdef PICA40_RGBLIGHT_TIMEOUT diff --git a/keyboards/pica40/rev1/rev1.h b/keyboards/pica40/rev1/rev1.h deleted file mode 100644 index 964038eefb..0000000000 --- a/keyboards/pica40/rev1/rev1.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 zzeneg (@zzeneg) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/polycarbdiet/s20/config.h b/keyboards/polycarbdiet/s20/config.h index e61b67307f..384256f15a 100644 --- a/keyboards/polycarbdiet/s20/config.h +++ b/keyboards/polycarbdiet/s20/config.h @@ -38,5 +38,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define FORCE_NKRO diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json index 19b1a71864..c3408f83a3 100644 --- a/keyboards/polycarbdiet/s20/info.json +++ b/keyboards/polycarbdiet/s20/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5040", "pid": "0x7320", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["C6", "C7", "D4", "D6"], diff --git a/keyboards/qwertykeys/qk65/hotswap/config.h b/keyboards/qwertykeys/qk65/hotswap/config.h deleted file mode 100644 index 916485e60b..0000000000 --- a/keyboards/qwertykeys/qk65/hotswap/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 qwertykeys - -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 - - diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json index 78bbe74ecd..01799ac0ef 100644 --- a/keyboards/qwertykeys/qk65/hotswap/info.json +++ b/keyboards/qwertykeys/qk65/hotswap/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4F53", "pid": "0x514B", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], diff --git a/keyboards/qwertykeys/qk65/solder/config.h b/keyboards/qwertykeys/qk65/solder/config.h deleted file mode 100644 index 6561379dbe..0000000000 --- a/keyboards/qwertykeys/qk65/solder/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2022 qwertykeys - -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
\ No newline at end of file diff --git a/keyboards/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/info.json index 3481ffd2bb..f0de59102a 100644 --- a/keyboards/qwertykeys/qk65/solder/info.json +++ b/keyboards/qwertykeys/qk65/solder/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4F53", "pid": "0x5153", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], diff --git a/keyboards/rate/pistachio/info.json b/keyboards/rate/pistachio/info.json index 59329a2bd2..0eaea7885d 100644 --- a/keyboards/rate/pistachio/info.json +++ b/keyboards/rate/pistachio/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5255", "pid": "0xD0C2", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "processor": "atmega32u4", "bootloader": "caterina" diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h index b2d36827bb..cf7e2cdfb0 100644 --- a/keyboards/rate/pistachio/rev1/config.h +++ b/keyboards/rate/pistachio/rev1/config.h @@ -37,6 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* nKey Rollover */ -#define FORCE_NKRO diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h index 95898ac2c1..5cf0dc14e1 100644 --- a/keyboards/rate/pistachio/rev2/config.h +++ b/keyboards/rate/pistachio/rev2/config.h @@ -41,6 +41,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* nKey Rollover */ -#define FORCE_NKRO diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h index b788bd2bc1..25aac817da 100644 --- a/keyboards/rate/pistachio_mp/config.h +++ b/keyboards/rate/pistachio_mp/config.h @@ -30,6 +30,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* nKey Rollover */ -#define FORCE_NKRO diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json index 648be80cd5..1dc3d80250 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5255", "pid": "0xE212", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "D2" diff --git a/keyboards/runes/skjoldr/config.h b/keyboards/runes/skjoldr/config.h deleted file mode 100644 index 7d6b574b96..0000000000 --- a/keyboards/runes/skjoldr/config.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2021 Vicktor - -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 diff --git a/keyboards/runes/skjoldr/info.json b/keyboards/runes/skjoldr/info.json index f63b50781c..798f9f4f46 100644 --- a/keyboards/runes/skjoldr/info.json +++ b/keyboards/runes/skjoldr/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x726E", "pid": "0x736B", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["B7", "D0", "D1", "D2", "D3", "B3", "E6", "D5", "F7", "F6", "F5", "F4", "F1", "F0"], diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h index e503d296c0..0d2d834cb0 100644 --- a/keyboards/runes/vaengr/config.h +++ b/keyboards/runes/vaengr/config.h @@ -34,8 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // # define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/runes/vaengr/info.json b/keyboards/runes/vaengr/info.json index 94d325f9d4..517f0946c8 100644 --- a/keyboards/runes/vaengr/info.json +++ b/keyboards/runes/vaengr/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x726E", "pid": "0x7661", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "C7" diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h index 5e38b1f36a..84fd3381ed 100644 --- a/keyboards/ryanskidmore/rskeys100/config.h +++ b/keyboards/ryanskidmore/rskeys100/config.h @@ -45,5 +45,3 @@ /* Set the max power consumption for the keyboard, which is 500 mA. */ #define USB_MAX_POWER_CONSUMPTION 500 - -#define FORCE_NKRO diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/info.json index 3549d99b3f..90b739b7d1 100644 --- a/keyboards/ryanskidmore/rskeys100/info.json +++ b/keyboards/ryanskidmore/rskeys100/info.json @@ -4,7 +4,8 @@ "usb": { "vid": "0x7273", "pid": "0x0064", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "C7" diff --git a/keyboards/sixkeyboard/config.h b/keyboards/sixkeyboard/config.h index 71966a6aa4..ad495eb23c 100644 --- a/keyboards/sixkeyboard/config.h +++ b/keyboards/sixkeyboard/config.h @@ -27,9 +27,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 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/info.json index 2aefe3e8b9..247b255a36 100644 --- a/keyboards/sixkeyboard/info.json +++ b/keyboards/sixkeyboard/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x746B", "pid": "0x736B", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "processor": "atmega16u2", "bootloader": "atmel-dfu", diff --git a/keyboards/skmt/15k/config.h b/keyboards/skmt/15k/config.h index 63b3758737..9d7338ccce 100644 --- a/keyboards/skmt/15k/config.h +++ b/keyboards/skmt/15k/config.h @@ -19,8 +19,6 @@ //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define FORCE_NKRO - #define RGBLED_NUM 15 // Number of LEDs #define RGB_MATRIX_LED_COUNT 15 // Number of LEDs #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/skmt/15k/info.json b/keyboards/skmt/15k/info.json index 5b7fdfc481..9b9d69e417 100644 --- a/keyboards/skmt/15k/info.json +++ b/keyboards/skmt/15k/info.json @@ -22,7 +22,8 @@ "usb": { "device_version": "1.1.0", "pid": "0x3488", - "vid": "0xFEFE" + "vid": "0xFEFE", + "force_nkro": true }, "layouts": { "LAYOUT_default": { diff --git a/keyboards/soda/pocket/config.h b/keyboards/soda/pocket/config.h index 053083f230..2387f9a000 100644 --- a/keyboards/soda/pocket/config.h +++ b/keyboards/soda/pocket/config.h @@ -21,10 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -// enable NKRO_ENABLE -#define FORCE_NKRO -// The number of LEDs connected +// The number of LEDs connected #define RGB_MATRIX_LED_COUNT 34 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json index 1c64881183..cef1aec57b 100644 --- a/keyboards/soda/pocket/info.json +++ b/keyboards/soda/pocket/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x1A53", "pid": "0x4F51", - "device_version": "1.0.2" + "device_version": "1.0.2", + "force_nkro": true }, "ws2812": { "pin": "C15" diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/config.h b/keyboards/stenokeyboards/the_uni/pro_micro/config.h index bf5b37166a..a527c07796 100644 --- a/keyboards/stenokeyboards/the_uni/pro_micro/config.h +++ b/keyboards/stenokeyboards/the_uni/pro_micro/config.h @@ -22,7 +22,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - - -/*force the nkro if it does not work*/ -#define FORCE_NKRO diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/info.json b/keyboards/stenokeyboards/the_uni/pro_micro/info.json index e53a30cda8..3510e076ff 100644 --- a/keyboards/stenokeyboards/the_uni/pro_micro/info.json +++ b/keyboards/stenokeyboards/the_uni/pro_micro/info.json @@ -1,6 +1,7 @@ { "usb": { - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"], diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/config.h b/keyboards/stenokeyboards/the_uni/rp_2040/config.h index a2c060d424..bf60719a67 100644 --- a/keyboards/stenokeyboards/the_uni/rp_2040/config.h +++ b/keyboards/stenokeyboards/the_uni/rp_2040/config.h @@ -21,5 +21,3 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET //#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U - -#define FORCE_NKRO diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/info.json b/keyboards/stenokeyboards/the_uni/rp_2040/info.json index e4c86b9312..0fc56dff8d 100644 --- a/keyboards/stenokeyboards/the_uni/rp_2040/info.json +++ b/keyboards/stenokeyboards/the_uni/rp_2040/info.json @@ -1,6 +1,7 @@ { "usb": { - "device_version": "0.0.4" + "device_version": "0.0.4", + "force_nkro": true }, "matrix_pins": { "cols": ["GP24", "GP23", "GP21", "GP20", "GP19", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], diff --git a/keyboards/stenokeyboards/the_uni/usb_c/config.h b/keyboards/stenokeyboards/the_uni/usb_c/config.h index bf5b37166a..a527c07796 100644 --- a/keyboards/stenokeyboards/the_uni/usb_c/config.h +++ b/keyboards/stenokeyboards/the_uni/usb_c/config.h @@ -22,7 +22,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - - -/*force the nkro if it does not work*/ -#define FORCE_NKRO diff --git a/keyboards/stenokeyboards/the_uni/usb_c/info.json b/keyboards/stenokeyboards/the_uni/usb_c/info.json index 5f6d224170..fe7706357d 100644 --- a/keyboards/stenokeyboards/the_uni/usb_c/info.json +++ b/keyboards/stenokeyboards/the_uni/usb_c/info.json @@ -1,6 +1,7 @@ { "usb": { - "device_version": "0.0.3" + "device_version": "0.0.3", + "force_nkro": true }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "D5", "D3", "D2", "D1", "D0", "D4"], diff --git a/keyboards/subrezon/la_nc/la_nc.c b/keyboards/subrezon/la_nc/la_nc.c index 44f1f5afc1..d975645282 100644 --- a/keyboards/subrezon/la_nc/la_nc.c +++ b/keyboards/subrezon/la_nc/la_nc.c @@ -1,7 +1,7 @@ // Copyright 2022 Daniel Osipishin (@subrezon) // SPDX-License-Identifier: GPL-2.0-or-later -#include "la_nc.h" +#include "quantum.h" #ifdef OLED_ENABLE diff --git a/keyboards/subrezon/la_nc/la_nc.h b/keyboards/subrezon/la_nc/la_nc.h deleted file mode 100644 index 039fc487da..0000000000 --- a/keyboards/subrezon/la_nc/la_nc.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Daniel Osipishin (@subrezon) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h"
\ No newline at end of file diff --git a/keyboards/synthlabs/060/config.h b/keyboards/synthlabs/060/config.h index 16c2aae950..1870286c81 100644 --- a/keyboards/synthlabs/060/config.h +++ b/keyboards/synthlabs/060/config.h @@ -58,5 +58,3 @@ #undef ENABLE_RGB_MATRIX_DUAL_BEACON #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS - -#define FORCE_NKRO diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json index 75d503b883..91cb5a9c43 100644 --- a/keyboards/synthlabs/060/info.json +++ b/keyboards/synthlabs/060/info.json @@ -26,7 +26,8 @@ "usb": { "vid": "0x534E", "pid": "0x3630", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "rgb_matrix": { "driver": "WS2812", diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h index 3411aa9f68..71170a12ce 100644 --- a/keyboards/synthlabs/solo/config.h +++ b/keyboards/synthlabs/solo/config.h @@ -6,8 +6,6 @@ #define ENCODERS_CW_KEY { { 2, 1 } } #define ENCODERS_CCW_KEY { { 0, 1 } } -#define FORCE_NKRO - #define JOYSTICK_BUTTON_COUNT 13 #define JOYSTICK_AXIS_COUNT 1 #define JOYSTICK_AXIS_RESOLUTION 16 diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json index 14d39d63cc..e90884fc0f 100644 --- a/keyboards/synthlabs/solo/info.json +++ b/keyboards/synthlabs/solo/info.json @@ -15,7 +15,8 @@ "usb": { "vid": "0x534E", "pid": "0x3031", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "encoder": { "rotary": [ diff --git a/keyboards/teleport/native/config.h b/keyboards/teleport/native/config.h index 70b09da4f1..1453bfdc94 100644 --- a/keyboards/teleport/native/config.h +++ b/keyboards/teleport/native/config.h @@ -14,10 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Enable NKRO by default*/ -#define FORCE_NKRO - /* Use 3 dynamic keymap layers */ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json index 1e1d591512..d306a3d6c6 100644 --- a/keyboards/teleport/native/info.json +++ b/keyboards/teleport/native/info.json @@ -8,7 +8,8 @@ "board": "GENERIC_STM32_F411XE", "usb": { "vid": "0x7470", - "device_version": "1.0.0" + "device_version": "1.0.0", + "force_nkro": true }, "rgb_matrix": { "driver": "IS31FL3733" diff --git a/keyboards/vertex/angle65/config.h b/keyboards/vertex/angle65/config.h index 79ef90ed7a..cd00839ace 100644 --- a/keyboards/vertex/angle65/config.h +++ b/keyboards/vertex/angle65/config.h @@ -32,5 +32,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLED_NUM 9 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 5 - -#define FORCE_NKRO diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/info.json index a781a8aa37..bf0ac61c34 100644 --- a/keyboards/vertex/angle65/info.json +++ b/keyboards/vertex/angle65/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x9954", "pid": "0x9970", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "processor": "STM32F103", "bootloader": "stm32duino", diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h index ff75c3a227..791368b5b2 100644 --- a/keyboards/vertex/arc60/config.h +++ b/keyboards/vertex/arc60/config.h @@ -37,8 +37,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/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json index 7bfd1b5d3b..8aa5a709d5 100644 --- a/keyboards/vertex/arc60/info.json +++ b/keyboards/vertex/arc60/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x8354", "pid": "0x8370", - "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", "A5"], diff --git a/keyboards/vertex/arc60h/config.h b/keyboards/vertex/arc60h/config.h index 9f9ed0cdb3..e4cb045353 100644 --- a/keyboards/vertex/arc60h/config.h +++ b/keyboards/vertex/arc60h/config.h @@ -39,8 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * Feature disable options * These options are also useful to firmware size reduction. */ -#define FORCE_NKRO - /* disable debug print */ //#define NO_DEBUG diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/info.json index bdee577569..831190a516 100644 --- a/keyboards/vertex/arc60h/info.json +++ b/keyboards/vertex/arc60h/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x7374", "pid": "0x9770", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "ws2812": { "pin": "B15", diff --git a/keyboards/viktus/at101_bh/config.h b/keyboards/viktus/at101_bh/config.h index ada0ff6e76..5f36081323 100644 --- a/keyboards/viktus/at101_bh/config.h +++ b/keyboards/viktus/at101_bh/config.h @@ -5,6 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* force n-key rollover*/ -#define FORCE_NKRO diff --git a/keyboards/viktus/at101_bh/info.json b/keyboards/viktus/at101_bh/info.json index 6ecd53c36d..23148f16cf 100644 --- a/keyboards/viktus/at101_bh/info.json +++ b/keyboards/viktus/at101_bh/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": ["D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "D2", "D3"], diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h index ada0ff6e76..5f36081323 100644 --- a/keyboards/viktus/omnikey_bh/config.h +++ b/keyboards/viktus/omnikey_bh/config.h @@ -5,6 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* force n-key rollover*/ -#define FORCE_NKRO diff --git a/keyboards/viktus/omnikey_bh/info.json b/keyboards/viktus/omnikey_bh/info.json index d6779e758d..a641192f32 100644 --- a/keyboards/viktus/omnikey_bh/info.json +++ b/keyboards/viktus/omnikey_bh/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": ["C2", "C3", "C4", "C7", "C1", "C0", "E1", "E0", "D7", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1", "B2", "B3"], diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h index ada0ff6e76..5f36081323 100644 --- a/keyboards/viktus/z150_bh/config.h +++ b/keyboards/viktus/z150_bh/config.h @@ -5,6 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* force n-key rollover*/ -#define FORCE_NKRO diff --git a/keyboards/viktus/z150_bh/info.json b/keyboards/viktus/z150_bh/info.json index d55094022a..fb4970e259 100644 --- a/keyboards/viktus/z150_bh/info.json +++ b/keyboards/viktus/z150_bh/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": ["D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "C7", "C6", "C5", "C4", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"], diff --git a/keyboards/wuque/tata80/wk/config.h b/keyboards/wuque/tata80/wk/config.h index bbde3a6157..e8a4274181 100644 --- a/keyboards/wuque/tata80/wk/config.h +++ b/keyboards/wuque/tata80/wk/config.h @@ -19,5 +19,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define FORCE_NKRO diff --git a/keyboards/wuque/tata80/wk/info.json b/keyboards/wuque/tata80/wk/info.json index 68c4973c0d..ce532c9269 100644 --- a/keyboards/wuque/tata80/wk/info.json +++ b/keyboards/wuque/tata80/wk/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x2365", "pid": "0x0168", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], diff --git a/keyboards/wuque/tata80/wkl/config.h b/keyboards/wuque/tata80/wkl/config.h index bbde3a6157..e8a4274181 100644 --- a/keyboards/wuque/tata80/wkl/config.h +++ b/keyboards/wuque/tata80/wkl/config.h @@ -19,5 +19,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define FORCE_NKRO diff --git a/keyboards/wuque/tata80/wkl/info.json b/keyboards/wuque/tata80/wkl/info.json index 498ce63cb1..ba0774a5b7 100644 --- a/keyboards/wuque/tata80/wkl/info.json +++ b/keyboards/wuque/tata80/wkl/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x2365", "pid": "0x0169", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], diff --git a/keyboards/xelus/dharma/config.h b/keyboards/xelus/dharma/config.h index b612e1587e..5df8b9c56b 100644 --- a/keyboards/xelus/dharma/config.h +++ b/keyboards/xelus/dharma/config.h @@ -21,5 +21,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define FORCE_NKRO diff --git a/keyboards/xelus/dharma/info.json b/keyboards/xelus/dharma/info.json index 66a037fa9c..f69b621f65 100644 --- a/keyboards/xelus/dharma/info.json +++ b/keyboards/xelus/dharma/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5845", "pid": "0xDAAA", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["B3", "B2", "B1", "D5", "D4", "E6", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h index af6157aa93..1007f5b3de 100644 --- a/keyboards/xelus/pachi/rgb/rev1/config.h +++ b/keyboards/xelus/pachi/rgb/rev1/config.h @@ -97,5 +97,3 @@ #define ENABLE_RGB_MATRIX_MULTISPLASH #define ENABLE_RGB_MATRIX_SOLID_SPLASH #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - -#define FORCE_NKRO diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/info.json index 184dc1a67b..90ab8c19ef 100644 --- a/keyboards/xelus/pachi/rgb/rev1/info.json +++ b/keyboards/xelus/pachi/rgb/rev1/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5845", "pid": "0x5052", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "rgb_matrix": { "driver": "custom" diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h index 5faab0f2d7..9ff25facc8 100644 --- a/keyboards/xelus/rs108/config.h +++ b/keyboards/xelus/rs108/config.h @@ -44,6 +44,3 @@ // HSE CLK #define STM32_HSECLK 16000000 - -//Force NKRO -#define FORCE_NKRO diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json index a9436d4d14..62377018b6 100644 --- a/keyboards/xelus/rs108/info.json +++ b/keyboards/xelus/rs108/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5845", "pid": "0x5208", - "device_version": "0.0.2" + "device_version": "0.0.2", + "force_nkro": true }, "matrix_pins": { "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B1", "B10", "B4", "B3", "A15"], diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h index 20970a866a..3c53ebc8bc 100644 --- a/keyboards/xelus/rs60/rev1/config.h +++ b/keyboards/xelus/rs60/rev1/config.h @@ -20,6 +20,3 @@ // Locking resynchronize hack #define LOCKING_RESYNC_ENABLE - -//Force NKRO -#define FORCE_NKRO diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json index bfc36db1c4..9b8f0410fa 100644 --- a/keyboards/xelus/rs60/rev1/info.json +++ b/keyboards/xelus/rs60/rev1/info.json @@ -1,6 +1,7 @@ { "usb": { - "device_version": "0.1.0" + "device_version": "0.1.0", + "force_nkro": true }, "matrix_pins": { "cols": ["E6", "D5", "D3", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], diff --git a/keyboards/xelus/rs60/rev2_0/config.h b/keyboards/xelus/rs60/rev2_0/config.h index 5faab0f2d7..9ff25facc8 100644 --- a/keyboards/xelus/rs60/rev2_0/config.h +++ b/keyboards/xelus/rs60/rev2_0/config.h @@ -44,6 +44,3 @@ // HSE CLK #define STM32_HSECLK 16000000 - -//Force NKRO -#define FORCE_NKRO diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json index 0e9e0d8e9b..ac976a4cb4 100644 --- a/keyboards/xelus/rs60/rev2_0/info.json +++ b/keyboards/xelus/rs60/rev2_0/info.json @@ -1,6 +1,7 @@ { "usb": { - "device_version": "0.2.0" + "device_version": "0.2.0", + "force_nkro": true }, "matrix_pins": { "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], diff --git a/keyboards/xelus/rs60/rev2_1/config.h b/keyboards/xelus/rs60/rev2_1/config.h index a5910ae45c..1c5fe4a336 100644 --- a/keyboards/xelus/rs60/rev2_1/config.h +++ b/keyboards/xelus/rs60/rev2_1/config.h @@ -24,6 +24,3 @@ // Emulated EEPROM #define WEAR_LEVELING_LOGICAL_SIZE 2048 #define WEAR_LEVELING_BACKING_SIZE WEAR_LEVELING_LOGICAL_SIZE*2 - -//Force NKRO -#define FORCE_NKRO diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/info.json index 6104631583..b8cda1a22a 100644 --- a/keyboards/xelus/rs60/rev2_1/info.json +++ b/keyboards/xelus/rs60/rev2_1/info.json @@ -1,6 +1,7 @@ { "usb": { - "device_version": "0.2.1" + "device_version": "0.2.1", + "force_nkro": true }, "matrix_pins": { "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h deleted file mode 100644 index 66ec91c510..0000000000 --- a/keyboards/yandrstudio/zhou65/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 JasonRen(biu) - * - * 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 - -/* enable the nkro when using the VIA. */ -#define FORCE_NKRO diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json index cc020b9310..aa34d3864f 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/info.json @@ -2,7 +2,8 @@ "keyboard_name": "zhou65", "usb": { "pid": "0xAAAD", - "device_version": "1.0.0" + "device_version": "1.0.0", + "force_nkro": true }, "matrix_pins": { "cols": ["B9", "B6", "B5", "B4", "B3", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14"], |