From 12d42cedd2624db0d5cfe6f538211f9dfcd19822 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 May 2023 13:33:10 +1000 Subject: [PATCH] Move `FORCE_NKRO` to data driven (#20604) --- keyboards/amjkeyboard/amj84/config.h | 2 -- keyboards/amjkeyboard/amj84/info.json | 3 +- keyboards/atlantis/ak81_ve/config.h | 1 - keyboards/atlantis/ak81_ve/info.json | 3 +- keyboards/bear_face/config.h | 2 -- keyboards/bear_face/info.json | 3 +- keyboards/bt66tech/bt66tech60/config.h | 2 -- keyboards/bt66tech/bt66tech60/info.json | 3 +- keyboards/bubble75/hotswap/config.h | 2 -- keyboards/bubble75/hotswap/info.json | 3 +- keyboards/cannonkeys/ortho60v2/ortho60v2.c | 17 --------- keyboards/cannonkeys/ortho60v2/ortho60v2.h | 19 ---------- keyboards/cest73/tkm/config.h | 19 ---------- keyboards/cest73/tkm/info.json | 3 +- keyboards/chaos65/config.h | 20 ----------- keyboards/chaos65/info.json | 3 +- keyboards/clueboard/17/17.c | 2 +- keyboards/clueboard/17/17.h | 3 -- keyboards/clueboard/2x1800/2021/2021.c | 2 +- keyboards/clueboard/2x1800/2021/2021.h | 18 ---------- keyboards/clueboard/66/rev2/rev2.c | 2 +- keyboards/clueboard/66/rev2/rev2.h | 4 --- keyboards/clueboard/66/rev3/rev3.c | 2 +- keyboards/clueboard/66/rev3/rev3.h | 4 --- keyboards/clueboard/66/rev4/rev4.c | 2 +- keyboards/clueboard/66/rev4/rev4.h | 3 -- keyboards/clueboard/card/card.c | 2 +- keyboards/clueboard/card/card.h | 3 -- keyboards/doio/kb16/rev1/config.h | 3 -- keyboards/doio/kb16/rev1/info.json | 3 +- keyboards/doio/kb16/rev2/config.h | 3 -- keyboards/doio/kb16/rev2/info.json | 3 +- keyboards/dotmod/dymium65/config.h | 2 -- keyboards/dotmod/dymium65/info.json | 3 +- keyboards/ducky/one2mini/1861st/config.h | 2 -- keyboards/ducky/one2mini/1861st/info.json | 3 +- keyboards/ducky/one2sf/1967st/config.h | 2 -- keyboards/ducky/one2sf/1967st/info.json | 3 +- keyboards/eason/aeroboard/config.h | 3 -- keyboards/eason/aeroboard/info.json | 3 +- keyboards/frooastboard/walnut/walnut.c | 2 +- keyboards/frooastboard/walnut/walnut.h | 6 ---- keyboards/gboards/butterstick/config.h | 2 -- keyboards/gboards/butterstick/info.json | 3 +- keyboards/gboards/georgi/config.h | 1 - keyboards/gboards/georgi/info.json | 3 +- keyboards/gopolar/gg86/config.h | 3 -- keyboards/gopolar/gg86/info.json | 3 +- keyboards/handwired/10k/10k.h | 20 ----------- keyboards/handwired/3dortho14u/rev1/rev1.h | 6 ---- keyboards/handwired/3dortho14u/rev2/rev2.h | 6 ---- keyboards/handwired/arrow_pad/config.h | 36 ------------------- keyboards/handwired/arrow_pad/info.json | 3 +- keyboards/handwired/baredev/rev1/rev1.h | 19 ---------- keyboards/handwired/datahand/config.h | 2 -- keyboards/handwired/datahand/info.json | 3 +- keyboards/handwired/mutepad/config.h | 2 -- keyboards/handwired/mutepad/info.json | 3 +- keyboards/handwired/retro_refit/config.h | 3 -- keyboards/handwired/retro_refit/info.json | 3 +- keyboards/handwired/twig/twig50/config.h | 2 -- keyboards/handwired/twig/twig50/info.json | 3 +- keyboards/handwired/wulkan/config.h | 3 -- keyboards/handwired/wulkan/info.json | 3 +- keyboards/handwired/xealous/config.h | 1 - keyboards/handwired/xealous/rev1/info.json | 3 +- keyboards/hfdkb/ac001/config.h | 2 -- keyboards/hfdkb/ac001/info.json | 3 +- keyboards/hfdkb/keyboard_sw/k83/config.h | 2 -- keyboards/hfdkb/keyboard_sw/k83/info.json | 3 +- .../chinese_pcb/black_e65/config.h | 3 -- .../chinese_pcb/black_e65/info.json | 3 +- .../chinese_pcb/devil68_pro/config.h | 3 -- .../chinese_pcb/devil68_pro/info.json | 3 +- keyboards/horrortroll/handwired_k552/config.h | 3 -- .../horrortroll/handwired_k552/info.json | 3 +- keyboards/horrortroll/lemon40/config.h | 3 -- keyboards/horrortroll/lemon40/info.json | 3 +- keyboards/horrortroll/paws60/config.h | 20 ----------- keyboards/horrortroll/paws60/info.json | 3 +- keyboards/idobao/id42/config.h | 7 ---- keyboards/idobao/id42/id42.c | 2 +- keyboards/idobao/id42/id42.h | 6 ---- keyboards/idobao/id42/info.json | 3 +- keyboards/idobao/id61/id61.c | 2 +- keyboards/idobao/id61/id61.h | 6 ---- keyboards/idobao/id63/id63.c | 2 +- keyboards/idobao/id63/id63.h | 6 ---- keyboards/idobao/id67/id67.c | 2 +- keyboards/idobao/id67/id67.h | 8 ----- keyboards/idobao/id80/v3/ansi/ansi.c | 2 +- keyboards/idobao/id80/v3/ansi/ansi.h | 6 ---- keyboards/idobao/id87/v2/v2.c | 2 +- keyboards/idobao/id87/v2/v2.h | 6 ---- keyboards/idobao/montex/v2/v2.c | 2 +- keyboards/idobao/montex/v2/v2.h | 6 ---- keyboards/kabedon/kabedon98e/config.h | 2 -- keyboards/kabedon/kabedon98e/info.json | 3 +- keyboards/kbdfans/kbd75hs/config.h | 2 -- keyboards/kbdfans/kbd75hs/info.json | 3 +- keyboards/keychron/q1/ansi/info.json | 3 +- keyboards/keychron/q1/ansi_encoder/info.json | 3 +- keyboards/keychron/q1/config.h | 3 -- keyboards/keychron/q1/iso/info.json | 3 +- keyboards/keychron/q1/iso_encoder/info.json | 3 +- keyboards/kingly_keys/little_foot/config.h | 2 -- keyboards/kingly_keys/little_foot/info.json | 3 +- keyboards/kingly_keys/smd_milk/config.h | 2 -- keyboards/kingly_keys/smd_milk/info.json | 3 +- .../kprepublic/bm65hsrgb_iso/rev1/config.h | 4 --- .../kprepublic/bm65hsrgb_iso/rev1/info.json | 3 +- keyboards/linworks/dolice/config.h | 19 ---------- keyboards/linworks/dolice/info.json | 3 +- keyboards/linworks/fave87/config.h | 4 --- keyboards/linworks/fave87/info.json | 3 +- keyboards/linworks/whale75/config.h | 4 --- keyboards/linworks/whale75/info.json | 3 +- keyboards/mechllama/g35/config.h | 20 ----------- keyboards/mechllama/g35/info.json | 3 +- keyboards/mechwild/bbs/config.h | 2 -- keyboards/mechwild/bbs/info.json | 3 +- keyboards/mechwild/sugarglider/config.h | 3 -- keyboards/mechwild/sugarglider/info.json | 3 +- keyboards/millipad/config.h | 2 -- keyboards/millipad/info.json | 3 +- keyboards/misonoworks/chocolatebar/config.h | 2 -- keyboards/misonoworks/chocolatebar/info.json | 3 +- keyboards/misonoworks/karina/config.h | 1 - keyboards/misonoworks/karina/info.json | 3 +- keyboards/ml/gas75/config.h | 3 -- keyboards/ml/gas75/info.json | 3 +- keyboards/mmkzoo65/config.h | 2 -- keyboards/mmkzoo65/info.json | 3 +- keyboards/mss_studio/m63_rgb/config.h | 3 -- keyboards/mss_studio/m63_rgb/info.json | 3 +- keyboards/mss_studio/m64_rgb/config.h | 3 -- keyboards/mss_studio/m64_rgb/info.json | 3 +- keyboards/mwstudio/alicekk/config.h | 2 -- keyboards/mwstudio/alicekk/info.json | 3 +- keyboards/mwstudio/mw660/config.h | 2 -- keyboards/mwstudio/mw660/info.json | 3 +- keyboards/omnikeyish/config.h | 3 -- keyboards/omnikeyish/info.json | 3 +- keyboards/opendeck/32/info.json | 3 +- keyboards/opendeck/32/rev1/config.h | 2 -- keyboards/owlab/jelly_epoch/hotswap/config.h | 3 -- keyboards/owlab/jelly_epoch/hotswap/info.json | 3 +- keyboards/owlab/jelly_epoch/soldered/config.h | 3 -- .../owlab/jelly_epoch/soldered/info.json | 3 +- keyboards/owlab/spring/config.h | 3 -- keyboards/owlab/spring/info.json | 3 +- keyboards/owlab/suit80/ansi/config.h | 21 ----------- keyboards/owlab/suit80/ansi/info.json | 3 +- keyboards/owlab/suit80/iso/config.h | 21 ----------- keyboards/owlab/suit80/iso/info.json | 3 +- keyboards/owlab/voice65/hotswap/config.h | 3 -- keyboards/owlab/voice65/hotswap/info.json | 3 +- keyboards/owlab/voice65/soldered/config.h | 3 -- keyboards/owlab/voice65/soldered/info.json | 3 +- keyboards/pica40/rev1/rev1.c | 2 +- keyboards/pica40/rev1/rev1.h | 6 ---- keyboards/polycarbdiet/s20/config.h | 2 -- keyboards/polycarbdiet/s20/info.json | 3 +- keyboards/qwertykeys/qk65/hotswap/config.h | 23 ------------ keyboards/qwertykeys/qk65/hotswap/info.json | 3 +- keyboards/qwertykeys/qk65/solder/config.h | 21 ----------- keyboards/qwertykeys/qk65/solder/info.json | 3 +- keyboards/rate/pistachio/info.json | 3 +- keyboards/rate/pistachio/rev1/config.h | 3 -- keyboards/rate/pistachio/rev2/config.h | 3 -- keyboards/rate/pistachio_mp/config.h | 3 -- keyboards/rate/pistachio_mp/info.json | 3 +- keyboards/runes/skjoldr/config.h | 36 ------------------- keyboards/runes/skjoldr/info.json | 3 +- keyboards/runes/vaengr/config.h | 2 -- keyboards/runes/vaengr/info.json | 3 +- keyboards/ryanskidmore/rskeys100/config.h | 2 -- keyboards/ryanskidmore/rskeys100/info.json | 3 +- keyboards/sixkeyboard/config.h | 3 -- keyboards/sixkeyboard/info.json | 3 +- keyboards/skmt/15k/config.h | 2 -- keyboards/skmt/15k/info.json | 3 +- keyboards/soda/pocket/config.h | 4 +-- keyboards/soda/pocket/info.json | 3 +- .../stenokeyboards/the_uni/pro_micro/config.h | 4 --- .../the_uni/pro_micro/info.json | 3 +- .../stenokeyboards/the_uni/rp_2040/config.h | 2 -- .../stenokeyboards/the_uni/rp_2040/info.json | 3 +- .../stenokeyboards/the_uni/usb_c/config.h | 4 --- .../stenokeyboards/the_uni/usb_c/info.json | 3 +- keyboards/subrezon/la_nc/la_nc.c | 2 +- keyboards/subrezon/la_nc/la_nc.h | 6 ---- keyboards/synthlabs/060/config.h | 2 -- keyboards/synthlabs/060/info.json | 3 +- keyboards/synthlabs/solo/config.h | 2 -- keyboards/synthlabs/solo/info.json | 3 +- keyboards/teleport/native/config.h | 4 --- keyboards/teleport/native/info.json | 3 +- keyboards/vertex/angle65/config.h | 2 -- keyboards/vertex/angle65/info.json | 3 +- keyboards/vertex/arc60/config.h | 2 -- keyboards/vertex/arc60/info.json | 3 +- keyboards/vertex/arc60h/config.h | 2 -- keyboards/vertex/arc60h/info.json | 3 +- keyboards/viktus/at101_bh/config.h | 3 -- keyboards/viktus/at101_bh/info.json | 3 +- keyboards/viktus/omnikey_bh/config.h | 3 -- keyboards/viktus/omnikey_bh/info.json | 3 +- keyboards/viktus/z150_bh/config.h | 3 -- keyboards/viktus/z150_bh/info.json | 3 +- keyboards/wuque/tata80/wk/config.h | 2 -- keyboards/wuque/tata80/wk/info.json | 3 +- keyboards/wuque/tata80/wkl/config.h | 2 -- keyboards/wuque/tata80/wkl/info.json | 3 +- keyboards/xelus/dharma/config.h | 2 -- keyboards/xelus/dharma/info.json | 3 +- keyboards/xelus/pachi/rgb/rev1/config.h | 2 -- keyboards/xelus/pachi/rgb/rev1/info.json | 3 +- keyboards/xelus/rs108/config.h | 3 -- keyboards/xelus/rs108/info.json | 3 +- keyboards/xelus/rs60/rev1/config.h | 3 -- keyboards/xelus/rs60/rev1/info.json | 3 +- keyboards/xelus/rs60/rev2_0/config.h | 3 -- keyboards/xelus/rs60/rev2_0/info.json | 3 +- keyboards/xelus/rs60/rev2_1/config.h | 3 -- keyboards/xelus/rs60/rev2_1/info.json | 3 +- keyboards/yandrstudio/zhou65/config.h | 19 ---------- keyboards/yandrstudio/zhou65/info.json | 3 +- 228 files changed, 209 insertions(+), 781 deletions(-) delete mode 100644 keyboards/cannonkeys/ortho60v2/ortho60v2.c delete mode 100644 keyboards/cannonkeys/ortho60v2/ortho60v2.h delete mode 100644 keyboards/cest73/tkm/config.h delete mode 100644 keyboards/chaos65/config.h delete mode 100644 keyboards/clueboard/17/17.h delete mode 100644 keyboards/clueboard/2x1800/2021/2021.h delete mode 100644 keyboards/clueboard/66/rev2/rev2.h delete mode 100644 keyboards/clueboard/66/rev3/rev3.h delete mode 100644 keyboards/clueboard/66/rev4/rev4.h delete mode 100644 keyboards/clueboard/card/card.h delete mode 100644 keyboards/frooastboard/walnut/walnut.h delete mode 100644 keyboards/handwired/10k/10k.h delete mode 100644 keyboards/handwired/3dortho14u/rev1/rev1.h delete mode 100644 keyboards/handwired/3dortho14u/rev2/rev2.h delete mode 100644 keyboards/handwired/arrow_pad/config.h delete mode 100644 keyboards/handwired/baredev/rev1/rev1.h delete mode 100644 keyboards/handwired/wulkan/config.h delete mode 100644 keyboards/horrortroll/paws60/config.h delete mode 100755 keyboards/idobao/id42/id42.h delete mode 100644 keyboards/idobao/id61/id61.h delete mode 100644 keyboards/idobao/id63/id63.h delete mode 100644 keyboards/idobao/id67/id67.h delete mode 100644 keyboards/idobao/id80/v3/ansi/ansi.h delete mode 100644 keyboards/idobao/id87/v2/v2.h delete mode 100755 keyboards/idobao/montex/v2/v2.h delete mode 100644 keyboards/linworks/dolice/config.h delete mode 100644 keyboards/mechllama/g35/config.h delete mode 100644 keyboards/owlab/suit80/ansi/config.h delete mode 100644 keyboards/owlab/suit80/iso/config.h delete mode 100644 keyboards/pica40/rev1/rev1.h delete mode 100644 keyboards/qwertykeys/qk65/hotswap/config.h delete mode 100644 keyboards/qwertykeys/qk65/solder/config.h delete mode 100644 keyboards/runes/skjoldr/config.h delete mode 100644 keyboards/subrezon/la_nc/la_nc.h delete mode 100644 keyboards/yandrstudio/zhou65/config.h diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h index da28e924006cc0ce22c62eaf34e69e70ad048364..86415b251a053b00f7b59c7b59f3b2fee93b400b 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 26a3fad1bc8352cee5d7f91c8e126674b4b69edc..98c4a7e447985c455c718e282a51c4fa79d91414 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 994c0fd82f9fda7ca0d90a4c3abcc890aafc478b..f300362917244344164d9df9286d7599ce9a4663 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 b5ef4538d8eea967ec626db85bb99d6e61cdea23..0dc2db9072c44ab6d186f493ff037c0057c5c382 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 2f3742c5d0cf54f740707f017958a4c71ceba156..81ada21b71e9a6299f979b8b17355be763ef4c92 100644 --- a/keyboards/bear_face/config.h +++ b/keyboards/bear_face/config.h @@ -22,8 +22,6 @@ along with this program. If not, see . /* 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 357847f418709725fad00dd345bf694887030a25..0c3e6148033c5bc049d118e0f8ecd5f46a2b29d4 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 6f951724f10bc8a4e7efb70239a02a2f43b152dc..687baec5094512315bb29333009213a2c39ddb59 100644 --- a/keyboards/bt66tech/bt66tech60/config.h +++ b/keyboards/bt66tech/bt66tech60/config.h @@ -43,8 +43,6 @@ along with this program. If not, see . * 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 75ab70164a124ab4976f6fbd68912df650f47361..e4a2d5b1d6c336e63ed63c766dd69acd70827454 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 a637e9e335ba2458e571223047a1a49dbf71b9a6..df83257ebd9ee3e331b79f435f4b4af07519e838 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 f57e41df460cd3d35e71285184a3e3b1d2b38fa2..dcf98006a1ee7109ee65c3c49e04e5bc833ad65a 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 3e0248abda29d6fea48ca807f62ca281fead2e45..0000000000000000000000000000000000000000 --- 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 . -*/ -#include "ortho60v2.h" diff --git a/keyboards/cannonkeys/ortho60v2/ortho60v2.h b/keyboards/cannonkeys/ortho60v2/ortho60v2.h deleted file mode 100644 index a9ca3d7e47acc8c2bcfca223df2e1590980c46cc..0000000000000000000000000000000000000000 --- 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 . -*/ -#pragma once - -#include "quantum.h" diff --git a/keyboards/cest73/tkm/config.h b/keyboards/cest73/tkm/config.h deleted file mode 100644 index 9b6132cbdbab579da463740dc7a481a2b4ed7be2..0000000000000000000000000000000000000000 --- 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 . - */ -#pragma once - -/* force n-key rollover*/ -#define FORCE_NKRO diff --git a/keyboards/cest73/tkm/info.json b/keyboards/cest73/tkm/info.json index 234d31d75a96f538a573e2bcae4d1a5d16b2d9f3..b8560879f9ae23d39c35e6e4645bea84dbc1a3a2 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 caf3e9d4e4e84a6ba192d44c2cc5ebf6189cc68c..0000000000000000000000000000000000000000 --- a/keyboards/chaos65/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2022 kb-elmo - * - * 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 . - */ - -#pragma once - -/* NKRO */ -#define FORCE_NKRO diff --git a/keyboards/chaos65/info.json b/keyboards/chaos65/info.json index 7b7e6d91f80bf10453b894422e02ca7c84b4a9c3..bd88ac3f5f3cf5995056ea2bc08209c417d19f43 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 44b55a323b74f69418f34d2e96143592fbaef40a..5cf2238d786df8d92be4dcd40d472b5889c28cc6 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 ef5b3f3e04d7df16781264ddb7bff5c510db8cca..0000000000000000000000000000000000000000 --- 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 40f2a2ed671ea129f3c56d134239ad34ad0e4b88..2a3f1304c7ee1f50e7a83955d8fc62b9843d510b 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 . */ -#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 ecb9e00c4e6530036a2d59e23676eb700bf2ec81..0000000000000000000000000000000000000000 --- a/keyboards/clueboard/2x1800/2021/2021.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2017 Zach White - * - * 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 . - */ -#pragma once - -#include "quantum.h" diff --git a/keyboards/clueboard/66/rev2/rev2.c b/keyboards/clueboard/66/rev2/rev2.c index a533c550aa11949849d86b70d0ae70ec33596c1e..7e3ed5c9dde7bef7e0a149944f3d13bc07f876bb 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 00bdf1e032ffb47b047b22319127e1e58714f224..0000000000000000000000000000000000000000 --- 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 7ec8dcb6818c7a4fa8a0dd604bcf23e5edbd69db..7e3ed5c9dde7bef7e0a149944f3d13bc07f876bb 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 00bdf1e032ffb47b047b22319127e1e58714f224..0000000000000000000000000000000000000000 --- 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 510181827097b01780350005fee83833c6c1cdca..75befc52305750cde3957956c045d26e4ebb70ea 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 ef5b3f3e04d7df16781264ddb7bff5c510db8cca..0000000000000000000000000000000000000000 --- 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 33a4cc3cdc29cdb8515bf3fe0f637df73b992d6b..214f3b6a913ba19b10863a26ebbf00a741512381 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 ef5b3f3e04d7df16781264ddb7bff5c510db8cca..0000000000000000000000000000000000000000 --- 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 873947432617929caf778b4294b4e20a0cdff86d..460fa439f6401438086f48c682bc8cc5281953c1 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 f37a58e15778cbe71252f64aa9ee924b23cc53e8..4d2852fe0518999f67c6f3a946e3648927259409 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 9580435e5c93e9dd71762b91157eaf9ce8e6d960..cc8d0a6830f76add91c7d9ea4d597568a5663459 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 6d11cadaacca7ffbfd2bb73428d0734aa6a0fc63..1e83ca77cc4c18c5b41f0ba1cb67ff39ee981422 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 45853902b7870056b1d946f215abed5bdf0493a8..fa5999ca48ddfc1e142e9922c4b57f9fa8b300df 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 7c0674a86de923ddf15255bec3a5517a6aeda612..c9dd368f4fe3629d0395e58243ed1d9a4d3f8ae3 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 123779a7ab39f25289a97f2f40cb51790bea3f00..92448f54d1679d6038c068b3090df460b4acf78e 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 . #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 b8cfe9d892c4f66e0fd7608a6c5ae5170a7d266f..1f1783f635d5d00b2b0ef2ebc9fb78e5b0dabf2c 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 123779a7ab39f25289a97f2f40cb51790bea3f00..92448f54d1679d6038c068b3090df460b4acf78e 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 . #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 bceb5d3507291c67c3f168fd93959d5c4722575c..6c26c11a057c996d10e8bec568c8f76b90617029 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 6c9312eafbf18d46ee8f89e2f3cfb71a673b5aa4..5ba690ee955a4ec6fd4b73e229efe5dc4d355991 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 83908b1bed103b1dc774d82359a6e13d47186bd9..c7383aa160c3f3569e98ff41e052a6ac617bc1d4 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 da398205a0a54b2e6e753cd5161bbaad1a5fa39b..7163af011db210e3ea0223426ed1dc6b507c9e4c 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 3ceb9bd689da3a63e7bca72726b77b2342666416..0000000000000000000000000000000000000000 --- 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 a3516ccedbcd12d1603d9e0d3f5c0e39e29693d3..a89e672aea77d6bc78c3224a510ce89cebc2dc51 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 d2fc3d3f408992e298efcd5cebc24967025b2388..1695ca0e234dbc4bf0c3fcee0d1c2daf7ddf50bd 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 3e090f9e577b6fb76b339414a86bff8920330d79..99bdd06bb5c741d99b448655739a8c8036c0769e 100644 --- a/keyboards/gboards/georgi/config.h +++ b/keyboards/gboards/georgi/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #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 7ede9d1f43245acf6787693c813deb0118ae8dd1..0a654eaa4aca1ab90e91e0504ae1575995c7cb4e 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 065010fa528190d768d7fa30be07adf592f6ad11..e925b2b38446bc5156c6aa50ed65926dca15356e 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 8886063045916c2dffb4a833f3bff9bb376ef186..7400917333ea436bc2272ba9f22c8ab56dcc40ea 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 8fbabcf6ca1b78d94ae48ae981aac8d2e2ffc924..0000000000000000000000000000000000000000 --- a/keyboards/handwired/10k/10k.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2022 Nabos - -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 . -*/ -#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 d8f47c43f850da847d31b5c246a2efb83c757169..0000000000000000000000000000000000000000 --- 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 d8f47c43f850da847d31b5c246a2efb83c757169..0000000000000000000000000000000000000000 --- 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 2ed5b28c873226bfa59a91d5818c7c1d1cb078dd..0000000000000000000000000000000000000000 --- a/keyboards/handwired/arrow_pad/config.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 . -*/ - -#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 b9d705f3bf10fbeaf3c410c78e8947006607cdcf..79016d5d21ef3301157b94e1bafa0306eae0f1ed 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 62a4829060830c56b6322fcca4727dcce55e0506..0000000000000000000000000000000000000000 --- 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 . - */ - -#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 1cea39a73950665676831350dc70dcf81dbd204a..0b2de61490a02bd2ed142135a2bf3750f85c65c9 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 590eb090bdfb4025ccfcc4a34a8ed739c5785697..372619565da9584118df38ecdcd5497fb9c93eea 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 9dcdd90bb7ecbca7b2a3c062f3e8184d7d8ef76e..83c78b163420196807a38e2befee55518ddbfe8c 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 b0bcfe4829deed020ffd45dd0a3ac4af68051051..e8df528eff326e6f6fb48046c6f1979c7c6fecf9 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 3dc99447eece054a69d1a9ea4a798e6d001d5efc..8f6d8d5193f18fc28e63c115c3724dd9260b0c67 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 . /* 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 c7cef78c1989f76559714d44f8c3544b93949c78..ca0dffdc832cb17070ac15ba5fd59cf41f160406 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 25236b2a2fac354270eb831f1072b46ebf011275..d3d188ef42576a8b91935bb4fd5bb8d16c5e9edd 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 9ed5c92d46139f80a92e8e3b96267f06693fb34e..c32734cecb454ee5cfe6b81a20ccee3f331917a8 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 1c801d7e3c1c69725502eb83bdbbf58f86f1c391..0000000000000000000000000000000000000000 --- 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 02c7ef1d5cffe2c8b2c363615b92e73ea96a14df..9bb1d9cd9407d8f2c25e80295950203ab2b32763 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 72e031c8de5724a12d0c735c682536850e8fdc18..a8788a8ad79c0b6e49ea0b8d14c1de421d576274 100644 --- a/keyboards/handwired/xealous/config.h +++ b/keyboards/handwired/xealous/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #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 7401cb24c981a52ec4240af73cabeaa690cb7657..e23340434727e20dfc61f8bce960bd4e1caf5fc3 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 ee03dd1e179655af8c11509365ef4456da55ae61..899a134762ca58b0123771c2384454b6db13d7b5 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 d46deb9d0d17baf810852ceba56613ffc63e0c5c..2efee90deba80b186eef82010bc3e274cc6507fa 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 f5525a99438621f35b6f0f1c778a88bc78bef46c..a4660c93be8e5d8bc49006c9ae4e6ec0004f7754 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 330a7d551fc11aeabbc8bcee7193f8ea4d530ab6..0fc817ffdc884129a37396ababbfc5debb052775 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 3b5cf84cbd3895c87b9a919336d544ffa8b4d23c..de5824e22234540c501b469425d3b86057a232e9 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 11b53d695c8e93d4cef8c2dc9a8f8207e6010e60..2ceb38706f2ab4f6186369611248351f328e6734 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 266cc0ea785d0c57d85b7d06564a7684f1e9181b..adba031af54d09648e3ea4090442136cad2edcec 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 0a4f93e10d7b8e6b5805a216efd15ed8c8675c87..192e9285fc82464bfdbc4442bccc237d1e10f836 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 cae7c8b11a781d6d8d0e7f44411f83b5b5debe4f..bec0ac055b0d6770d6ce16bdba69d09f30453dae 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 2d97949c82dca041d13fedc98a14d9cc4bef5a91..6bdd2ee2fce2af3989131bdac2bca69f95efd329 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 14ae995d434627b1bec90830885dce7a0c28a524..90374871735e6b709a340adfde24725da60e06c6 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 ade1731d942a4fbd6fd69151c5a2c2b9b7f120a0..f4b4c383c9a7f27d31f565952f8345f816165c1a 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 5d9f1d9dc6d74e5506adb69dbacc4e524bb39368..0000000000000000000000000000000000000000 --- a/keyboards/horrortroll/paws60/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2022 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 . - */ - -#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 83fa85eda361931a0aedbf4e51703926102d33ce..a8da9ee2c2391b43a6ecb561e7a0f2865e2a3067 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 6f43a7105471a9a84dbf1cc34e25091efcd4d3b9..501fd1f996d1aaffe62673025c52ea06214f053a 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 15cc0b41b0fe3927aa58c2bb91994afb15493fc8..5e76e4c5be4861e2fce371195dc0aee01d7ee16f 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 d9bef6d021277c680c839c136aaa4b6ce390379a..0000000000000000000000000000000000000000 --- 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 ea37dd332256325ea62445c973a9d4972a814cbf..47f40ce119f1a296ad29cde574b8a48dae666e76 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 f6338c71337a27164961fbf33fe45378f1b6233a..bd2271049bf8d7e2850945b12af434f38cd44bf6 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 d9bef6d021277c680c839c136aaa4b6ce390379a..0000000000000000000000000000000000000000 --- 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 d9b7fdef39c3dd0e17369bf3c13b75c487957310..f425eb4fe49b78ee1498df900eba65f796c1b9a8 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 d9bef6d021277c680c839c136aaa4b6ce390379a..0000000000000000000000000000000000000000 --- 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 17bcd9a943e6ce27cf384d8643d72b1297d7e3e1..dab6347eb3e0cda7d6ce5a5407475163778f166e 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 cd5ab8de098ef64006ec7f41ddc6268b769b2e31..0000000000000000000000000000000000000000 --- 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 2b298924cff83f3eae8b0701cd5ba7156fe6e454..75f995fbbe3dea32766de1e1ef747a1768c8a22f 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 d9bef6d021277c680c839c136aaa4b6ce390379a..0000000000000000000000000000000000000000 --- 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 34f0a74669a20bb754c00db9f51f22668c012ab1..7992fb6295f6399972189496af48ba3a9333f9df 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 38b3c9dfdad69baa83405e37660e39f265ab026d..0000000000000000000000000000000000000000 --- 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 0f06aa708e860f540db6a06a0968ff598b359f18..ad6e32a69291b2c59d51a0a900ee681331c267d3 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 3f486480db65ec74b3ad37428b5ddd923a4a2b0a..0000000000000000000000000000000000000000 --- 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 8988d940e135c9db93d324056bb8bb6156f33b2f..c8ae65099baf20f4a2e9cbb030bd16b02f86c86a 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 d72aafd2a62de5a27cedc3fcbec25f75e6879bef..cbe83c98eed3f7593b71813f645886a991e25739 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 c6e7db6bcd20c8c6fed7214fdfca7bc4eb9327e9..4bc0c6dcff9eabc7d4d69442bdc5a55fc0d45a1d 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 452caa9aa8beb651f446a94ef2aaa6dcc873ccbe..b84f63a967f1efe364bfccadf5e2d148e3571b8e 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 7b98521985601338cb70f2f0c2513f5424aa5311..e4fbf055f2073afdf777fb3f14b69dee732fe1e8 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 8220bd3323b1fae26d5a106ce330838ecb65917f..d9e2fdff60d1f4ce527b5e50b6905a529ea7091f 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 a87754e9f2f84be456998bfc74595f20e66db988..c78453dc5fbc2fc360ff0549d69b818490123830 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 cc8f74bc7510e0f3f5ab6e4005c14a0c4d244894..a99ef16ba93bd071dc795e1f1a55128353f5926e 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 5bc470e1024aaec96ca1f177985d007a5b162b3d..38a5da199416686a88a7d4c42f03558dc96a0c2c 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 719f192955957e055cf8cbc84275d2e6f4e71822..fe391e91a19b9f29b1ca2d0a391e5d2305cc51b1 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 c3cde9243f2b2d9a8e595a4487b9e2aa1890b006..c3dfe6691044500c44e210f7e7eeaf6ff99ca7c4 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 3982ef54e64736aefc6b6d80dc97b4cb6374e057..cb3fcd2e0da0b5538d1a26b9c65cafe55cc584c7 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 2fee4b26030d2b49c9c576f736d608655fd9cf8a..d2f408e51fe714c31fa5b1e91ef819b4a5206643 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 5fb9ee0e985b58b6710cd43222aff5eabffb9168..2814a6609a3f8afae5349e87e0f8b687d5550dec 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 . #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 dc5c2235a8346b25b64e93945c32aa0410aecf40..8c3536db6b45bfc726e7232faf631e0e1b1943ec 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 446ade0fccb04788b6e322f1b59b55c08898b40b..0000000000000000000000000000000000000000 --- 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 . -*/ - -#pragma once - - -/* Force USB NKRO */ -#define FORCE_NKRO diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json index ae201fd50e9bb272a1cd95cb8a4f8a2eb5bffd9b..c628200298fc7ea6c7d06725d1f4c67ba8526ff1 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 fb227ca8026743614bd4926f65a68ca519081e26..c46332b0077da01feac8a5740ddb6ec08ec7c2c2 100644 --- a/keyboards/linworks/fave87/config.h +++ b/keyboards/linworks/fave87/config.h @@ -14,10 +14,6 @@ along with this program. If not, see . #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 2694d099300f7d601aabd2a65ee2fdc8fa3572e8..e77af6d10dcf30c608c2dd45c40c0d6978e7da96 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 66c521237192dfa33c550c23d3d9b3996ef632a5..e21a6d3974ba7e0d066d3c3a696b256dd6d9eb17 100644 --- a/keyboards/linworks/whale75/config.h +++ b/keyboards/linworks/whale75/config.h @@ -14,10 +14,6 @@ along with this program. If not, see . #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 2ac2accced717b504c12159489bfa26870f2251a..b08d77e3074d01f2037ed920c327a9d178861437 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 e3e2bf2fa143fc8e6689fca1887b12b6280be122..0000000000000000000000000000000000000000 --- 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 . -*/ - -#pragma once - -#define FORCE_NKRO diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json index 739957342a7c642e837db0cad2f1b006b0993d36..dbcdef1e94bd896870ab53aa82fe7c1e68b7255a 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 a8c1b6243a0e8d86ec3dafe9391af527a87b4ba5..d19f39dd1318d5408157f76b53dc2cfb4b8dbecd 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 beafbac22257b52f9159111b86e696704c9df914..499a9d153799db949e763ae61e226b9d516b1ac7 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 dc3a85a72822b1c986ad1b783e3a73a90decfcfa..1512cc1528be211ea899e24dd37c36fc893662d6 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 49e8c7d459ac99eaa1f04c8beb830e5033c667c3..5f7916822c31ec8b1345ccd7cc28bf131e1bf454 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 7d416ae8db68a238334935eeed4102c6459b1bff..8ceeef163d541813daf584349ba7b4abe22d98fa 100644 --- a/keyboards/millipad/config.h +++ b/keyboards/millipad/config.h @@ -18,5 +18,3 @@ along with this program. If not, see . #pragma once #define LOCKING_RESYNC_ENABLE - -#define FORCE_NKRO diff --git a/keyboards/millipad/info.json b/keyboards/millipad/info.json index 975c41481b9d1585a2bb2f96859e4b490ab113ab..5ac2e322215b3a3c3c4b18e9f93517202c0eef01 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 c50e01bbe0bce0a1baf45a67b30d412c35b27920..55e57fb8728abf1c30f957fdeeaec37ab06cdbf0 100644 --- a/keyboards/misonoworks/chocolatebar/config.h +++ b/keyboards/misonoworks/chocolatebar/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #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 abb58f29f597a23da415794b9b27256063202e0f..65087ac48186972a0d0df92ddf567ac94946b72a 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 0b1dbb4c5795753d9ce9bb5187be5cde81e40b25..eba5475d833f20a4191abadb91d5b7da7370355d 100644 --- a/keyboards/misonoworks/karina/config.h +++ b/keyboards/misonoworks/karina/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #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 5ebaf686928bbc2ab65e2d20b158e3ca7341e4ac..2fc140cba619267d782f4f45c6b9e29a26a22d22 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 96516121d3d9196bf708e0187bf20a5ac5c7c741..564819588fa7ed657be22bccab671bc5a3286cd6 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 48e0abb14ea5f2ca048c095f45700cfd701ff477..990b45f1cecdee06be39942002860581afd155d6 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 24b79416a82da1158be77d6c9f002020027d3d8f..99f9e80b3ede25b0c1d1eadb2396cef97f3e8df6 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 837a82916b11289cea1078e33bd101d33c2bdf99..558d1fa0dc744c12b91ba7d3eb600acd3a284749 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 5250c1c84f85a771db11848cabe824da4f9a77fa..5fa148d7482ca49f168b525024bee02a7ec022c7 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 1f9a8a71c40c19a00174b30e57a06edb24293e0e..16577a21e88b2b8e247f76dea13976541fc7991f 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 7270ccb4b3a3fb0cda01c61e0a54935bced23059..4c6549ec3af79b01e6aa4baf15c5aae6b62ccad8 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 bd0acc964513a8d33d2f0251ac1dde7daf972896..6f300fbbb23a7065e929285402d8efbb63817aac 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 53ac3aa16190450bd099e4298e5b6b75596f951d..ad7d9c37b13c2fe461e8b94b7d1013a537302188 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 523444ffa68c3efe23db064770ea5e326b3ceb4a..b0d9e5b858fa8cd3293e74e2e50d850f87dd064b 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 9603e1db2be7633ba1d2c85df8c11f01df237d99..8c5cad9beff8e6cd0873e547154186c63eddd434 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 8bf0f3f2fc793ac514379874e7dc39f7987c9e3b..3cf9f972fcc266b56d541f4222f2677f5d82e1f3 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 daacf8f8a6c1b0e77dbe29533c97bdd17f21cea7..c4edb8427c64eaaf6e2dc2d3a249c5656e001830 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 f97ed3ca56fbd4f4b46262d338b6f12dd5163960..e5c59d5590aac9fc6fb5080fb95179acea8ecf59 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 137a988c6d998db242da27ca5675bdfd1e8ce874..4d340985d3cbbed6ab93667a01a333ec33932b77 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 fbea082c78a250d7a9407a94cf2b167891b45324..a85a3db8b9dc9a4ce72e10b74dd6a95640666b92 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 b1176fc6b8ebe8be6d7e1745e9577b8f5273bb57..d37e70df346e14b4eaf5f5ec239a274616009b61 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 . #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 0c348d0cdc4912b00d855018ee6500e00384a946..c30c06fb6707a43341008b34d8374cf314450f52 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 b1176fc6b8ebe8be6d7e1745e9577b8f5273bb57..d37e70df346e14b4eaf5f5ec239a274616009b61 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 . #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 4e001d03c0506d26147e33c27fcaecfcf84b8424..4c66855d6b73b56b68ef45fa27f583ef7e0da09e 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 c1dab1c71f38ae8a638c4c80620a68138ae7bd63..8da939a2af0760a86632c6c8eff8b05a18ec4671 100644 --- a/keyboards/owlab/spring/config.h +++ b/keyboards/owlab/spring/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #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 1a01d11656bc0b759922308b534a7d94ef991197..1930b04ff58f167c75cf0670106a6771d097a80b 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 a62df28fc3c9a16daeb3425bcb7eb06762ff12a6..0000000000000000000000000000000000000000 --- 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 . -*/ - -#pragma once - -/* NKRO */ -#define FORCE_NKRO diff --git a/keyboards/owlab/suit80/ansi/info.json b/keyboards/owlab/suit80/ansi/info.json index a8ca09b4c6b9736a6cde78fb89123c97649c24d2..d43c78830206e0eecb929595351667494b765852 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 a62df28fc3c9a16daeb3425bcb7eb06762ff12a6..0000000000000000000000000000000000000000 --- 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 . -*/ - -#pragma once - -/* NKRO */ -#define FORCE_NKRO diff --git a/keyboards/owlab/suit80/iso/info.json b/keyboards/owlab/suit80/iso/info.json index 6e8016c490e1419b0d4712ef9873a82a645ebf56..55761a4c8960cb062e32fd6e296059683b617b67 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 76fc80e242d47c0e10967d914ce38de09615bd82..884f456044aa721caf4630c1a5e003dd8ccb535d 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 . #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 ea365441bde8720ad4bfc62d1537cf22f9e29a88..5e977da5e988904c52d45360eb054d70538806ea 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 fa2291fb4f2d28c809fad1bb73d8fab2b64e0a03..1eec867f2fe7a2820057b5909ebbca4cbbc7c158 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 . #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 587cdc80fbfa2cfaea2c2a53814c4d6f94affe07..9061a28e82dddae16250ce68b9fa118193c953fd 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 f8a03dde3b1ec9387d3e67547799c05515b0487c..fff89d48f2f4364d1d4db065c5b04ed98718f6c5 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 964038eefb4d35343c36a0e147f717a791ddd0a2..0000000000000000000000000000000000000000 --- 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 e61b67307fec94f621875e53731b4a28350af2cb..384256f15adac4e711eed91848497e87e3a6aa1d 100644 --- a/keyboards/polycarbdiet/s20/config.h +++ b/keyboards/polycarbdiet/s20/config.h @@ -38,5 +38,3 @@ along with this program. If not, see . #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 19b1a718640d4fa569a2d80c961d7abddc87bf04..c3408f83a32e721d3cb4fc541d910b3462b2552f 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 916485e60b5cf89206209a52b63f107c5f8c1dfa..0000000000000000000000000000000000000000 --- 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 . -*/ - -#pragma once - -/* NKRO */ -#define FORCE_NKRO - - diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json index 78bbe74ecd456ad3b3cc5179a03633ad9fa1dbe0..01799ac0ef391574e2c2ab718bc156331b10bef8 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 6561379dbe785fd5338ced44a3651cef7003cd8f..0000000000000000000000000000000000000000 --- 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 . -*/ - -#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 3481ffd2bb5b38ce4220004cf5fcd9b764682ee6..f0de59102aa82b38dc115deef11fc45a1d85e9e6 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 59329a2bd2c882689b2c92bef9cfe5214be0500d..0eaea7885d78af0eb27109dfe45f85aa189d80ff 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 b2d36827bb337130d2d1a50d1040667c13d778e1..cf7e2cdfb027be41ebeaf16c1a7928e61809767e 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 . #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 95898ac2c1bcb4093d38b60da650aebb51423537..5cf0dc14e131578ffa0fae665a96496135a67b59 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 . #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 b788bd2bc19dff5ec44586fe5d3a38d41885e75a..25aac817da705a939a5941bd734796e074146c6d 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 . #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 648be80cd5cbcb179fd9748576f36aa27110e2c6..1dc3d8025068b853bc339ec42fcf175cd1b46bb8 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 7d6b574b96436ce40de02ce00e640b4893a56101..0000000000000000000000000000000000000000 --- 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 . -*/ - -#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 f63b50781c28b415fdb6d2c66599954f7d396721..798f9f4f46361592ae163077a8ff95fb372bded1 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 e503d296c0a569fe48b5cd467cbdf804a267f224..0d2d834cb02ba6a80f9ce5c6b85ff575146595d8 100644 --- a/keyboards/runes/vaengr/config.h +++ b/keyboards/runes/vaengr/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . // # 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 94d325f9d46a9f1691f67db8ac41f439e3967070..517f0946c8777375e97ca4f73bf1bf6c55185208 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 5e38b1f36abd79ae0d84f0529395ad70c3707550..84fd3381edab499a68161b3a8b027fe90d3c50c1 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 3549d99b3fcb174a4b170dca048a56de289aa722..90b739b7d1ec46ffd2addc7ee500c310b67accfe 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 71966a6aa47ffcf4367c95e4a3babb768cbbfeec..ad495eb23c059d186671ef5687d0d31b09c95ae2 100644 --- a/keyboards/sixkeyboard/config.h +++ b/keyboards/sixkeyboard/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . /* 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 2aefe3e8b92dcaa28c09213968e205de0dea9e21..247b255a363470af7361197de6d09ab1f0294232 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 63b3758737b821589de60a9a183758d75cc86fa7..9d7338ccce9849f764cc22ca1ec0383ab3889e3b 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 5b7fdfc48196ef4cdf00e7dfdaf3fdc78b354b06..9b9d69e4179221a79fc461971d84b85e0dff20e9 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 053083f2308349dd0e78ddd7c1ee5617fc792779..2387f9a000cce2b3caf034eb67357815271fe74e 100644 --- a/keyboards/soda/pocket/config.h +++ b/keyboards/soda/pocket/config.h @@ -21,10 +21,8 @@ along with this program. If not, see . #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 1c6488118370764ed1c4c233f0ad0af2d3131a66..cef1aec57b065822de7cc72ed0bd4bf96841050c 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 bf5b37166ad7bbd2dd2420d631cb7aa5334c0f6c..a527c077968b51f4363fcd20caf18447f34792c9 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 . /* 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 e53a30cda8e7d7acd4dc64d449907b71cce97a71..3510e076ff109413cf78ea120c706040c98da3af 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 a2c060d424cf0e57b9e8d5e6595d06c029e3719d..bf60719a674b010308667af3e7b1ae7e48803b1d 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 e4c86b9312fc3945f5e0eb4293d0eac29b33adc7..0fc56dff8d9aad345331967a35afdb4f6794f7c8 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 bf5b37166ad7bbd2dd2420d631cb7aa5334c0f6c..a527c077968b51f4363fcd20caf18447f34792c9 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 . /* 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 5f6d22417014be51dba7755c1039ce0fe09e6b8f..fe7706357d9e87e3d5815b472c342cce15f95c76 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 44f1f5afc137dd13ac39eaf39cf1260b9ec405b7..d97564528235a7c0847f9d8a50397628c0313e87 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 039fc487da53a14bee4441c8dda8ea74c458f280..0000000000000000000000000000000000000000 --- 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 16c2aae950ae036d8c3544aa12a6938ee9e3ab82..1870286c810cb0861b849fa4e39f7f10d32c827a 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 75d503b8838ed3708131b41148d124ef5dc9d9d4..91cb5a9c43cca38a4f962d4b3484f0b1b08b9668 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 3411aa9f688d4bb9ce05af86b70665373531187a..71170a12cea6bdb5741195a28a7044265d524a3c 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 14d39d63ccdf40c1880ba0c7047966a79bbd4856..e90884fc0fe96bedf4fc07da528621787cdcee31 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 70b09da4f147e4e090247e6b5c5e48bc3ea2db13..1453bfdc94447618a634edbce7f3f8da126657f2 100644 --- a/keyboards/teleport/native/config.h +++ b/keyboards/teleport/native/config.h @@ -14,10 +14,6 @@ along with this program. If not, see . #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 1e1d591512b390ffbb90efae338d69c4db1b3e57..d306a3d6c6c55b4f5239aa0185797e5b1dca8ffb 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 79ef90ed7ab3f23ffef84635c8ecefd194a03188..cd00839acecf60e48e033b810f10113b1352e2bf 100644 --- a/keyboards/vertex/angle65/config.h +++ b/keyboards/vertex/angle65/config.h @@ -32,5 +32,3 @@ along with this program. If not, see . #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 a781a8aa37307e73d29ad13d8319827e755cb1f6..bf0ac61c34e87c8d0fc87ea7aba3047ea1af8603 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 ff75c3a2273985cd45b1826790f58a8f4a16ea02..791368b5b2c6f0f2e94f9d2a2674fdd4011b62b5 100644 --- a/keyboards/vertex/arc60/config.h +++ b/keyboards/vertex/arc60/config.h @@ -37,8 +37,6 @@ along with this program. If not, see . * 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 7bfd1b5d3bfa6edc6b57fadb74ba46935c598d8a..8aa5a709d50baa2ae65f66015143a700ea5ef694 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 9f9ed0cdb389454941eb879e38679542bdf4af7a..e4cb0453537b719f86ff6040589683f6b01c5c0d 100644 --- a/keyboards/vertex/arc60h/config.h +++ b/keyboards/vertex/arc60h/config.h @@ -39,8 +39,6 @@ along with this program. If not, see . * 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 bdee577569ce49d27b2f980f2b3202383553360a..831190a516b9cece4657f61ca9b6285bf1623812 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 ada0ff6e76dfc119ecbc67daa48a0505866460f3..5f360813239bad2c21db930bcae016798f148177 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 6ecd53c36df199576d54385c1739c9401fcec814..23148f16cfb4452389bd47dddf955834df99b30b 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 ada0ff6e76dfc119ecbc67daa48a0505866460f3..5f360813239bad2c21db930bcae016798f148177 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 d6779e758d07ba29f22c3f4c2ef2b6900ddfa6d1..a641192f32c99e93208cab860ba1b772c91b1513 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 ada0ff6e76dfc119ecbc67daa48a0505866460f3..5f360813239bad2c21db930bcae016798f148177 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 d55094022aad23f3e4d8e408bd150afb18cb2dc4..fb4970e259a7352d074baebc23f0ad3a4955541f 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 bbde3a61578756c5fab582a2cee82cbcac743e8a..e8a42741810746cc345713e13b39b80efb01c2fd 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 68c4973c0d60770147403cf99990fd077f6bd26d..ce532c92696ae2aeaf1a47853a4c8b76ef111fb4 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 bbde3a61578756c5fab582a2cee82cbcac743e8a..e8a42741810746cc345713e13b39b80efb01c2fd 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 498ce63cb1ad2332b6317e7634af9611daef7eee..ba0774a5b70c0d7f431aa088148ce5229ab8ac31 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 b612e1587ebcf6dc50f7ae25895ad05d8672b910..5df8b9c56bd5a4d7a15fc9880136cb44af272c1d 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 66a037fa9cfef27ae22a1ac4796d74444dc751cc..f69b621f650f1ef5b0cc9168cc13d76abde8e99f 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 af6157aa934564e92e88001909e090de8bd4f672..1007f5b3dec494e84be772ee046f60c78208165f 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 184dc1a67b772458395594eed989b5dae10106d4..90ab8c19eff15a56a682eaaf471809dcc0653f86 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 5faab0f2d79547baf41ec4e480a28d718335ad74..9ff25facc878d015819041b669619bc794f355c9 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 a9436d4d147f3c628ecadc9c9837c18226f7b6ab..62377018b6f8d3563306b0c63d3af8770d832252 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 20970a866a7b7b63ff5699661a12f74525855650..3c53ebc8bcf5964bbb26670fe8f4f66e5107cea2 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 bfc36db1c494f3e657635dfdcc9440aa039e7bbd..9b8f0410fabdfadd4ac80c450f212463022c9447 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 5faab0f2d79547baf41ec4e480a28d718335ad74..9ff25facc878d015819041b669619bc794f355c9 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 0e9e0d8e9b9e5aa59007a06a956348de12ea67a5..ac976a4cb42ea0ec578444d84398c6293a9e07bd 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 a5910ae45c9f5927d7c63bd72bfd421147c65c7b..1c5fe4a33629c04fb45f72aac0799ade4c59a1cd 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 610463158397d1d9dc1d530034663a966ac5f551..b8cda1a22a7b3d7904deac7d95d7c3255d209a21 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 66ec91c5107435c463be3679530fc9102156bfa6..0000000000000000000000000000000000000000 --- 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 . - */ -#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 cc020b9310eb086630627ed87e740e55547f051c..aa34d3864ffd97ff1328ecf7eb28d40bd7f41248 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"],