diff --git a/keyboards/epomaker/tide65/info.json b/keyboards/epomaker/tide65/keyboard.json similarity index 100% rename from keyboards/epomaker/tide65/info.json rename to keyboards/epomaker/tide65/keyboard.json diff --git a/keyboards/epomaker/tide65/rules.mk b/keyboards/epomaker/tide65/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/epomaker/tide65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keyten/lisa/info.json b/keyboards/keyten/lisa/keyboard.json similarity index 100% rename from keyboards/keyten/lisa/info.json rename to keyboards/keyten/lisa/keyboard.json diff --git a/keyboards/keyten/lisa/rules.mk b/keyboards/keyten/lisa/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h deleted file mode 100644 index c2949ab3a7..0000000000 --- a/keyboards/maple_computing/jnao/config.h +++ /dev/null @@ -1,24 +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 - diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/keyboard.json similarity index 98% rename from keyboards/maple_computing/jnao/info.json rename to keyboards/maple_computing/jnao/keyboard.json index 861baa95b9..97b51a7680 100644 --- a/keyboards/maple_computing/jnao/info.json +++ b/keyboards/maple_computing/jnao/keyboard.json @@ -27,6 +27,12 @@ "command": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_5x12", "ortho_4x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c similarity index 100% rename from keyboards/maple_computing/lets_split_eh/lets_split_eh.c rename to keyboards/maple_computing/lets_split_eh/eh/eh.c diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/keyboard.json similarity index 100% rename from keyboards/maple_computing/lets_split_eh/eh/info.json rename to keyboards/maple_computing/lets_split_eh/eh/keyboard.json diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/keyboard.json similarity index 100% rename from keyboards/marksard/treadstone48/rev2/info.json rename to keyboards/marksard/treadstone48/rev2/keyboard.json diff --git a/keyboards/marksard/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/keyboard.json similarity index 100% rename from keyboards/massdrop/alt/info.json rename to keyboards/massdrop/alt/keyboard.json diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/keyboard.json similarity index 100% rename from keyboards/massdrop/ctrl/info.json rename to keyboards/massdrop/ctrl/keyboard.json diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/keyboard.json similarity index 99% rename from keyboards/matrix/abelx/info.json rename to keyboards/matrix/abelx/keyboard.json index d62ddf53e2..7fcad281da 100644 --- a/keyboards/matrix/abelx/info.json +++ b/keyboards/matrix/abelx/keyboard.json @@ -34,6 +34,8 @@ "extrakey": true, "rgblight": true }, + "processor": "STM32F411", + "bootloader": "custom", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk index 00a63f4a27..ee9c23c086 100644 --- a/keyboards/matrix/abelx/rules.mk +++ b/keyboards/matrix/abelx/rules.mk @@ -1,33 +1,7 @@ -# -# - the next two should match the directories in -# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -MCU_FAMILY = STM32 -MCU_SERIES = STM32F4xx - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ +# custom bootloader MCU_LDSCRIPT = abelx_boot - -# Startup code to use -# - it should exist in /os/common/startup/ARMCMx/compilers/GCC/mk/ -MCU_STARTUP = stm32f4xx - -# Board: it should exist either in /os/hal/boards/ -# or /boards BOARD = abelx_bd -# Cortex version -MCU = cortex-m4 - -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -ARMV = 7 - -USE_FPU = yes - -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c aw9523b.c diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/keyboard.json similarity index 99% rename from keyboards/matrix/m12og/rev1/info.json rename to keyboards/matrix/m12og/rev1/keyboard.json index d5ee589cc1..c956720a8d 100644 --- a/keyboards/matrix/m12og/rev1/info.json +++ b/keyboards/matrix/m12og/rev1/keyboard.json @@ -40,6 +40,8 @@ "build": { "lto": true }, + "bootloader": "custom", + "processor": "STM32F103", "layout_aliases": { "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan" }, diff --git a/keyboards/matrix/m12og/rev1/rev1.c b/keyboards/matrix/m12og/rev1/rev1.c index 702d3857c4..f517703c60 100644 --- a/keyboards/matrix/m12og/rev1/rev1.c +++ b/keyboards/matrix/m12og/rev1/rev1.c @@ -29,4 +29,6 @@ void keyboard_post_init_kb(void) { rgblight_enable_noeeprom(); rgblight_sethsv_noeeprom(5, 255, 255); rgblight_mode_noeeprom(37); + + keyboard_post_init_user(); } diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk index bc406d1cba..077011cdc1 100644 --- a/keyboards/matrix/m12og/rev1/rules.mk +++ b/keyboards/matrix/m12og/rev1/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = STM32F103 - +# custom bootloader MCU_LDSCRIPT = m12og_v1 - BOARD = m12og_v1 -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/matrix/m12og/rev2/rev2.c b/keyboards/matrix/m12og/rev2/rev2.c index 1a35dff7a9..fb424b164f 100644 --- a/keyboards/matrix/m12og/rev2/rev2.c +++ b/keyboards/matrix/m12og/rev2/rev2.c @@ -4,10 +4,12 @@ #include "quantum.h" -void matrix_init_user(void) { +void matrix_init_kb(void) { setPinOutput(C6); setPinOutput(B2); setPinOutput(B1); + + matrix_init_user(); } bool led_update_kb(led_t led_state) { diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/keyboard.json similarity index 99% rename from keyboards/matrix/m20add/info.json rename to keyboards/matrix/m20add/keyboard.json index 5a999bb484..fc58d242e6 100644 --- a/keyboards/matrix/m20add/info.json +++ b/keyboards/matrix/m20add/keyboard.json @@ -34,6 +34,8 @@ "extrakey": true, "rgblight": true }, + "processor": "STM32F411", + "bootloader": "custom", "layouts": { "LAYOUT_tkl_ansi_tsangan": { "layout": [ diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk index 150bd24e30..980cf9518b 100644 --- a/keyboards/matrix/m20add/rules.mk +++ b/keyboards/matrix/m20add/rules.mk @@ -1,18 +1,7 @@ -# MCU name -MCU = STM32F411 - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ +# custom bootloader MCU_LDSCRIPT = m20add_boot - -# Board: it should exist either in /os/hal/boards/ -# or /boards BOARD = ST_NUCLEO64_F411RE -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.c diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/keyboard.json similarity index 99% rename from keyboards/matrix/noah/info.json rename to keyboards/matrix/noah/keyboard.json index 959c3c8c9c..eb13e16aa2 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/keyboard.json @@ -83,6 +83,8 @@ "rgblight": true, "rgb_matrix": true }, + "processor": "STM32F411", + "bootloader": "custom", "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_default": { diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk index d1c19f36ff..407c120a52 100644 --- a/keyboards/matrix/noah/rules.mk +++ b/keyboards/matrix/noah/rules.mk @@ -1,18 +1,7 @@ -# MCU name -MCU = STM32F411 - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ +# custom bootloader MCU_LDSCRIPT = noah_boot - -# Board: it should exist either in /os/hal/boards/ -# or /boards BOARD = ST_NUCLEO64_F411RE -# Bootloader selection -BOOTLOADER = custom - WS2812_DRIVER_REQUIRED = yes CUSTOM_MATRIX = yes diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/keyboard.json similarity index 100% rename from keyboards/rgbkb/pan/rev1/32a/info.json rename to keyboards/rgbkb/pan/rev1/32a/keyboard.json diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/keyboard.json similarity index 100% rename from keyboards/rgbkb/sol/rev1/info.json rename to keyboards/rgbkb/sol/rev1/keyboard.json diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/keyboard.json similarity index 100% rename from keyboards/rgbkb/sol/rev2/info.json rename to keyboards/rgbkb/sol/rev2/keyboard.json diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/keyboard.json similarity index 100% rename from keyboards/rgbkb/zen/rev2/info.json rename to keyboards/rgbkb/zen/rev2/keyboard.json diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json index 38a2e6bf3f..3d84b37b31 100644 --- a/keyboards/splitkb/kyria/rev1/info.json +++ b/keyboards/splitkb/kyria/rev1/info.json @@ -4,6 +4,15 @@ "pid": "0x9D9D", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "rgblight": { "led_count": 20, "split_count": [10, 10] diff --git a/keyboards/splitkb/kyria/rev1/proton_c/info.json b/keyboards/splitkb/kyria/rev1/proton_c/keyboard.json similarity index 100% rename from keyboards/splitkb/kyria/rev1/proton_c/info.json rename to keyboards/splitkb/kyria/rev1/proton_c/keyboard.json diff --git a/keyboards/splitkb/kyria/rev1/rules.mk b/keyboards/splitkb/kyria/rev1/rules.mk index c4c82d05aa..3a8bfbe089 100644 --- a/keyboards/splitkb/kyria/rev1/rules.mk +++ b/keyboards/splitkb/kyria/rev1/rules.mk @@ -1,13 +1 @@ -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 -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes # Enables the use of OLED displays -ENCODER_ENABLE = yes # Enables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) +DEFAULT_FOLDER = splitkb/kyria/rev1/base diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json index 0290153f4a..80f801e3d1 100644 --- a/keyboards/splitkb/kyria/rev2/info.json +++ b/keyboards/splitkb/kyria/rev2/info.json @@ -4,6 +4,15 @@ "pid": "0x9D9D", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "rgblight": { "led_count": 20, "split_count": [10, 10] diff --git a/keyboards/splitkb/kyria/rev2/proton_c/info.json b/keyboards/splitkb/kyria/rev2/proton_c/keyboard.json similarity index 100% rename from keyboards/splitkb/kyria/rev2/proton_c/info.json rename to keyboards/splitkb/kyria/rev2/proton_c/keyboard.json diff --git a/keyboards/splitkb/kyria/rev2/rules.mk b/keyboards/splitkb/kyria/rev2/rules.mk index c4c82d05aa..fb808070bf 100644 --- a/keyboards/splitkb/kyria/rev2/rules.mk +++ b/keyboards/splitkb/kyria/rev2/rules.mk @@ -1,13 +1 @@ -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 -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes # Enables the use of OLED displays -ENCODER_ENABLE = yes # Enables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) +DEFAULT_FOLDER = splitkb/kyria/rev2/base diff --git a/keyboards/suikagiken/suika85ergo/info.json b/keyboards/suikagiken/suika85ergo/keyboard.json similarity index 100% rename from keyboards/suikagiken/suika85ergo/info.json rename to keyboards/suikagiken/suika85ergo/keyboard.json diff --git a/keyboards/suikagiken/suika85ergo/rules.mk b/keyboards/suikagiken/suika85ergo/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/suikagiken/suika85ergo/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json index ef0cdf5cbe..e28a2e2cb1 100644 --- a/keyboards/yushakobo/navpad/10/info.json +++ b/keyboards/yushakobo/navpad/10/info.json @@ -7,6 +7,14 @@ "vid": "0x3265", "pid": "0x0008" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"} diff --git a/keyboards/yushakobo/navpad/10/rev0/rules.mk b/keyboards/yushakobo/navpad/10/rev0/rules.mk new file mode 100644 index 0000000000..e8ffcca7a6 --- /dev/null +++ b/keyboards/yushakobo/navpad/10/rev0/rules.mk @@ -0,0 +1 @@ +SRC += navpad_prefs.c diff --git a/keyboards/yushakobo/navpad/10/rev1/rules.mk b/keyboards/yushakobo/navpad/10/rev1/rules.mk new file mode 100644 index 0000000000..e8ffcca7a6 --- /dev/null +++ b/keyboards/yushakobo/navpad/10/rev1/rules.mk @@ -0,0 +1 @@ +SRC += navpad_prefs.c diff --git a/keyboards/yushakobo/navpad/10/rules.mk b/keyboards/yushakobo/navpad/10/rules.mk index 61cbbf351d..32daeef814 100644 --- a/keyboards/yushakobo/navpad/10/rules.mk +++ b/keyboards/yushakobo/navpad/10/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes - -SRC += navpad_prefs.c DEFAULT_FOLDER = yushakobo/navpad/10/rev1 diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json similarity index 96% rename from keyboards/yushakobo/navpad/10_helix_r/info.json rename to keyboards/yushakobo/navpad/10_helix_r/keyboard.json index 8084f1f7bd..81854128da 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null], "rows": ["D4", "C6", "D7", "E6", "B4", "F4"] diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk index f30c00650c..e8ffcca7a6 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/rules.mk +++ b/keyboards/yushakobo/navpad/10_helix_r/rules.mk @@ -1,16 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes - SRC += navpad_prefs.c diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/keyboard.json similarity index 92% rename from keyboards/yushakobo/quick17/info.json rename to keyboards/yushakobo/quick17/keyboard.json index 51c41a6e82..aa0d39756d 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812", "max_brightness": 150, diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index 70ab5e2744..083da9448c 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/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 = 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 - -RGB_MATRIX_ENABLE = yes RGB_MATRIX_CUSTOM_KB = yes SRC += quick17_prefs.c diff --git a/keyboards/zsa/voyager/info.json b/keyboards/zsa/voyager/keyboard.json similarity index 100% rename from keyboards/zsa/voyager/info.json rename to keyboards/zsa/voyager/keyboard.json