diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h deleted file mode 100755 index b9449c4714b..00000000000 --- a/keyboards/tada68/config.h +++ /dev/null @@ -1,39 +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 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * 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/tada68/info.json b/keyboards/tada68/keyboard.json similarity index 97% rename from keyboards/tada68/info.json rename to keyboards/tada68/keyboard.json index 1311017d361..641def01a31 100644 --- a/keyboards/tada68/info.json +++ b/keyboards/tada68/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "F6", "F7", "D5"] diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h index 21ddfa1850e..363a41accd6 100755 --- a/keyboards/tada68/keymaps/rgb/config.h +++ b/keyboards/tada68/keymaps/rgb/config.h @@ -1,4 +1,4 @@ -#include "../../config.h" +#pragma once /* WS2812B RGB Underglow LED */ #define WS2812_DI_PIN F5 // See readme.md for wiring your led's diff --git a/keyboards/tada68/keymaps/rgb/rules.mk b/keyboards/tada68/keymaps/rgb/rules.mk index 7cffca44fad..c777cb1b9ff 100644 --- a/keyboards/tada68/keymaps/rgb/rules.mk +++ b/keyboards/tada68/keymaps/rgb/rules.mk @@ -1,18 +1 @@ -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk index 01310bd4ea0..e22d5248895 100755 --- a/keyboards/tada68/rules.mk +++ b/keyboards/tada68/rules.mk @@ -1,15 +1,2 @@ # This board uses the older unsafe 6k version of lufa-ms BOOTLOADER_SIZE = 6144 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h deleted file mode 100644 index 7b4e38bd964..00000000000 --- a/keyboards/takashicompany/compacx/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 takashicompany - -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 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * 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/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/keyboard.json similarity index 94% rename from keyboards/takashicompany/compacx/info.json rename to keyboards/takashicompany/compacx/keyboard.json index 08dcbfee54b..b4460cce770 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/keyboard.json @@ -8,6 +8,23 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/takashicompany/compacx/rules.mk b/keyboards/takashicompany/compacx/rules.mk deleted file mode 100644 index 25fcdc1a34c..00000000000 --- a/keyboards/takashicompany/compacx/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/keyboard.json similarity index 98% rename from keyboards/takashicompany/spreadwriter/info.json rename to keyboards/takashicompany/spreadwriter/keyboard.json index da5a95b8957..2c9fcd1619a 100644 --- a/keyboards/takashicompany/spreadwriter/info.json +++ b/keyboards/takashicompany/spreadwriter/keyboard.json @@ -6,11 +6,11 @@ "diode_direction": "COL2ROW", "features": { "bootmagic": true, - "command": false, - "console": false, + "encoder": true, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": true }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"], diff --git a/keyboards/takashicompany/spreadwriter/rules.mk b/keyboards/takashicompany/spreadwriter/rules.mk deleted file mode 100644 index 248f19320f0..00000000000 --- a/keyboards/takashicompany/spreadwriter/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes \ No newline at end of file diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h deleted file mode 100644 index 1c14611b2b9..00000000000 --- a/keyboards/takashiski/hecomi/alpha/config.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -Copyright 2018 takashiski - -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 USE_I2C - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * 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 - -/* -#define USE_I2C -#define MASTER_LEFT -#define EEHANDS -*/ diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/keyboard.json similarity index 94% rename from keyboards/takashiski/hecomi/alpha/info.json rename to keyboards/takashiski/hecomi/alpha/keyboard.json index 767f787e5e3..0a6bf513f0c 100644 --- a/keyboards/takashiski/hecomi/alpha/info.json +++ b/keyboards/takashiski/hecomi/alpha/keyboard.json @@ -8,6 +8,21 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashiski/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk deleted file mode 100644 index 98c2f6b6a7f..00000000000 --- a/keyboards/takashiski/hecomi/alpha/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/telophase/info.json b/keyboards/telophase/keyboard.json similarity index 94% rename from keyboards/telophase/info.json rename to keyboards/telophase/keyboard.json index 2dd6c5dc783..8efbae55195 100644 --- a/keyboards/telophase/info.json +++ b/keyboards/telophase/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/telophase/rules.mk b/keyboards/telophase/rules.mk index 706d6106538..ae63f87e079 100644 --- a/keyboards/telophase/rules.mk +++ b/keyboards/telophase/rules.mk @@ -1,18 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite - -# project specific files SRC += matrix.c UART_DRIVER_REQUIRED = yes diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/keyboard.json similarity index 97% rename from keyboards/tkc/portico/info.json rename to keyboards/tkc/portico/keyboard.json index 4f908c83e62..29b7d8246b2 100644 --- a/keyboards/tkc/portico/info.json +++ b/keyboards/tkc/portico/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk index 6bc05372aff..4263ceb1684 100644 --- a/keyboards/tkc/portico/rules.mk +++ b/keyboards/tkc/portico/rules.mk @@ -1,22 +1,8 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC += keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c - -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/keyboard.json similarity index 96% rename from keyboards/tkc/portico75/info.json rename to keyboards/tkc/portico75/keyboard.json index fa2a24951fa..79ead697648 100644 --- a/keyboards/tkc/portico75/info.json +++ b/keyboards/tkc/portico75/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/tkc/portico75/keymaps/via/rules.mk b/keyboards/tkc/portico75/keymaps/via/rules.mk index 1706771222e..81628aba6ba 100644 --- a/keyboards/tkc/portico75/keymaps/via/rules.mk +++ b/keyboards/tkc/portico75/keymaps/via/rules.mk @@ -10,3 +10,4 @@ SRC += keyboards/wilba_tech/wt_main.c \ drivers/led/issi/is31fl3741.c I2C_DRIVER_REQUIRED = yes +CIE1931_CURVE = yes diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk deleted file mode 100644 index 36e22b992da..00000000000 --- a/keyboards/tkc/portico75/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix -CIE1931_CURVE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index 7700780b2e8..507f4c47926 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -4,7 +4,19 @@ "maintainer": "vattern", "usb": { "vid": "0xFEED", - "pid": "0x7812" + "pid": "0x7812", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true }, "ws2812": { "pin": "B1", diff --git a/keyboards/tkw/grandiceps/rev2/info.json b/keyboards/tkw/grandiceps/rev2/keyboard.json similarity index 100% rename from keyboards/tkw/grandiceps/rev2/info.json rename to keyboards/tkw/grandiceps/rev2/keyboard.json diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk index 5b78d6fe55c..01fa5217635 100644 --- a/keyboards/tkw/grandiceps/rules.mk +++ b/keyboards/tkw/grandiceps/rules.mk @@ -1,20 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - SERIAL_DRIVER = usart -OLED_ENABLE = yes -OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE DEFAULT_FOLDER = tkw/grandiceps/rev1 diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/keyboard.json similarity index 99% rename from keyboards/tkw/stoutgat/v1/info.json rename to keyboards/tkw/stoutgat/v1/keyboard.json index 9d7a60a4b97..2dd46af4947 100644 --- a/keyboards/tkw/stoutgat/v1/info.json +++ b/keyboards/tkw/stoutgat/v1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x7811", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"], "rows": ["D1", "D0", "A0", "A1", "A2"] diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk index 8dca0665f77..c2ee0bc86f9 100644 --- a/keyboards/tkw/stoutgat/v1/rules.mk +++ b/keyboards/tkw/stoutgat/v1/rules.mk @@ -1,16 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json index b1232f6816e..dbb227b0fdc 100644 --- a/keyboards/tkw/stoutgat/v2/info.json +++ b/keyboards/tkw/stoutgat/v2/info.json @@ -8,6 +8,14 @@ "pid": "0x7811", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "ws2812": { "pin": "B1", "driver": "pwm" diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk index 477d680add8..1a660af26c9 100644 --- a/keyboards/tkw/stoutgat/v2/rules.mk +++ b/keyboards/tkw/stoutgat/v2/rules.mk @@ -1,18 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output - -OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE - DEFAULT_FOLDER = tkw/stoutgat/v2/f411 diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/keyboard.json similarity index 95% rename from keyboards/tokyokeyboard/alix40/info.json rename to keyboards/tokyokeyboard/alix40/keyboard.json index 7b2f198e596..e4c27aaec21 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4134", "device_version": "0.0.1" }, + "features": { + "bluetooth": true, + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"], "rows": ["D7", "C6", "C7", "B5"] diff --git a/keyboards/tokyokeyboard/alix40/rules.mk b/keyboards/tokyokeyboard/alix40/rules.mk index 5d6d78ae10a..3437a35bdf1 100644 --- a/keyboards/tokyokeyboard/alix40/rules.mk +++ b/keyboards/tokyokeyboard/alix40/rules.mk @@ -1,16 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BLUETOOTH_ENABLE = yes diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/info.json b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json similarity index 97% rename from keyboards/tominabox1/littlefoot_lx/rev1/info.json rename to keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json index be22362de21..b021ba9c8d4 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev1/info.json +++ b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6C78", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"], "rows": ["D5", "F4", "D3", "F1", "F0"] diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk deleted file mode 100644 index 964fd155399..00000000000 --- a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/info.json b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json similarity index 97% rename from keyboards/tominabox1/littlefoot_lx/rev2/info.json rename to keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json index 6a48b5076b4..fe1cf6e5960 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev2/info.json +++ b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6C78", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"], "rows": ["D5", "F4", "D3", "F1", "F0"] diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk deleted file mode 100644 index 964fd155399..00000000000 --- a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/tominabox1/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h deleted file mode 100644 index 333d0a100eb..00000000000 --- a/keyboards/tominabox1/underscore33/rev1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * 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 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/tominabox1/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/keyboard.json similarity index 95% rename from keyboards/tominabox1/underscore33/rev1/info.json rename to keyboards/tominabox1/underscore33/rev1/keyboard.json index c52c1b13730..221ecccb041 100644 --- a/keyboards/tominabox1/underscore33/rev1/info.json +++ b/keyboards/tominabox1/underscore33/rev1/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x3301", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"], "rows": ["F5", "F6", "C6", "D0"] diff --git a/keyboards/tominabox1/underscore33/rev1/rules.mk b/keyboards/tominabox1/underscore33/rev1/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/tominabox1/underscore33/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h deleted file mode 100644 index 333d0a100eb..00000000000 --- a/keyboards/tominabox1/underscore33/rev2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * 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 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/keyboard.json similarity index 95% rename from keyboards/tominabox1/underscore33/rev2/info.json rename to keyboards/tominabox1/underscore33/rev2/keyboard.json index b9c8b87b502..4375116963f 100644 --- a/keyboards/tominabox1/underscore33/rev2/info.json +++ b/keyboards/tominabox1/underscore33/rev2/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x3302", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 12, "animations": { diff --git a/keyboards/tominabox1/underscore33/rev2/rules.mk b/keyboards/tominabox1/underscore33/rev2/rules.mk deleted file mode 100644 index dd8f1a5ae7d..00000000000 --- a/keyboards/tominabox1/underscore33/rev2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/torn/info.json b/keyboards/torn/keyboard.json similarity index 94% rename from keyboards/torn/info.json rename to keyboards/torn/keyboard.json index c1b83188f06..162e7d08c0e 100644 --- a/keyboards/torn/info.json +++ b/keyboards/torn/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": false, + "mousekey": false, + "oled": true, + "wpm": true + }, "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1"} diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk index f855a651a55..213b5db8ab8 100644 --- a/keyboards/torn/rules.mk +++ b/keyboards/torn/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder -OLED_ENABLE = yes -WPM_ENABLE = yes CUSTOM_MATRIX = lite SRC += matrix.c \ diff --git a/keyboards/touchpad/config.h b/keyboards/touchpad/config.h index d499fb795c3..f6f58cc5a12 100644 --- a/keyboards/touchpad/config.h +++ b/keyboards/touchpad/config.h @@ -17,28 +17,6 @@ along with this program. If not, see . #pragma once - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 6 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * 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/touchpad/info.json b/keyboards/touchpad/keyboard.json similarity index 89% rename from keyboards/touchpad/info.json rename to keyboards/touchpad/keyboard.json index 7b3cc0950d9..5429b5844db 100644 --- a/keyboards/touchpad/info.json +++ b/keyboards/touchpad/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0DB8", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/touchpad/rules.mk b/keyboards/touchpad/rules.mk index b9fb83c48c7..42be966784a 100644 --- a/keyboards/touchpad/rules.mk +++ b/keyboards/touchpad/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/tweetydabird/lotus58/nanoboot/info.json b/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json similarity index 100% rename from keyboards/tweetydabird/lotus58/nanoboot/info.json rename to keyboards/tweetydabird/lotus58/nanoboot/keyboard.json diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/info.json b/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json similarity index 100% rename from keyboards/tweetydabird/lotus58/rp2040_ce/info.json rename to keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/keyboard.json similarity index 86% rename from keyboards/ungodly/launch_pad/info.json rename to keyboards/ungodly/launch_pad/keyboard.json index d9d0ea30edd..50b6c2bcbf6 100644 --- a/keyboards/ungodly/launch_pad/info.json +++ b/keyboards/ungodly/launch_pad/keyboard.json @@ -8,6 +8,22 @@ "pid": "0x4C50", "device_version": "99.9.9" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": true, + "oled": true, + "rgb_matrix": true, + "magic": false, + "grave_esc": false, + "space_cadet": false + }, "rgb_matrix": { "animations": { "gradient_left_right": true, diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk index 31fabc928ca..cc588202788 100644 --- a/keyboards/ungodly/launch_pad/rules.mk +++ b/keyboards/ungodly/launch_pad/rules.mk @@ -1,22 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -MIDI_ENABLE = yes -OLED_ENABLE = yes -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes -SPACE_CADET_ENABLE = no -MAGIC_ENABLE = no -GRAVE_ESC_ENABLE = no -LTO_ENABLE = yes - ANALOG_DRIVER_REQUIRED = yes diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json index f92299e9fa4..98138b87dd7 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json similarity index 85% rename from keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json index 13615db22d4..0ef2cc4d5ed 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "maintainer": "purdeaandrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json index a8dcd9418fb..3072222ea6e 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "community_layouts": ["fullsize_ansi", "fullsize_iso"], "layouts": { diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json similarity index 85% rename from keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json index 1c2f5b300bd..30264dd537d 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json index 162495c25b8..0847f665043 100644 --- a/keyboards/unicomp/pc122/info.json +++ b/keyboards/unicomp/pc122/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/info.json b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json similarity index 84% rename from keyboards/unicomp/pc122/overnumpad_1xb/info.json rename to keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json index 16e39168231..936e286af1d 100644 --- a/keyboards/unicomp/pc122/overnumpad_1xb/info.json +++ b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json index 52eb4d80368..f5d783b1265 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json similarity index 84% rename from keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json index cf25addc9e2..9fd91ce48fc 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json index 166baaca416..6ac69a66aab 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json similarity index 84% rename from keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json index 31fc97a527f..db772e46e24 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/keyboard.json similarity index 97% rename from keyboards/unison/v04/info.json rename to keyboards/unison/v04/keyboard.json index 7b182df2515..14f495aa2ca 100644 --- a/keyboards/unison/v04/info.json +++ b/keyboards/unison/v04/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x176A", "device_version": "0.4.0" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "encoder": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"], "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"] diff --git a/keyboards/unison/v04/rules.mk b/keyboards/unison/v04/rules.mk deleted file mode 100644 index b4fc6e0d29e..00000000000 --- a/keyboards/unison/v04/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Rotary Encoder - -LTO_ENABLE = yes diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/keyboard.json similarity index 95% rename from keyboards/uzu42/rev1/info.json rename to keyboards/uzu42/rev1/keyboard.json index c7d6f7159bb..71d9f424cc8 100644 --- a/keyboards/uzu42/rev1/info.json +++ b/keyboards/uzu42/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/rev1/rev1.c similarity index 100% rename from keyboards/uzu42/uzu42.c rename to keyboards/uzu42/rev1/rev1.c diff --git a/keyboards/uzu42/rev1/rules.mk b/keyboards/uzu42/rev1/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/uzu42/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk index 49b64b12745..277e74b7153 100644 --- a/keyboards/uzu42/rules.mk +++ b/keyboards/uzu42/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -OLED_ENABLE = no # OLED display - DEFAULT_FOLDER = uzu42/rev1 diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/keyboard.json similarity index 67% rename from keyboards/v4n4g0rth0n/v2/info.json rename to keyboards/v4n4g0rth0n/v2/keyboard.json index 6959188be9a..c43848178f2 100644 --- a/keyboards/v4n4g0rth0n/v2/info.json +++ b/keyboards/v4n4g0rth0n/v2/keyboard.json @@ -2,6 +2,13 @@ "usb": { "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"], "rows": ["C7", "C6", "B6", "B5", "B7"] diff --git a/keyboards/v4n4g0rth0n/v2/rules.mk b/keyboards/v4n4g0rth0n/v2/rules.mk index 01145044866..cc588202788 100644 --- a/keyboards/v4n4g0rth0n/v2/rules.mk +++ b/keyboards/v4n4g0rth0n/v2/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - ANALOG_DRIVER_REQUIRED = yes diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/keyboard.json similarity index 96% rename from keyboards/vertex/angle65/info.json rename to keyboards/vertex/angle65/keyboard.json index 096e89555aa..962b3fd4f11 100644 --- a/keyboards/vertex/angle65/info.json +++ b/keyboards/vertex/angle65/keyboard.json @@ -9,6 +9,16 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "matrix_pins": { diff --git a/keyboards/vertex/angle65/rules.mk b/keyboards/vertex/angle65/rules.mk index 330f6ff76b8..a521203b326 100644 --- a/keyboards/vertex/angle65/rules.mk +++ b/keyboards/vertex/angle65/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/keyboard.json similarity index 99% rename from keyboards/viktus/minne_topre/info.json rename to keyboards/viktus/minne_topre/keyboard.json index 7928430015d..6919e7f9ccd 100644 --- a/keyboards/viktus/minne_topre/info.json +++ b/keyboards/viktus/minne_topre/keyboard.json @@ -18,9 +18,6 @@ "mousekey": true, "nkro": true }, - "bootmagic": { - "matrix": [0, 0] - }, "build": { "lto": true }, diff --git a/keyboards/viktus/osav2_numpad_topre/info.json b/keyboards/viktus/osav2_numpad_topre/keyboard.json similarity index 100% rename from keyboards/viktus/osav2_numpad_topre/info.json rename to keyboards/viktus/osav2_numpad_topre/keyboard.json diff --git a/keyboards/viktus/osav2_topre/info.json b/keyboards/viktus/osav2_topre/keyboard.json similarity index 100% rename from keyboards/viktus/osav2_topre/info.json rename to keyboards/viktus/osav2_topre/keyboard.json diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/keyboard.json similarity index 99% rename from keyboards/viktus/sp111/info.json rename to keyboards/viktus/sp111/keyboard.json index 67f5b63bcaf..a309c14afe3 100644 --- a/keyboards/viktus/sp111/info.json +++ b/keyboards/viktus/sp111/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5111", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/viktus/sp111/rules.mk b/keyboards/viktus/sp111/rules.mk index 1be8c7ad68a..d9b01484992 100644 --- a/keyboards/viktus/sp111/rules.mk +++ b/keyboards/viktus/sp111/rules.mk @@ -1,18 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Smaller (and slightly faster) firmware - - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/viktus/styrka_topre/info.json b/keyboards/viktus/styrka_topre/keyboard.json similarity index 100% rename from keyboards/viktus/styrka_topre/info.json rename to keyboards/viktus/styrka_topre/keyboard.json diff --git a/keyboards/vinhcatba/uncertainty/info.json b/keyboards/vinhcatba/uncertainty/keyboard.json similarity index 100% rename from keyboards/vinhcatba/uncertainty/info.json rename to keyboards/vinhcatba/uncertainty/keyboard.json diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/keyboard.json similarity index 100% rename from keyboards/vitamins_included/rev1/info.json rename to keyboards/vitamins_included/rev1/keyboard.json diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/vitamins_included/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/keyboard.json similarity index 100% rename from keyboards/vitamins_included/rev2/info.json rename to keyboards/vitamins_included/rev2/keyboard.json