From 76bd5142cfed1fb8e07b9f32fb0b010fbc068fa4 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 30 Mar 2024 06:51:57 -0700
Subject: [PATCH] Data-Driven Keyboard Conversions: 0-9 (#23357)
---
keyboards/0xc7/61key/config.h | 39 ------
keyboards/0xc7/61key/keyboard.json | 6 +
keyboards/0xcb/1337/config.h | 4 -
keyboards/0xcb/1337/keyboard.json | 6 +
keyboards/0xcb/static/config.h | 5 -
keyboards/0xcb/static/keyboard.json | 4 +
keyboards/1upkeyboards/1up60hse/config.h | 39 ------
keyboards/1upkeyboards/1up60hse/keyboard.json | 6 +
keyboards/1upkeyboards/1up60hte/config.h | 25 ----
keyboards/1upkeyboards/1up60hte/keyboard.json | 6 +
keyboards/1upkeyboards/1up60rgb/config.h | 7 -
keyboards/1upkeyboards/1up60rgb/keyboard.json | 6 +
keyboards/1upkeyboards/pi60/config.h | 9 --
keyboards/1upkeyboards/pi60/keyboard.json | 6 +
keyboards/1upkeyboards/pi60_hse/config.h | 9 --
keyboards/1upkeyboards/pi60_hse/keyboard.json | 6 +
keyboards/1upkeyboards/pi60_rgb/config.h | 9 --
keyboards/1upkeyboards/pi60_rgb/keyboard.json | 6 +
keyboards/1upkeyboards/super16/config.h | 40 ------
keyboards/1upkeyboards/super16/keyboard.json | 6 +
keyboards/1upkeyboards/super16v2/config.h | 5 -
.../1upkeyboards/super16v2/keyboard.json | 6 +
keyboards/1upkeyboards/sweet16/config.h | 7 -
keyboards/1upkeyboards/sweet16/v1/info.json | 33 -----
.../1upkeyboards/sweet16/v1/keyboard.json | 99 ++++++++++++++
keyboards/1upkeyboards/sweet16/v1/rules.mk | 4 -
.../1upkeyboards/sweet16v2/kb2040/config.h | 22 ---
.../sweet16v2/kb2040/keyboard.json | 6 +
.../1upkeyboards/sweet16v2/pro_micro/config.h | 22 ---
.../sweet16v2/pro_micro/keyboard.json | 6 +
keyboards/25keys/aleth42/info.json | 10 --
keyboards/25keys/aleth42/rev0/config.h | 23 ----
.../aleth42/rev0/{info.json => keyboard.json} | 20 +++
keyboards/25keys/aleth42/rev0/rules.mk | 12 --
keyboards/25keys/aleth42/rev1/config.h | 23 ----
.../aleth42/rev1/{info.json => keyboard.json} | 21 +++
keyboards/25keys/aleth42/rev1/rules.mk | 12 --
.../cassette42/{info.json => keyboard.json} | 8 ++
keyboards/25keys/cassette42/rules.mk | 15 ---
keyboards/25keys/zinc/info.json | 15 ---
.../zinc/rev1/{info.json => keyboard.json} | 19 +++
keyboards/25keys/zinc/rev1/rules.mk | 1 -
.../zinc/reva/{info.json => keyboard.json} | 19 +++
keyboards/25keys/zinc/reva/rules.mk | 1 -
keyboards/25keys/zinc/rules.mk | 14 --
keyboards/2key2crawl/config.h | 7 -
keyboards/2key2crawl/keyboard.json | 6 +
keyboards/40percentclub/25/config.h | 5 -
.../25/{info.json => keyboard.json} | 14 ++
keyboards/40percentclub/25/rules.mk | 15 ---
keyboards/40percentclub/4pack/config.h | 39 ------
keyboards/40percentclub/4pack/keyboard.json | 6 +
keyboards/40percentclub/4x4/config.h | 24 ----
.../4x4/{info.json => keyboard.json} | 13 ++
keyboards/40percentclub/4x4/rules.mk | 12 --
keyboards/40percentclub/5x5/config.h | 24 ----
keyboards/40percentclub/5x5/keyboard.json | 6 +
keyboards/40percentclub/6lit/config.h | 5 -
.../6lit/{info.json => keyboard.json} | 14 ++
keyboards/40percentclub/6lit/rules.mk | 15 ---
keyboards/40percentclub/foobar/config.h | 5 -
.../foobar/{info.json => keyboard.json} | 14 ++
keyboards/40percentclub/foobar/rules.mk | 15 ---
keyboards/40percentclub/half_n_half/config.h | 39 ------
.../half_n_half/{info.json => keyboard.json} | 14 ++
keyboards/40percentclub/half_n_half/rules.mk | 15 ---
keyboards/40percentclub/i75/config.h | 38 ------
keyboards/40percentclub/i75/info.json | 125 +++++++++++++++---
.../40percentclub/i75/promicro/keyboard.json | 88 +-----------
.../40percentclub/i75/teensy2/keyboard.json | 88 +-----------
keyboards/40percentclub/luddite/config.h | 7 -
keyboards/40percentclub/luddite/keyboard.json | 6 +
keyboards/40percentclub/mf68/config.h | 39 ------
keyboards/40percentclub/mf68/keyboard.json | 6 +
keyboards/40percentclub/nein/config.h | 38 ------
keyboards/40percentclub/nein/keyboard.json | 6 +
keyboards/40percentclub/nori/config.h | 38 ------
.../nori/{info.json => keyboard.json} | 15 +++
keyboards/40percentclub/nori/rules.mk | 13 --
keyboards/40percentclub/polyandry/config.h | 40 ------
keyboards/40percentclub/polyandry/info.json | 27 ++++
.../polyandry/promicro/keyboard.json | 23 +---
.../polyandry/teensy2/keyboard.json | 23 +---
keyboards/40percentclub/tomato/config.h | 7 -
keyboards/40percentclub/tomato/keyboard.json | 9 ++
keyboards/40percentclub/ut47/config.h | 5 -
.../ut47/{info.json => keyboard.json} | 13 ++
keyboards/40percentclub/ut47/rules.mk | 13 --
keyboards/45_ats/config.h | 25 ----
keyboards/45_ats/keyboard.json | 6 +
.../rev_b/{info.json => keyboard.json} | 7 +
keyboards/4pplet/aekiso60/rev_b/rules.mk | 14 --
.../4pplet/eagle_viper_rep/rev_a/config.h | 5 -
.../rev_a/{info.json => keyboard.json} | 16 +++
.../4pplet/eagle_viper_rep/rev_a/rules.mk | 13 --
.../4pplet/eagle_viper_rep/rev_b/config.h | 5 -
.../rev_b/{info.json => keyboard.json} | 15 +++
.../4pplet/eagle_viper_rep/rev_b/rules.mk | 13 --
.../rev_a/{info.json => keyboard.json} | 3 +-
keyboards/4pplet/steezy60/rev_a/rules.mk | 4 -
.../rev_b/{info.json => keyboard.json} | 3 +-
keyboards/4pplet/steezy60/rev_b/rules.mk | 6 -
.../rev_a/{info.json => keyboard.json} | 3 +-
.../4pplet/unextended_std/rev_a/rules.mk | 6 -
.../rev_d/{info.json => keyboard.json} | 7 +
keyboards/4pplet/waffling60/rev_d/rules.mk | 14 --
.../rev_d_ansi/{info.json => keyboard.json} | 6 +
.../4pplet/waffling60/rev_d_ansi/rules.mk | 14 --
.../rev_d_iso/{info.json => keyboard.json} | 5 +
.../4pplet/waffling60/rev_d_iso/rules.mk | 14 --
.../rev_b/{info.json => keyboard.json} | 7 +
keyboards/4pplet/waffling80/rev_b/rules.mk | 14 --
keyboards/4pplet/yakiimo/rev_a/config.h | 22 ---
keyboards/4pplet/yakiimo/rev_a/keyboard.json | 6 +
keyboards/8pack/config.h | 7 -
keyboards/8pack/info.json | 6 +
116 files changed, 630 insertions(+), 1277 deletions(-)
delete mode 100644 keyboards/0xc7/61key/config.h
delete mode 100644 keyboards/1upkeyboards/1up60hse/config.h
delete mode 100644 keyboards/1upkeyboards/1up60hte/config.h
delete mode 100644 keyboards/1upkeyboards/1up60rgb/config.h
delete mode 100644 keyboards/1upkeyboards/pi60/config.h
delete mode 100644 keyboards/1upkeyboards/pi60_hse/config.h
delete mode 100644 keyboards/1upkeyboards/pi60_rgb/config.h
delete mode 100644 keyboards/1upkeyboards/super16/config.h
delete mode 100644 keyboards/1upkeyboards/sweet16/config.h
delete mode 100644 keyboards/1upkeyboards/sweet16/v1/info.json
create mode 100644 keyboards/1upkeyboards/sweet16/v1/keyboard.json
delete mode 100644 keyboards/1upkeyboards/sweet16/v1/rules.mk
delete mode 100644 keyboards/1upkeyboards/sweet16v2/kb2040/config.h
delete mode 100644 keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
delete mode 100644 keyboards/25keys/aleth42/info.json
delete mode 100644 keyboards/25keys/aleth42/rev0/config.h
rename keyboards/25keys/aleth42/rev0/{info.json => keyboard.json} (87%)
delete mode 100644 keyboards/25keys/aleth42/rev0/rules.mk
delete mode 100644 keyboards/25keys/aleth42/rev1/config.h
rename keyboards/25keys/aleth42/rev1/{info.json => keyboard.json} (87%)
delete mode 100644 keyboards/25keys/aleth42/rev1/rules.mk
rename keyboards/25keys/cassette42/{info.json => keyboard.json} (89%)
delete mode 100644 keyboards/25keys/zinc/info.json
rename keyboards/25keys/zinc/rev1/{info.json => keyboard.json} (86%)
delete mode 100644 keyboards/25keys/zinc/rev1/rules.mk
rename keyboards/25keys/zinc/reva/{info.json => keyboard.json} (86%)
delete mode 100644 keyboards/25keys/zinc/reva/rules.mk
delete mode 100644 keyboards/2key2crawl/config.h
rename keyboards/40percentclub/25/{info.json => keyboard.json} (94%)
delete mode 100644 keyboards/40percentclub/25/rules.mk
delete mode 100644 keyboards/40percentclub/4pack/config.h
delete mode 100644 keyboards/40percentclub/4x4/config.h
rename keyboards/40percentclub/4x4/{info.json => keyboard.json} (97%)
delete mode 100644 keyboards/40percentclub/5x5/config.h
rename keyboards/40percentclub/6lit/{info.json => keyboard.json} (86%)
delete mode 100644 keyboards/40percentclub/6lit/rules.mk
rename keyboards/40percentclub/foobar/{info.json => keyboard.json} (91%)
delete mode 100644 keyboards/40percentclub/foobar/rules.mk
delete mode 100644 keyboards/40percentclub/half_n_half/config.h
rename keyboards/40percentclub/half_n_half/{info.json => keyboard.json} (91%)
delete mode 100644 keyboards/40percentclub/half_n_half/rules.mk
delete mode 100644 keyboards/40percentclub/i75/config.h
delete mode 100644 keyboards/40percentclub/luddite/config.h
delete mode 100644 keyboards/40percentclub/mf68/config.h
delete mode 100644 keyboards/40percentclub/nein/config.h
delete mode 100644 keyboards/40percentclub/nori/config.h
rename keyboards/40percentclub/nori/{info.json => keyboard.json} (95%)
delete mode 100644 keyboards/40percentclub/polyandry/config.h
delete mode 100644 keyboards/40percentclub/tomato/config.h
rename keyboards/40percentclub/ut47/{info.json => keyboard.json} (92%)
delete mode 100644 keyboards/45_ats/config.h
rename keyboards/4pplet/aekiso60/rev_b/{info.json => keyboard.json} (86%)
rename keyboards/4pplet/eagle_viper_rep/rev_a/{info.json => keyboard.json} (99%)
rename keyboards/4pplet/eagle_viper_rep/rev_b/{info.json => keyboard.json} (99%)
rename keyboards/4pplet/steezy60/rev_a/{info.json => keyboard.json} (99%)
delete mode 100644 keyboards/4pplet/steezy60/rev_a/rules.mk
rename keyboards/4pplet/steezy60/rev_b/{info.json => keyboard.json} (99%)
rename keyboards/4pplet/unextended_std/rev_a/{info.json => keyboard.json} (99%)
rename keyboards/4pplet/waffling60/rev_d/{info.json => keyboard.json} (96%)
rename keyboards/4pplet/waffling60/rev_d_ansi/{info.json => keyboard.json} (97%)
rename keyboards/4pplet/waffling60/rev_d_iso/{info.json => keyboard.json} (99%)
rename keyboards/4pplet/waffling80/rev_b/{info.json => keyboard.json} (78%)
delete mode 100644 keyboards/8pack/config.h
diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h
deleted file mode 100644
index 244a5f192d..0000000000
--- a/keyboards/0xc7/61key/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 0xC7
-
-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/0xc7/61key/keyboard.json b/keyboards/0xc7/61key/keyboard.json
index 6585b970c1..ab5127db38 100644
--- a/keyboards/0xc7/61key/keyboard.json
+++ b/keyboards/0xc7/61key/keyboard.json
@@ -20,6 +20,12 @@
"mousekey": false,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"],
"rows": ["B0", "B1", "B2", "B3", "B7"]
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index 5791b324b6..5fec622271 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
/* default setup after eeprom reset */
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
-/* 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
/* Oled Size */
#define OLED_DISPLAY_128X64
#define OLED_FONT_END 255
diff --git a/keyboards/0xcb/1337/keyboard.json b/keyboards/0xcb/1337/keyboard.json
index 5b583dc291..f264d4ed06 100644
--- a/keyboards/0xcb/1337/keyboard.json
+++ b/keyboards/0xcb/1337/keyboard.json
@@ -19,6 +19,10 @@
]
},
"qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ },
"tap_keycode_delay": 10
},
"qmk_lufa_bootloader": {
@@ -80,9 +84,11 @@
{"x": 0, "y": 0, "matrix": [0, 0]},
{"x": 1, "y": 0, "matrix": [0, 1]},
{"x": 2, "y": 0, "matrix": [0, 2]},
+
{"x": 0, "y": 1, "matrix": [1, 0]},
{"x": 1, "y": 1, "matrix": [1, 1]},
{"x": 2, "y": 1, "matrix": [1, 2]},
+
{"x": 0, "y": 2, "matrix": [2, 0]},
{"x": 1, "y": 2, "matrix": [2, 1]},
{"x": 2, "y": 2, "matrix": [2, 2]}
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index 179c84088b..60d9ff232a 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -16,11 +16,6 @@ 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
-
/* oled custom font */
#define OLED_FONT_END 255
#define OLED_FONT_H "gfxfont.c"
diff --git a/keyboards/0xcb/static/keyboard.json b/keyboards/0xcb/static/keyboard.json
index cd3d492870..73a6a802cc 100644
--- a/keyboards/0xcb/static/keyboard.json
+++ b/keyboards/0xcb/static/keyboard.json
@@ -32,6 +32,10 @@
]
},
"qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ },
"tap_keycode_delay": 10
},
"processor": "atmega328p",
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
deleted file mode 100644
index d876570c80..0000000000
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 MechMerlin
-
-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/1upkeyboards/1up60hse/keyboard.json b/keyboards/1upkeyboards/1up60hse/keyboard.json
index ac8d524712..990b51c1f8 100644
--- a/keyboards/1upkeyboards/1up60hse/keyboard.json
+++ b/keyboards/1upkeyboards/1up60hse/keyboard.json
@@ -31,6 +31,12 @@
"levels": 5,
"breathing": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
deleted file mode 100644
index eddf290b4c..0000000000
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2019 Bubnick
-
-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/1upkeyboards/1up60hte/keyboard.json b/keyboards/1upkeyboards/1up60hte/keyboard.json
index 25f519bea7..53e91017dd 100644
--- a/keyboards/1upkeyboards/1up60hte/keyboard.json
+++ b/keyboards/1upkeyboards/1up60hte/keyboard.json
@@ -26,6 +26,12 @@
"rows": ["B3", "B2", "B1", "B0", "D4"]
},
"diode_direction": "COL2ROW",
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"backlight": {
"pin": "B7"
},
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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/1upkeyboards/1up60rgb/keyboard.json b/keyboards/1upkeyboards/1up60rgb/keyboard.json
index 2985b5ae4f..f4ba111251 100644
--- a/keyboards/1upkeyboards/1up60rgb/keyboard.json
+++ b/keyboards/1upkeyboards/1up60rgb/keyboard.json
@@ -18,6 +18,12 @@
"nkro": true,
"rgblight": 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", "D2", "D3", "D5"]
diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h
deleted file mode 100644
index a697e565c9..0000000000
--- a/keyboards/1upkeyboards/pi60/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60/keyboard.json b/keyboards/1upkeyboards/pi60/keyboard.json
index 71619db360..45c3876a6b 100644
--- a/keyboards/1upkeyboards/pi60/keyboard.json
+++ b/keyboards/1upkeyboards/pi60/keyboard.json
@@ -24,6 +24,12 @@
"nkro": false,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"ws2812": {
"pin": "GP17",
"driver": "vendor"
diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h
deleted file mode 100644
index 2c04274299..0000000000
--- a/keyboards/1upkeyboards/pi60_hse/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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/1upkeyboards/pi60_hse/keyboard.json b/keyboards/1upkeyboards/pi60_hse/keyboard.json
index 204e42f48c..d5a5f86187 100644
--- a/keyboards/1upkeyboards/pi60_hse/keyboard.json
+++ b/keyboards/1upkeyboards/pi60_hse/keyboard.json
@@ -23,6 +23,12 @@
"nkro": false,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"ws2812": {
"pin": "GP15",
"driver": "vendor"
diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h
deleted file mode 100644
index 2c04274299..0000000000
--- a/keyboards/1upkeyboards/pi60_rgb/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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/1upkeyboards/pi60_rgb/keyboard.json b/keyboards/1upkeyboards/pi60_rgb/keyboard.json
index b6580e616a..21dab3f71a 100644
--- a/keyboards/1upkeyboards/pi60_rgb/keyboard.json
+++ b/keyboards/1upkeyboards/pi60_rgb/keyboard.json
@@ -23,6 +23,12 @@
"nkro": false,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"ws2812": {
"pin": "GP19",
"driver": "vendor"
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
deleted file mode 100644
index 043d8b154b..0000000000
--- a/keyboards/1upkeyboards/super16/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2019 MechMerlin
-
-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/1upkeyboards/super16/keyboard.json b/keyboards/1upkeyboards/super16/keyboard.json
index 4bc18e98f7..9da4168d47 100644
--- a/keyboards/1upkeyboards/super16/keyboard.json
+++ b/keyboards/1upkeyboards/super16/keyboard.json
@@ -86,6 +86,12 @@
"nkro": false,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D4", "C6", "F6", "F7"],
"rows": ["D1", "D0", "F4", "F5"]
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 67af6d7cab..6abfa8f431 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -18,11 +18,6 @@
#define MOUSEKEY_MOVE_DELTA 25
-/* 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.
diff --git a/keyboards/1upkeyboards/super16v2/keyboard.json b/keyboards/1upkeyboards/super16v2/keyboard.json
index 3bc7bf0e07..652b03006e 100644
--- a/keyboards/1upkeyboards/super16v2/keyboard.json
+++ b/keyboards/1upkeyboards/super16v2/keyboard.json
@@ -59,6 +59,12 @@
"nkro": false,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D5", "D6", "C2", "D0"],
"rows": ["D1", "D2", "D3", "D4"]
diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/1upkeyboards/sweet16/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json
deleted file mode 100644
index bbecccae02..0000000000
--- a/keyboards/1upkeyboards/sweet16/v1/info.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "usb": {
- "pid": "0x0161",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 1,
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "rgb_test": true,
- "alternating": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "pin": "B1"
- },
- "matrix_pins": {
- "cols": ["D1", "D0", "D4", "C6"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina"
-}
diff --git a/keyboards/1upkeyboards/sweet16/v1/keyboard.json b/keyboards/1upkeyboards/sweet16/v1/keyboard.json
new file mode 100644
index 0000000000..3ac73ce8eb
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/v1/keyboard.json
@@ -0,0 +1,99 @@
+{
+ "keyboard_name": "Sweet16",
+ "manufacturer": "1up Keyboards",
+ "url": "",
+ "maintainer": "skullydazed",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x0161",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 1,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "pin": "B1"
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_ortho_4x4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3}
+ ]
+ },
+ "LAYOUT_numpad_4x4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0, "h": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 2], "x": 2, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/1upkeyboards/sweet16/v1/rules.mk b/keyboards/1upkeyboards/sweet16/v1/rules.mk
deleted file mode 100644
index 0912a1b4a6..0000000000
--- a/keyboards/1upkeyboards/sweet16/v1/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-
-LTO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
deleted file mode 100644
index 39e43b90cd..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 ziptyze
- *
- * 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/1upkeyboards/sweet16v2/kb2040/keyboard.json b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
index 0d09632a99..d8d6c5e3ea 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
@@ -21,6 +21,12 @@
"nkro": false,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"ws2812": {
"pin": "GP6",
"driver": "vendor"
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
deleted file mode 100644
index 39e43b90cd..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 ziptyze
- *
- * 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/1upkeyboards/sweet16v2/pro_micro/keyboard.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
index d23bc6633d..d46f723a17 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
@@ -20,6 +20,12 @@
"nkro": false,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"ws2812": {
"pin": "D7"
},
diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json
deleted file mode 100644
index 2000c037f5..0000000000
--- a/keyboards/25keys/aleth42/info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "keyboard_name": "ALETH42",
- "manufacturer": "25KEYS",
- "url": "http://www.sho-k.co.uk/tech/aleth42",
- "maintainer": "monksoffunk",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEAC8"
- }
-}
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
deleted file mode 100644
index 0d7a5de560..0000000000
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 monksoffunk
-
-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/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/keyboard.json
similarity index 87%
rename from keyboards/25keys/aleth42/rev0/info.json
rename to keyboards/25keys/aleth42/rev0/keyboard.json
index 675c741bf5..bbb566d909 100644
--- a/keyboards/25keys/aleth42/rev0/info.json
+++ b/keyboards/25keys/aleth42/rev0/keyboard.json
@@ -1,7 +1,27 @@
{
+ "keyboard_name": "ALETH42",
+ "manufacturer": "25KEYS",
+ "url": "http://www.sho-k.co.uk/tech/aleth42",
+ "maintainer": "monksoffunk",
"usb": {
+ "vid": "0x04D8",
+ "pid": "0xEAC8",
"device_version": "0.0.0"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "rgblight": true,
+ "encoder": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"],
"rows": ["B0", "B1", "B2", "B3"]
diff --git a/keyboards/25keys/aleth42/rev0/rules.mk b/keyboards/25keys/aleth42/rev0/rules.mk
deleted file mode 100644
index e0954e7355..0000000000
--- a/keyboards/25keys/aleth42/rev0/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 = 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
-ENCODER_ENABLE = yes
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
deleted file mode 100644
index 0d7a5de560..0000000000
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 monksoffunk
-
-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/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/keyboard.json
similarity index 87%
rename from keyboards/25keys/aleth42/rev1/info.json
rename to keyboards/25keys/aleth42/rev1/keyboard.json
index fd4b07fe3e..0feab708a0 100644
--- a/keyboards/25keys/aleth42/rev1/info.json
+++ b/keyboards/25keys/aleth42/rev1/keyboard.json
@@ -1,7 +1,28 @@
{
+ "keyboard_name": "ALETH42",
+ "manufacturer": "25KEYS",
+ "url": "http://www.sho-k.co.uk/tech/aleth42",
+ "maintainer": "monksoffunk",
"usb": {
+ "vid": "0x04D8",
+ "pid": "0xEAC8",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "backlight": true,
+ "rgblight": true,
+ "encoder": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"],
"rows": ["B4", "B0", "B2", "B1"]
diff --git a/keyboards/25keys/aleth42/rev1/rules.mk b/keyboards/25keys/aleth42/rev1/rules.mk
deleted file mode 100644
index 683b249802..0000000000
--- a/keyboards/25keys/aleth42/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 = 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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/keyboard.json
similarity index 89%
rename from keyboards/25keys/cassette42/info.json
rename to keyboards/25keys/cassette42/keyboard.json
index 38a73368f6..cba2e61272 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xCA42",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "rgblight": true,
+ "encoder": true,
+ "oled": true
+ },
"encoder": {
"rotary": [
{"pin_a": "B6", "pin_b": "B2"},
diff --git a/keyboards/25keys/cassette42/rules.mk b/keyboards/25keys/cassette42/rules.mk
index f8febbdec8..788ba43e59 100644
--- a/keyboards/25keys/cassette42/rules.mk
+++ b/keyboards/25keys/cassette42/rules.mk
@@ -1,16 +1 @@
-# 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 = yes
-OLED_ENABLE = yes
-
SRC += ./common/oled_helper.c
diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json
deleted file mode 100644
index 2350242316..0000000000
--- a/keyboards/25keys/zinc/info.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "manufacturer": "25KEYS",
- "url": "https://github.com/monksoffunk/zinc",
- "maintainer": "monksoffunk",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEA3B",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina"
-}
diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/keyboard.json
similarity index 86%
rename from keyboards/25keys/zinc/rev1/info.json
rename to keyboards/25keys/zinc/rev1/keyboard.json
index 47fb1f2e98..c1bead2d8a 100644
--- a/keyboards/25keys/zinc/rev1/info.json
+++ b/keyboards/25keys/zinc/rev1/keyboard.json
@@ -1,16 +1,35 @@
{
"keyboard_name": "Zinc rev.1",
+ "manufacturer": "25KEYS",
+ "url": "https://github.com/monksoffunk/zinc",
+ "maintainer": "monksoffunk",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEA3B",
+ "device_version": "0.0.1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"matrix_pins": {
"cols": ["F4", "D4", "C6", "D7", "E6", "B4"],
"rows": ["F6", "F7", "B1", "B3"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"tapping": {
"term": 100
},
+ "rgb_matrix": {
+ "driver": "ws2812"
+ },
"rgblight": {
"hue_steps": 10
},
diff --git a/keyboards/25keys/zinc/rev1/rules.mk b/keyboards/25keys/zinc/rev1/rules.mk
deleted file mode 100644
index d38a618090..0000000000
--- a/keyboards/25keys/zinc/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/keyboard.json
similarity index 86%
rename from keyboards/25keys/zinc/reva/info.json
rename to keyboards/25keys/zinc/reva/keyboard.json
index 1ab2fb7e38..01d2291c49 100644
--- a/keyboards/25keys/zinc/reva/info.json
+++ b/keyboards/25keys/zinc/reva/keyboard.json
@@ -1,16 +1,35 @@
{
"keyboard_name": "Zinc rev.A",
+ "manufacturer": "25KEYS",
+ "url": "https://github.com/monksoffunk/zinc",
+ "maintainer": "monksoffunk",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEA3B",
+ "device_version": "0.0.1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
"rows": ["D4", "C6", "D7", "E6"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"tapping": {
"term": 100
},
+ "rgb_matrix": {
+ "driver": "ws2812"
+ },
"rgblight": {
"hue_steps": 10
},
diff --git a/keyboards/25keys/zinc/reva/rules.mk b/keyboards/25keys/zinc/reva/rules.mk
deleted file mode 100644
index 83895bdcb8..0000000000
--- a/keyboards/25keys/zinc/reva/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
index 1e1d687ebb..a8c773a305 100644
--- a/keyboards/25keys/zinc/rules.mk
+++ b/keyboards/25keys/zinc/rules.mk
@@ -1,17 +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
-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. Do not enable this with audio at the same time.
-RGB_MATRIX_ENABLE = no
-
DEFAULT_FOLDER = 25keys/zinc/rev1
#SRC += i2c.c
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/2key2crawl/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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/2key2crawl/keyboard.json b/keyboards/2key2crawl/keyboard.json
index 4dfecbd696..fec55c811a 100644
--- a/keyboards/2key2crawl/keyboard.json
+++ b/keyboards/2key2crawl/keyboard.json
@@ -17,6 +17,12 @@
"mousekey": false,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B3", "B4", "B5", "B6", "B7", "C7", "B2"],
"rows": ["C4", "C5"]
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index 20ecf94708..1710ba42ee 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -21,11 +21,6 @@
//#define MASTER_RIGHT
//#define EE_HANDS
-/* 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.
diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/keyboard.json
similarity index 94%
rename from keyboards/40percentclub/25/info.json
rename to keyboards/40percentclub/25/keyboard.json
index b5ab2c0cbd..aede80ef17 100644
--- a/keyboards/40percentclub/25/info.json
+++ b/keyboards/40percentclub/25/keyboard.json
@@ -13,7 +13,21 @@
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/40percentclub/25/rules.mk b/keyboards/40percentclub/25/rules.mk
deleted file mode 100644
index 25d4c40051..0000000000
--- a/keyboards/40percentclub/25/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
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h
deleted file mode 100644
index b0cf6b6f6a..0000000000
--- a/keyboards/40percentclub/4pack/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Arda Kilicdagi
-
-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/40percentclub/4pack/keyboard.json b/keyboards/40percentclub/4pack/keyboard.json
index edfd64ad33..a114e97dbb 100644
--- a/keyboards/40percentclub/4pack/keyboard.json
+++ b/keyboards/40percentclub/4pack/keyboard.json
@@ -23,6 +23,12 @@
"mousekey": false,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"direct": [
["E6", "D7", "C6", "D4"]
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
deleted file mode 100644
index 7caa265c1a..0000000000
--- a/keyboards/40percentclub/4x4/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-#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/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/keyboard.json
similarity index 97%
rename from keyboards/40percentclub/4x4/info.json
rename to keyboards/40percentclub/4x4/keyboard.json
index aa5e039637..735a3865da 100644
--- a/keyboards/40percentclub/4x4/info.json
+++ b/keyboards/40percentclub/4x4/keyboard.json
@@ -15,6 +15,19 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"community_layouts": ["ortho_4x4", "ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x4": {
diff --git a/keyboards/40percentclub/4x4/rules.mk b/keyboards/40percentclub/4x4/rules.mk
index dfb1a682dc..1605120646 100644
--- a/keyboards/40percentclub/4x4/rules.mk
+++ b/keyboards/40percentclub/4x4/rules.mk
@@ -1,15 +1,3 @@
-# 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
deleted file mode 100644
index 7caa265c1a..0000000000
--- a/keyboards/40percentclub/5x5/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-#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/40percentclub/5x5/keyboard.json b/keyboards/40percentclub/5x5/keyboard.json
index 0a50d29ffe..039d9fe47b 100644
--- a/keyboards/40percentclub/5x5/keyboard.json
+++ b/keyboards/40percentclub/5x5/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
"rows": ["B2", "D1", "D0", "D4", "C6"]
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index 20ecf94708..1710ba42ee 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -21,11 +21,6 @@
//#define MASTER_RIGHT
//#define EE_HANDS
-/* 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.
diff --git a/keyboards/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/keyboard.json
similarity index 86%
rename from keyboards/40percentclub/6lit/info.json
rename to keyboards/40percentclub/6lit/keyboard.json
index 00e91edb42..06ffc890d2 100644
--- a/keyboards/40percentclub/6lit/info.json
+++ b/keyboards/40percentclub/6lit/keyboard.json
@@ -13,7 +13,21 @@
"rows": ["D7", "E6"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/40percentclub/6lit/rules.mk b/keyboards/40percentclub/6lit/rules.mk
deleted file mode 100644
index 25d4c40051..0000000000
--- a/keyboards/40percentclub/6lit/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
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index 20ecf94708..1710ba42ee 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -21,11 +21,6 @@
//#define MASTER_RIGHT
//#define EE_HANDS
-/* 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.
diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/keyboard.json
similarity index 91%
rename from keyboards/40percentclub/foobar/info.json
rename to keyboards/40percentclub/foobar/keyboard.json
index 89fc4d11a0..0a2769e04a 100644
--- a/keyboards/40percentclub/foobar/info.json
+++ b/keyboards/40percentclub/foobar/keyboard.json
@@ -13,7 +13,21 @@
"rows": ["D7", "E6", "B4"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/40percentclub/foobar/rules.mk b/keyboards/40percentclub/foobar/rules.mk
deleted file mode 100644
index 25d4c40051..0000000000
--- a/keyboards/40percentclub/foobar/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
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
deleted file mode 100644
index 8b4ccf1479..0000000000
--- a/keyboards/40percentclub/half_n_half/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Boy_314
-
-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/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/keyboard.json
similarity index 91%
rename from keyboards/40percentclub/half_n_half/info.json
rename to keyboards/40percentclub/half_n_half/keyboard.json
index 8174e639c2..3e0c646a50 100644
--- a/keyboards/40percentclub/half_n_half/info.json
+++ b/keyboards/40percentclub/half_n_half/keyboard.json
@@ -13,7 +13,21 @@
"rows": ["D4", "C6", "D7", "E6"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/40percentclub/half_n_half/rules.mk b/keyboards/40percentclub/half_n_half/rules.mk
deleted file mode 100644
index 8ee80d039b..0000000000
--- a/keyboards/40percentclub/half_n_half/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/40percentclub/i75/config.h b/keyboards/40percentclub/i75/config.h
deleted file mode 100644
index 0fe9b9df21..0000000000
--- a/keyboards/40percentclub/i75/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2018
- *
- * 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/40percentclub/i75/info.json b/keyboards/40percentclub/i75/info.json
index f91b054f29..a7124adec2 100644
--- a/keyboards/40percentclub/i75/info.json
+++ b/keyboards/40percentclub/i75/info.json
@@ -1,19 +1,110 @@
{
- "keyboard_name": "i75",
- "manufacturer": "di0ib",
- "url": "",
- "maintainer": "qmk",
- "features": {
- "bootmagic": true,
- "command": true,
- "console": true,
- "extrakey": true,
- "mousekey": true,
- "nkro": false
- },
- "usb": {
- "vid": "0x4025",
- "pid": "0x0A0C",
- "device_version": "1.7.5"
- }
+ "keyboard_name": "i75",
+ "manufacturer": "di0ib",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x0A0C",
+ "device_version": "1.7.5"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "community_layouts": ["ortho_5x15"],
+ "layouts": {
+ "LAYOUT_ortho_5x15": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [1, 0], "x": 9, "y": 0},
+ {"matrix": [1, 1], "x": 10, "y": 0},
+ {"matrix": [1, 2], "x": 11, "y": 0},
+ {"matrix": [1, 3], "x": 12, "y": 0},
+ {"matrix": [1, 4], "x": 13, "y": 0},
+ {"matrix": [1, 5], "x": 14, "y": 0},
+
+ {"matrix": [1, 6], "x": 0, "y": 1},
+ {"matrix": [1, 7], "x": 1, "y": 1},
+ {"matrix": [1, 8], "x": 2, "y": 1},
+ {"matrix": [2, 0], "x": 3, "y": 1},
+ {"matrix": [2, 1], "x": 4, "y": 1},
+ {"matrix": [2, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [2, 4], "x": 7, "y": 1},
+ {"matrix": [2, 5], "x": 8, "y": 1},
+ {"matrix": [2, 6], "x": 9, "y": 1},
+ {"matrix": [2, 7], "x": 10, "y": 1},
+ {"matrix": [2, 8], "x": 11, "y": 1},
+ {"matrix": [3, 0], "x": 12, "y": 1},
+ {"matrix": [3, 1], "x": 13, "y": 1},
+ {"matrix": [3, 2], "x": 14, "y": 1},
+
+ {"matrix": [3, 3], "x": 0, "y": 2},
+ {"matrix": [3, 4], "x": 1, "y": 2},
+ {"matrix": [3, 5], "x": 2, "y": 2},
+ {"matrix": [3, 6], "x": 3, "y": 2},
+ {"matrix": [3, 7], "x": 4, "y": 2},
+ {"matrix": [3, 8], "x": 5, "y": 2},
+ {"matrix": [4, 0], "x": 6, "y": 2},
+ {"matrix": [4, 1], "x": 7, "y": 2},
+ {"matrix": [4, 2], "x": 8, "y": 2},
+ {"matrix": [4, 3], "x": 9, "y": 2},
+ {"matrix": [4, 4], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [4, 7], "x": 13, "y": 2},
+ {"matrix": [4, 8], "x": 14, "y": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 3},
+ {"matrix": [5, 1], "x": 1, "y": 3},
+ {"matrix": [5, 2], "x": 2, "y": 3},
+ {"matrix": [5, 3], "x": 3, "y": 3},
+ {"matrix": [5, 4], "x": 4, "y": 3},
+ {"matrix": [5, 5], "x": 5, "y": 3},
+ {"matrix": [5, 6], "x": 6, "y": 3},
+ {"matrix": [5, 7], "x": 7, "y": 3},
+ {"matrix": [5, 8], "x": 8, "y": 3},
+ {"matrix": [6, 0], "x": 9, "y": 3},
+ {"matrix": [6, 1], "x": 10, "y": 3},
+ {"matrix": [6, 2], "x": 11, "y": 3},
+ {"matrix": [6, 3], "x": 12, "y": 3},
+ {"matrix": [6, 4], "x": 13, "y": 3},
+ {"matrix": [6, 5], "x": 14, "y": 3},
+
+ {"matrix": [6, 6], "x": 0, "y": 4},
+ {"matrix": [6, 7], "x": 1, "y": 4},
+ {"matrix": [6, 8], "x": 2, "y": 4},
+ {"matrix": [7, 0], "x": 3, "y": 4},
+ {"matrix": [7, 1], "x": 4, "y": 4},
+ {"matrix": [7, 2], "x": 5, "y": 4},
+ {"matrix": [7, 3], "x": 6, "y": 4},
+ {"matrix": [7, 4], "x": 7, "y": 4},
+ {"matrix": [7, 5], "x": 8, "y": 4},
+ {"matrix": [7, 6], "x": 9, "y": 4},
+ {"matrix": [7, 7], "x": 10, "y": 4},
+ {"matrix": [7, 8], "x": 11, "y": 4},
+ {"matrix": [8, 0], "x": 12, "y": 4},
+ {"matrix": [8, 1], "x": 13, "y": 4},
+ {"matrix": [8, 2], "x": 14, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/40percentclub/i75/promicro/keyboard.json b/keyboards/40percentclub/i75/promicro/keyboard.json
index 4c3f44469c..933c4f8616 100644
--- a/keyboards/40percentclub/i75/promicro/keyboard.json
+++ b/keyboards/40percentclub/i75/promicro/keyboard.json
@@ -5,91 +5,5 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "caterina",
- "community_layouts": ["ortho_5x15"],
- "layouts": {
- "LAYOUT_ortho_5x15": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [1, 0], "x": 9, "y": 0},
- {"matrix": [1, 1], "x": 10, "y": 0},
- {"matrix": [1, 2], "x": 11, "y": 0},
- {"matrix": [1, 3], "x": 12, "y": 0},
- {"matrix": [1, 4], "x": 13, "y": 0},
- {"matrix": [1, 5], "x": 14, "y": 0},
-
- {"matrix": [1, 6], "x": 0, "y": 1},
- {"matrix": [1, 7], "x": 1, "y": 1},
- {"matrix": [1, 8], "x": 2, "y": 1},
- {"matrix": [2, 0], "x": 3, "y": 1},
- {"matrix": [2, 1], "x": 4, "y": 1},
- {"matrix": [2, 2], "x": 5, "y": 1},
- {"matrix": [2, 3], "x": 6, "y": 1},
- {"matrix": [2, 4], "x": 7, "y": 1},
- {"matrix": [2, 5], "x": 8, "y": 1},
- {"matrix": [2, 6], "x": 9, "y": 1},
- {"matrix": [2, 7], "x": 10, "y": 1},
- {"matrix": [2, 8], "x": 11, "y": 1},
- {"matrix": [3, 0], "x": 12, "y": 1},
- {"matrix": [3, 1], "x": 13, "y": 1},
- {"matrix": [3, 2], "x": 14, "y": 1},
-
- {"matrix": [3, 3], "x": 0, "y": 2},
- {"matrix": [3, 4], "x": 1, "y": 2},
- {"matrix": [3, 5], "x": 2, "y": 2},
- {"matrix": [3, 6], "x": 3, "y": 2},
- {"matrix": [3, 7], "x": 4, "y": 2},
- {"matrix": [3, 8], "x": 5, "y": 2},
- {"matrix": [4, 0], "x": 6, "y": 2},
- {"matrix": [4, 1], "x": 7, "y": 2},
- {"matrix": [4, 2], "x": 8, "y": 2},
- {"matrix": [4, 3], "x": 9, "y": 2},
- {"matrix": [4, 4], "x": 10, "y": 2},
- {"matrix": [4, 5], "x": 11, "y": 2},
- {"matrix": [4, 6], "x": 12, "y": 2},
- {"matrix": [4, 7], "x": 13, "y": 2},
- {"matrix": [4, 8], "x": 14, "y": 2},
-
- {"matrix": [5, 0], "x": 0, "y": 3},
- {"matrix": [5, 1], "x": 1, "y": 3},
- {"matrix": [5, 2], "x": 2, "y": 3},
- {"matrix": [5, 3], "x": 3, "y": 3},
- {"matrix": [5, 4], "x": 4, "y": 3},
- {"matrix": [5, 5], "x": 5, "y": 3},
- {"matrix": [5, 6], "x": 6, "y": 3},
- {"matrix": [5, 7], "x": 7, "y": 3},
- {"matrix": [5, 8], "x": 8, "y": 3},
- {"matrix": [6, 0], "x": 9, "y": 3},
- {"matrix": [6, 1], "x": 10, "y": 3},
- {"matrix": [6, 2], "x": 11, "y": 3},
- {"matrix": [6, 3], "x": 12, "y": 3},
- {"matrix": [6, 4], "x": 13, "y": 3},
- {"matrix": [6, 5], "x": 14, "y": 3},
-
- {"matrix": [6, 6], "x": 0, "y": 4},
- {"matrix": [6, 7], "x": 1, "y": 4},
- {"matrix": [6, 8], "x": 2, "y": 4},
- {"matrix": [7, 0], "x": 3, "y": 4},
- {"matrix": [7, 1], "x": 4, "y": 4},
- {"matrix": [7, 2], "x": 5, "y": 4},
- {"matrix": [7, 3], "x": 6, "y": 4},
- {"matrix": [7, 4], "x": 7, "y": 4},
- {"matrix": [7, 5], "x": 8, "y": 4},
- {"matrix": [7, 6], "x": 9, "y": 4},
- {"matrix": [7, 7], "x": 10, "y": 4},
- {"matrix": [7, 8], "x": 11, "y": 4},
- {"matrix": [8, 0], "x": 12, "y": 4},
- {"matrix": [8, 1], "x": 13, "y": 4},
- {"matrix": [8, 2], "x": 14, "y": 4}
- ]
- }
- }
+ "bootloader": "caterina"
}
diff --git a/keyboards/40percentclub/i75/teensy2/keyboard.json b/keyboards/40percentclub/i75/teensy2/keyboard.json
index cc441a1096..2296a57828 100644
--- a/keyboards/40percentclub/i75/teensy2/keyboard.json
+++ b/keyboards/40percentclub/i75/teensy2/keyboard.json
@@ -5,91 +5,5 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "halfkay",
- "community_layouts": ["ortho_5x15"],
- "layouts": {
- "LAYOUT_ortho_5x15": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [1, 0], "x": 9, "y": 0},
- {"matrix": [1, 1], "x": 10, "y": 0},
- {"matrix": [1, 2], "x": 11, "y": 0},
- {"matrix": [1, 3], "x": 12, "y": 0},
- {"matrix": [1, 4], "x": 13, "y": 0},
- {"matrix": [1, 5], "x": 14, "y": 0},
-
- {"matrix": [1, 6], "x": 0, "y": 1},
- {"matrix": [1, 7], "x": 1, "y": 1},
- {"matrix": [1, 8], "x": 2, "y": 1},
- {"matrix": [2, 0], "x": 3, "y": 1},
- {"matrix": [2, 1], "x": 4, "y": 1},
- {"matrix": [2, 2], "x": 5, "y": 1},
- {"matrix": [2, 3], "x": 6, "y": 1},
- {"matrix": [2, 4], "x": 7, "y": 1},
- {"matrix": [2, 5], "x": 8, "y": 1},
- {"matrix": [2, 6], "x": 9, "y": 1},
- {"matrix": [2, 7], "x": 10, "y": 1},
- {"matrix": [2, 8], "x": 11, "y": 1},
- {"matrix": [3, 0], "x": 12, "y": 1},
- {"matrix": [3, 1], "x": 13, "y": 1},
- {"matrix": [3, 2], "x": 14, "y": 1},
-
- {"matrix": [3, 3], "x": 0, "y": 2},
- {"matrix": [3, 4], "x": 1, "y": 2},
- {"matrix": [3, 5], "x": 2, "y": 2},
- {"matrix": [3, 6], "x": 3, "y": 2},
- {"matrix": [3, 7], "x": 4, "y": 2},
- {"matrix": [3, 8], "x": 5, "y": 2},
- {"matrix": [4, 0], "x": 6, "y": 2},
- {"matrix": [4, 1], "x": 7, "y": 2},
- {"matrix": [4, 2], "x": 8, "y": 2},
- {"matrix": [4, 3], "x": 9, "y": 2},
- {"matrix": [4, 4], "x": 10, "y": 2},
- {"matrix": [4, 5], "x": 11, "y": 2},
- {"matrix": [4, 6], "x": 12, "y": 2},
- {"matrix": [4, 7], "x": 13, "y": 2},
- {"matrix": [4, 8], "x": 14, "y": 2},
-
- {"matrix": [5, 0], "x": 0, "y": 3},
- {"matrix": [5, 1], "x": 1, "y": 3},
- {"matrix": [5, 2], "x": 2, "y": 3},
- {"matrix": [5, 3], "x": 3, "y": 3},
- {"matrix": [5, 4], "x": 4, "y": 3},
- {"matrix": [5, 5], "x": 5, "y": 3},
- {"matrix": [5, 6], "x": 6, "y": 3},
- {"matrix": [5, 7], "x": 7, "y": 3},
- {"matrix": [5, 8], "x": 8, "y": 3},
- {"matrix": [6, 0], "x": 9, "y": 3},
- {"matrix": [6, 1], "x": 10, "y": 3},
- {"matrix": [6, 2], "x": 11, "y": 3},
- {"matrix": [6, 3], "x": 12, "y": 3},
- {"matrix": [6, 4], "x": 13, "y": 3},
- {"matrix": [6, 5], "x": 14, "y": 3},
-
- {"matrix": [6, 6], "x": 0, "y": 4},
- {"matrix": [6, 7], "x": 1, "y": 4},
- {"matrix": [6, 8], "x": 2, "y": 4},
- {"matrix": [7, 0], "x": 3, "y": 4},
- {"matrix": [7, 1], "x": 4, "y": 4},
- {"matrix": [7, 2], "x": 5, "y": 4},
- {"matrix": [7, 3], "x": 6, "y": 4},
- {"matrix": [7, 4], "x": 7, "y": 4},
- {"matrix": [7, 5], "x": 8, "y": 4},
- {"matrix": [7, 6], "x": 9, "y": 4},
- {"matrix": [7, 7], "x": 10, "y": 4},
- {"matrix": [7, 8], "x": 11, "y": 4},
- {"matrix": [8, 0], "x": 12, "y": 4},
- {"matrix": [8, 1], "x": 13, "y": 4},
- {"matrix": [8, 2], "x": 14, "y": 4}
- ]
- }
- }
+ "bootloader": "halfkay"
}
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/40percentclub/luddite/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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/40percentclub/luddite/keyboard.json b/keyboards/40percentclub/luddite/keyboard.json
index 8a0b5d5913..a9f79d7369 100644
--- a/keyboards/40percentclub/luddite/keyboard.json
+++ b/keyboards/40percentclub/luddite/keyboard.json
@@ -18,6 +18,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"]
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
deleted file mode 100644
index b9449c4714..0000000000
--- a/keyboards/40percentclub/mf68/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/40percentclub/mf68/keyboard.json b/keyboards/40percentclub/mf68/keyboard.json
index 47259ac23f..45585d5e47 100644
--- a/keyboards/40percentclub/mf68/keyboard.json
+++ b/keyboards/40percentclub/mf68/keyboard.json
@@ -17,6 +17,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"],
"rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"]
diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h
deleted file mode 100644
index c30966d9d2..0000000000
--- a/keyboards/40percentclub/nein/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019
- *
- * 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/40percentclub/nein/keyboard.json b/keyboards/40percentclub/nein/keyboard.json
index 53a3a7639b..9e1711f71e 100644
--- a/keyboards/40percentclub/nein/keyboard.json
+++ b/keyboards/40percentclub/nein/keyboard.json
@@ -18,6 +18,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"direct": [
["F4", "F5", "F6"],
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
deleted file mode 100644
index 0fe9b9df21..0000000000
--- a/keyboards/40percentclub/nori/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2018
- *
- * 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/40percentclub/nori/info.json b/keyboards/40percentclub/nori/keyboard.json
similarity index 95%
rename from keyboards/40percentclub/nori/info.json
rename to keyboards/40percentclub/nori/keyboard.json
index 214d1da2a0..968e74e19e 100644
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/keyboard.json
@@ -13,6 +13,21 @@
"rows": ["D3", "D2", "D1", "D0"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"backlight": {
"pin": "B5"
},
diff --git a/keyboards/40percentclub/nori/rules.mk b/keyboards/40percentclub/nori/rules.mk
index 926fffda12..271780b75e 100644
--- a/keyboards/40percentclub/nori/rules.mk
+++ b/keyboards/40percentclub/nori/rules.mk
@@ -1,15 +1,2 @@
-# 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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
# Disable unsupported hardware
AUDIO_SUPPORTED = no
diff --git a/keyboards/40percentclub/polyandry/config.h b/keyboards/40percentclub/polyandry/config.h
deleted file mode 100644
index e3cac2cbfa..0000000000
--- a/keyboards/40percentclub/polyandry/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021
- *
- * 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
-
-//more detailed config options start below:
-
-/* 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/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json
index b04b050045..49b8bedbe3 100644
--- a/keyboards/40percentclub/polyandry/info.json
+++ b/keyboards/40percentclub/polyandry/info.json
@@ -11,9 +11,36 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"usb": {
"vid": "0x4025",
"pid": "0x6060",
"device_version": "0.0.1"
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [0, 3], "x": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1},
+
+ {"matrix": [0, 6], "x": 0, "y": 2},
+ {"matrix": [0, 7], "x": 1, "y": 2},
+ {"matrix": [0, 8], "x": 2, "y": 2},
+
+ {"matrix": [0, 9], "x": 0, "y": 3},
+ {"matrix": [0, 10], "x": 1, "y": 3},
+ {"matrix": [0, 11], "x": 2, "y": 3}
+ ]
+ }
}
}
diff --git a/keyboards/40percentclub/polyandry/promicro/keyboard.json b/keyboards/40percentclub/polyandry/promicro/keyboard.json
index 8a8cd98794..a8169c93dd 100644
--- a/keyboards/40percentclub/polyandry/promicro/keyboard.json
+++ b/keyboards/40percentclub/polyandry/promicro/keyboard.json
@@ -5,26 +5,5 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_ortho_4x3": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
-
- {"matrix": [0, 3], "x": 0, "y": 1},
- {"matrix": [0, 4], "x": 1, "y": 1},
- {"matrix": [0, 5], "x": 2, "y": 1},
-
- {"matrix": [0, 6], "x": 0, "y": 2},
- {"matrix": [0, 7], "x": 1, "y": 2},
- {"matrix": [0, 8], "x": 2, "y": 2},
-
- {"matrix": [0, 9], "x": 0, "y": 3},
- {"matrix": [0, 10], "x": 1, "y": 3},
- {"matrix": [0, 11], "x": 2, "y": 3}
- ]
- }
- }
+ "bootloader": "caterina"
}
diff --git a/keyboards/40percentclub/polyandry/teensy2/keyboard.json b/keyboards/40percentclub/polyandry/teensy2/keyboard.json
index 33fd1d71df..0a870332b2 100644
--- a/keyboards/40percentclub/polyandry/teensy2/keyboard.json
+++ b/keyboards/40percentclub/polyandry/teensy2/keyboard.json
@@ -5,26 +5,5 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "halfkay",
- "layouts": {
- "LAYOUT_ortho_4x3": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
-
- {"matrix": [0, 3], "x": 0, "y": 1},
- {"matrix": [0, 4], "x": 1, "y": 1},
- {"matrix": [0, 5], "x": 2, "y": 1},
-
- {"matrix": [0, 6], "x": 0, "y": 2},
- {"matrix": [0, 7], "x": 1, "y": 2},
- {"matrix": [0, 8], "x": 2, "y": 2},
-
- {"matrix": [0, 9], "x": 0, "y": 3},
- {"matrix": [0, 10], "x": 1, "y": 3},
- {"matrix": [0, 11], "x": 2, "y": 3}
- ]
- }
- }
+ "bootloader": "halfkay"
}
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
deleted file mode 100644
index b46d357dd0..0000000000
--- a/keyboards/40percentclub/tomato/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* eliminate lag on space cadet mods */
-#define PERMISSIVE_HOLD
diff --git a/keyboards/40percentclub/tomato/keyboard.json b/keyboards/40percentclub/tomato/keyboard.json
index a44946d372..c0b526cbc6 100644
--- a/keyboards/40percentclub/tomato/keyboard.json
+++ b/keyboards/40percentclub/tomato/keyboard.json
@@ -37,6 +37,15 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": false,
+ "resync": true
+ }
+ },
+ "tapping": {
+ "permissive_hold": true
+ },
"matrix_pins": {
"cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
"rows": ["F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/40percentclub/ut47/config.h b/keyboards/40percentclub/ut47/config.h
index 8f5756d150..f0182a59f8 100644
--- a/keyboards/40percentclub/ut47/config.h
+++ b/keyboards/40percentclub/ut47/config.h
@@ -28,10 +28,5 @@ along with this program. If not, see .
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-/* 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
-
/* Enable GNAP matrix serial output */
#define GNAP_ENABLE
diff --git a/keyboards/40percentclub/ut47/info.json b/keyboards/40percentclub/ut47/keyboard.json
similarity index 92%
rename from keyboards/40percentclub/ut47/info.json
rename to keyboards/40percentclub/ut47/keyboard.json
index 668f277f40..62e4a940a1 100644
--- a/keyboards/40percentclub/ut47/info.json
+++ b/keyboards/40percentclub/ut47/keyboard.json
@@ -10,6 +10,19 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/40percentclub/ut47/rules.mk b/keyboards/40percentclub/ut47/rules.mk
index 6ba6aa5f6f..5480f61b9b 100644
--- a/keyboards/40percentclub/ut47/rules.mk
+++ b/keyboards/40percentclub/ut47/rules.mk
@@ -1,16 +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 = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
-# custom matrix setup
CUSTOM_MATRIX = yes
SRC += matrix.c
UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/45_ats/config.h b/keyboards/45_ats/config.h
deleted file mode 100644
index 1d951890cd..0000000000
--- a/keyboards/45_ats/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /*
- Copyright 2020 Alec Penland
- Copyright 2020 Garret Gartner
-
- 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/45_ats/keyboard.json b/keyboards/45_ats/keyboard.json
index 7c873f21ed..5e5465f264 100644
--- a/keyboards/45_ats/keyboard.json
+++ b/keyboards/45_ats/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["E6", "B0", "B1", "B2", "B3", "B7", "F6", "F5", "F4", "C7", "F7", "C6", "B6", "D4"],
"rows": ["D3", "D5", "D7", "D6"]
diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/keyboard.json
similarity index 86%
rename from keyboards/4pplet/aekiso60/rev_b/info.json
rename to keyboards/4pplet/aekiso60/rev_b/keyboard.json
index b5ad58bc11..2bbf185125 100644
--- a/keyboards/4pplet/aekiso60/rev_b/info.json
+++ b/keyboards/4pplet/aekiso60/rev_b/keyboard.json
@@ -4,6 +4,13 @@
"pid": "0x0011",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/4pplet/aekiso60/rev_b/rules.mk b/keyboards/4pplet/aekiso60/rev_b/rules.mk
index e539634d58..04fe1eba2a 100644
--- a/keyboards/4pplet/aekiso60/rev_b/rules.mk
+++ b/keyboards/4pplet/aekiso60/rev_b/rules.mk
@@ -1,16 +1,2 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
index 350b9abad7..80a093147e 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
@@ -25,11 +25,6 @@ along with this program. If not, see .
#define WS2812_SPI_SCK_PIN A5
#define WS2812_SPI_SCK_PAL_MODE 0
-/* 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
-
/* Indicator leds */
#define LOCK_LIGHTS TRUE
#define DISPLAY_LAYERS TRUE
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json
similarity index 99%
rename from keyboards/4pplet/eagle_viper_rep/rev_a/info.json
rename to keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json
index baafb58153..18d8ba5d8a 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json
@@ -13,6 +13,22 @@
"rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"dynamic_keymap": {
"layer_count": 5
},
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
index 30a36865b9..04fe1eba2a 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
@@ -1,15 +1,2 @@
-# 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 = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
index b5957e6f30..73182129a5 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
@@ -23,11 +23,6 @@ along with this program. If not, see .
/* Underglow */
#define WS2812_EXTERNAL_PULLUP
-/* 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
-
/* Indicator leds */
#define LAYER_1 B14
#define LAYER_2 B15
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json
similarity index 99%
rename from keyboards/4pplet/eagle_viper_rep/rev_b/info.json
rename to keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json
index 2ebb260686..e0356d5dad 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json
@@ -13,6 +13,21 @@
"rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"dynamic_keymap": {
"layer_count": 5
},
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
index 428a48c464..04fe1eba2a 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
@@ -1,15 +1,2 @@
-# 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 = yes
-RGBLIGHT_ENABLE = yes
-
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/keyboard.json
similarity index 99%
rename from keyboards/4pplet/steezy60/rev_a/info.json
rename to keyboards/4pplet/steezy60/rev_a/keyboard.json
index d64779bec3..ffd4464223 100644
--- a/keyboards/4pplet/steezy60/rev_a/info.json
+++ b/keyboards/4pplet/steezy60/rev_a/keyboard.json
@@ -36,7 +36,8 @@
"extrakey": true,
"mousekey": false,
"nkro": true,
- "rgblight": true
+ "rgblight": true,
+ "key_lock": true
},
"rgblight": {
"led_count": 12,
diff --git a/keyboards/4pplet/steezy60/rev_a/rules.mk b/keyboards/4pplet/steezy60/rev_a/rules.mk
deleted file mode 100644
index 96c9ff2cbb..0000000000
--- a/keyboards/4pplet/steezy60/rev_a/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/4pplet/steezy60/rev_b/info.json b/keyboards/4pplet/steezy60/rev_b/keyboard.json
similarity index 99%
rename from keyboards/4pplet/steezy60/rev_b/info.json
rename to keyboards/4pplet/steezy60/rev_b/keyboard.json
index e087ff8d1b..8ff41bd156 100644
--- a/keyboards/4pplet/steezy60/rev_b/info.json
+++ b/keyboards/4pplet/steezy60/rev_b/keyboard.json
@@ -32,7 +32,8 @@
"extrakey": true,
"mousekey": false,
"nkro": true,
- "rgblight": true
+ "rgblight": true,
+ "key_lock": true
},
"rgblight": {
"led_count": 12,
diff --git a/keyboards/4pplet/steezy60/rev_b/rules.mk b/keyboards/4pplet/steezy60/rev_b/rules.mk
index 3787d8c241..04fe1eba2a 100644
--- a/keyboards/4pplet/steezy60/rev_b/rules.mk
+++ b/keyboards/4pplet/steezy60/rev_b/rules.mk
@@ -1,8 +1,2 @@
-# Build Options
-# change yes to no to disable
-#
-KEY_LOCK_ENABLE = yes
-
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/keyboard.json
similarity index 99%
rename from keyboards/4pplet/unextended_std/rev_a/info.json
rename to keyboards/4pplet/unextended_std/rev_a/keyboard.json
index 5aba94b50a..1b1909854a 100644
--- a/keyboards/4pplet/unextended_std/rev_a/info.json
+++ b/keyboards/4pplet/unextended_std/rev_a/keyboard.json
@@ -22,7 +22,8 @@
"console": false,
"command": false,
"nkro": true,
- "rgblight": true
+ "rgblight": true,
+ "key_lock": true
},
"ws2812": {
"pin": "A8"
diff --git a/keyboards/4pplet/unextended_std/rev_a/rules.mk b/keyboards/4pplet/unextended_std/rev_a/rules.mk
index 3787d8c241..04fe1eba2a 100644
--- a/keyboards/4pplet/unextended_std/rev_a/rules.mk
+++ b/keyboards/4pplet/unextended_std/rev_a/rules.mk
@@ -1,8 +1,2 @@
-# Build Options
-# change yes to no to disable
-#
-KEY_LOCK_ENABLE = yes
-
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/keyboard.json
similarity index 96%
rename from keyboards/4pplet/waffling60/rev_d/info.json
rename to keyboards/4pplet/waffling60/rev_d/keyboard.json
index 692f995605..90f049ee29 100644
--- a/keyboards/4pplet/waffling60/rev_d/info.json
+++ b/keyboards/4pplet/waffling60/rev_d/keyboard.json
@@ -8,6 +8,13 @@
"pid": "0x000E",
"device_version": "0.0.4"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/4pplet/waffling60/rev_d/rules.mk b/keyboards/4pplet/waffling60/rev_d/rules.mk
index e539634d58..04fe1eba2a 100644
--- a/keyboards/4pplet/waffling60/rev_d/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d/rules.mk
@@ -1,16 +1,2 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json
similarity index 97%
rename from keyboards/4pplet/waffling60/rev_d_ansi/info.json
rename to keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json
index 3969d98c42..f471d27e14 100644
--- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
index a64bf928eb..04fe1eba2a 100644
--- a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
@@ -1,16 +1,2 @@
-# 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
-
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/keyboard.json
similarity index 99%
rename from keyboards/4pplet/waffling60/rev_d_iso/info.json
rename to keyboards/4pplet/waffling60/rev_d_iso/keyboard.json
index fdcf9d0bde..757de46e6b 100644
--- a/keyboards/4pplet/waffling60/rev_d_iso/info.json
+++ b/keyboards/4pplet/waffling60/rev_d_iso/keyboard.json
@@ -15,6 +15,11 @@
"diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
index e11c916b4f..04fe1eba2a 100644
--- a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
@@ -1,16 +1,2 @@
-# 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/keyboard.json
similarity index 78%
rename from keyboards/4pplet/waffling80/rev_b/info.json
rename to keyboards/4pplet/waffling80/rev_b/keyboard.json
index 47d3d5d662..2c33caa404 100644
--- a/keyboards/4pplet/waffling80/rev_b/info.json
+++ b/keyboards/4pplet/waffling80/rev_b/keyboard.json
@@ -4,6 +4,13 @@
"pid": "0x000F",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/4pplet/waffling80/rev_b/rules.mk b/keyboards/4pplet/waffling80/rev_b/rules.mk
index e539634d58..04fe1eba2a 100644
--- a/keyboards/4pplet/waffling80/rev_b/rules.mk
+++ b/keyboards/4pplet/waffling80/rev_b/rules.mk
@@ -1,16 +1,2 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h
index b9a17d4128..e69de29bb2 100644
--- a/keyboards/4pplet/yakiimo/rev_a/config.h
+++ b/keyboards/4pplet/yakiimo/rev_a/config.h
@@ -1,22 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-#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/4pplet/yakiimo/rev_a/keyboard.json b/keyboards/4pplet/yakiimo/rev_a/keyboard.json
index ec5addd850..f22f67ac6a 100644
--- a/keyboards/4pplet/yakiimo/rev_a/keyboard.json
+++ b/keyboards/4pplet/yakiimo/rev_a/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"],
"rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"]
diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/8pack/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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/8pack/info.json b/keyboards/8pack/info.json
index cf55db9815..84d81c11d3 100644
--- a/keyboards/8pack/info.json
+++ b/keyboards/8pack/info.json
@@ -7,6 +7,12 @@
"vid": "0xFEED",
"pid": "0x2171"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"backlight": {
"driver": "timer",
"pins": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],