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 244a5f192df0d7dbf7f55fc70abdc5648d83cb3a..0000000000000000000000000000000000000000
--- 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 6585b970c1e5983b6075bba9af6ba356af3e61f3..ab5127db38abf05686b145fba7ef8d36de876ea7 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 5791b324b65cd138b868686f814f435369d8b638..5fec622271ca1e778ff7379664e648c373971174 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 5b583dc291be8c97f66af8bf03550bbde52409e6..f264d4ed065f92e78d5060f94f34ecb6c4cae2c2 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 179c84088bb315b1d7563d1913e55d1fc0540c2e..60d9ff232a953de0c98a77f97969624098157278 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 cd3d492870708f3999a5659afe0cc3cd1de295ba..73a6a802cc58fada1c79651f155d85f492e55262 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 d876570c808ee13a971560fe2424afb24022f2eb..0000000000000000000000000000000000000000
--- 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 ac8d5247121535efb58ef3a68b4f4b662ad8df53..990b51c1f84d186b79408d6413572ac9758ed2c7 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 eddf290b4c3fa1a7fa5bb104f02ad5e4e91fd12b..0000000000000000000000000000000000000000
--- 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 25f519bea795695720c389193e1fcf4fcfc68883..53e91017ddc89b0a5c049bbba5b540dea68adb5c 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 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
--- 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 2985b5ae4f7d76542fca87049c0ae29322425b7c..f4ba111251142d3140d528bfc38bba9e7e7e7985 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 a697e565c9bd85489d58e52527359c4b95d72e43..0000000000000000000000000000000000000000
--- 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 71619db3605e150389ea455d444b3d0eb1c16fbb..45c3876a6b6c34efcd4df356c505348d83f96356 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 2c04274299f3dc31c25a8cf1bacb17f229d4fe6a..0000000000000000000000000000000000000000
--- 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 204e42f48c709770186882bea1b21d1be3e6c56b..d5a5f861873933364854b5905fe7df1f3a2e156b 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 2c04274299f3dc31c25a8cf1bacb17f229d4fe6a..0000000000000000000000000000000000000000
--- 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 b6580e616a4cd283f4312a358ba97699567ad3eb..21dab3f71ae1a970645bbd4b3964b6c073bdeaf0 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 043d8b154b1b1d9f829e6bdbaa3d37cb59dcc4c7..0000000000000000000000000000000000000000
--- 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 4bc18e98f73d2ef3e3fa38ed8a7059707415ccdf..9da4168d4716c2581dd083870da007b326dc04c9 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 67af6d7cab82fdb9b9a86d85918380d30f1c2603..6abfa8f431a1f08dee442ae3db4f70576679da48 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 3bc7bf0e07f956ac224c2a78f8db665d98bca48e..652b03006e1ca95e71b5e9958e2750c875e2cb80 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 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
--- 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 bbecccae0206b1ce11a2afe520d7e8981c54c4cd..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..3ac73ce8eb0bef1d60a6ff09218337aaf12321df
--- /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 0912a1b4a60c214486726a69f6a5f9c42db66cfe..0000000000000000000000000000000000000000
--- 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 39e43b90cd35eb1e27dd1faa5002238406363506..0000000000000000000000000000000000000000
--- 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 0d09632a995a7beeceb26bfc4eab27fa0c4dd284..d8d6c5e3eae57e88168cf96fb9855f1287250670 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 39e43b90cd35eb1e27dd1faa5002238406363506..0000000000000000000000000000000000000000
--- 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 d23bc6633d248d33bf08f9e2b17788d2b4562f50..d46f723a17ed9a0cbb2c742cc9ea0e52d197b414 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 2000c037f58d2de97781820ed12c9e1708f7b4d3..0000000000000000000000000000000000000000
--- 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 0d7a5de56056a882f6f0ee24438b929a302425f7..0000000000000000000000000000000000000000
--- 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 675c741bf52ae7d7514b1237af8f139fdde894e9..bbb566d909620fe29da283bc760c3e348b699241 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 e0954e7355bd5df94df17f4e662f7445383d338e..0000000000000000000000000000000000000000
--- 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 0d7a5de56056a882f6f0ee24438b929a302425f7..0000000000000000000000000000000000000000
--- 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 fd4b07fe3ee23127529d74ff49dabfeb17884dfe..0feab708a01a93d0a5052087d985f9d570c290af 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 683b2498022264dd53c7f17b0e35e73470349bb2..0000000000000000000000000000000000000000
--- 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 38a73368f635f84eff46faf053287c70e30cfe8a..cba2e61272156fd432034bdf763a53ef34c9c923 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 f8febbdec8d11c519e05fc6f0b22af1336b101cb..788ba43e591c01ec981d8d793590da4e86dd2178 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 2350242316801407d9480a500e4976fac9897ab3..0000000000000000000000000000000000000000
--- 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 47fb1f2e98e2ed697fa92a074e694d097e058e9c..c1bead2d8ab5c195633319ceb2597f1b4bf91dce 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 d38a618090753dc0573e7d755b16231883e6b314..0000000000000000000000000000000000000000
--- 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 1ab2fb7e38f3dd80c29a982cb1ee2e988da296d2..01d2291c4915bc5a3f717db49d2386f70433f13d 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 83895bdcb878e1c04bedde601630bef79f89068e..0000000000000000000000000000000000000000
--- 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 1e1d687ebbe72162958c9ce2418276cbc44e2807..a8c773a3054ee94511dc91fe8a1c4491d37bae39 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 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
--- 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 4dfecbd696fa097e4ae75431e1ed4f487e8145ba..fec55c811a68a2b51f0ee858aa1a1e94c17c85c7 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 20ecf9470808bba813190ea7bce1a056764a6c0f..1710ba42ee9b99ca86d714b24e877c41c36bf758 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 b5ab2c0cbdb90aee0997f9dd319a2484c2e8b094..aede80ef1727da23b9b84de32e196a0f19ba8715 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 25d4c400516cc04a15254f0d1a5141d3e229aae4..0000000000000000000000000000000000000000
--- 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 b0cf6b6f6aefc2ae127df08222bde2574145098c..0000000000000000000000000000000000000000
--- 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 edfd64ad33e97c0f77d2bbc69f5d91ae9f42936a..a114e97dbbd9c35cd7a9ab741c059fd65c785e4e 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 7caa265c1a1f2da2bd85d0dccf8c5a6755544c90..0000000000000000000000000000000000000000
--- 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 aa5e0396375d702d07a52bf79e5cdf19cbfe66cf..735a3865da3a807ded8b16fbb59efb2c136c8871 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 dfb1a682dcbfdf9c3818bd47b7433fa34c1a92d4..16051206467f5a6b4d545ce1f326a0032f97ec2e 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 7caa265c1a1f2da2bd85d0dccf8c5a6755544c90..0000000000000000000000000000000000000000
--- 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 0a50d29ffe78fa2dddd38ba0802d469af41207e5..039d9fe47b1900ff68f57b62a4aece6338a53880 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 20ecf9470808bba813190ea7bce1a056764a6c0f..1710ba42ee9b99ca86d714b24e877c41c36bf758 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 00e91edb42f24f0895955f744e79a1c7d1ec7378..06ffc890d2b0dcf61cac8e9ef5aaa8652bf1afeb 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 25d4c400516cc04a15254f0d1a5141d3e229aae4..0000000000000000000000000000000000000000
--- 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 20ecf9470808bba813190ea7bce1a056764a6c0f..1710ba42ee9b99ca86d714b24e877c41c36bf758 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 89fc4d11a012ba3ddef5bb9c02d85f572675f516..0a2769e04a688803382aebd947ee744a07eb0d96 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 25d4c400516cc04a15254f0d1a5141d3e229aae4..0000000000000000000000000000000000000000
--- 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 8b4ccf147931fe541b811bc3102d483328e80250..0000000000000000000000000000000000000000
--- 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 8174e639c23fc58efb8bc3c9029a624cd97d2989..3e0c646a500c6415d7ee02b5edecf87b63cf81e4 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 8ee80d039b8a399a7cfafc391de9f01ad643b133..0000000000000000000000000000000000000000
--- 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 0fe9b9df213c48fb06cf5a7af2909ed4e477847d..0000000000000000000000000000000000000000
--- 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 f91b054f2969175a5be48f7eb2cf28be398af8b7..a7124adec224f32abfd352f498d0499d1a049791 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 4c3f44469c62993e00a5788d83bafc1cc119b9cb..933c4f8616d32029cec3fd5f069104182c720328 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 cc441a109618a990034fd895e353e22630b7f54a..2296a578289d2899b1e7ccb5ab4ffb51d11d6d8a 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 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
--- 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 8a0b5d5913bea303bbf9ebec967cb79faf900b79..a9f79d736950cab763762827f589278bb5cf31c0 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 b9449c4714bf39561a177eb1ee1ba90b87dbc6fb..0000000000000000000000000000000000000000
--- 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 47259ac23f9a3ff706412bd195c29a3a4fbba5ab..45585d5e479d2b1eb66d22bdc253c1d81e52fdb1 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 c30966d9d2f246eb1657c8d1399d7caaf3d47547..0000000000000000000000000000000000000000
--- 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 53a3a7639b8c61a2e3e4f8755fc87555456c9a60..9e1711f71e736f05036d67778a7ac480bfaa6463 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 0fe9b9df213c48fb06cf5a7af2909ed4e477847d..0000000000000000000000000000000000000000
--- 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 214d1da2a09ea17053fa7a261ec63e745fbf8240..968e74e19e1cf6d7871bb68c83b6a39fa0db1701 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 926fffda128d050fb751395123f03128ce3f1e4e..271780b75ecdda532ff24433acfd6c3c18d2b6a4 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 e3cac2cbfacd451ca292affe49bf0ac867191871..0000000000000000000000000000000000000000
--- 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 b04b050045095a41105013e296c41e256360e706..49b8bedbe3237287d46c91a5ab556836daaaf7a9 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 8a8cd987942ed812fdac3a28fd47bb06e57d2b91..a8169c93dd69a19c50262469d0dd149cc6c7932c 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 33fd1d71dfea70b907b5c520e5ace4ff74a196dc..0a870332b2b05ad415b66ec8234112f55714bea6 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 b46d357dd04ef2a0ee5d374ed7922b6909e28a47..0000000000000000000000000000000000000000
--- 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 a44946d3725e295a2f77bf3989489588f8466e42..c0b526cbc6b97b6cfb4b5a35371c3e0a169e4d46 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 8f5756d150690e61ac18346a8e1df1da010dab30..f0182a59f81a3784373c38ccd3b3c12ead367c14 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 668f277f40496ba95669962363da3bece36b0e93..62e4a940a184b313806bbda6cba2e8db881fe7c1 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 6ba6aa5f6fa2d56cc4b8490111640883f4a02355..5480f61b9b4414629494b6747b45cce4ebc8ff1e 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 1d951890cd1554118e6e70eef59dc6427834e5e6..0000000000000000000000000000000000000000
--- 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 7c873f21edeb1d9bf446c42a8b842d595e2ddec4..5e5465f2643d7807a9cc85196481d9dda099cc1f 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 b5ad58bc11df9b22a7dffe8f58e4a4b2bcf00c18..2bbf185125380962a8060c54d1791daf8c210195 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 e539634d5898f9c30f49a1c4cf83d3fdc128f637..04fe1eba2acd1835f0ab8ab55f6ae542d04c789d 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 350b9abad7f93b5730a63085b8d2d4db6ea32979..80a093147ebb3e6ccb26b913ca8f2fd110fa8ee2 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 baafb58153bf5e1652725d8ab82ffbb863e0ef2a..18d8ba5d8aad26b7d4f7a9beb814385d76fa55b3 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 30a36865b96139f685f94c342022ca5bbfc2f84f..04fe1eba2acd1835f0ab8ab55f6ae542d04c789d 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 b5957e6f30ccf77a8121fa1fa1286d70c26ab52a..73182129a57e55d16e360a5d755e6fdddb221aff 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 2ebb260686936ecea9a667f24b682dfe11d0ef84..e0356d5dad58ddf63ce1abc4ec19da16f8a2ddf0 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 428a48c46499b59fa5457ae224ea80c4efd70a07..04fe1eba2acd1835f0ab8ab55f6ae542d04c789d 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 d64779bec3f39dfd95f4d58818e998754cfcded1..ffd44642230cad30a7d93988f80f934cd68383ed 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 96c9ff2cbbe53bed91f368ceb39973a528bf0c45..0000000000000000000000000000000000000000
--- 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 e087ff8d1bb0b75e6a1edfe65b544ba665a48a8d..8ff41bd1561cecf54424ba446dac36045bef2038 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 3787d8c241b55f47970e814495fb1f58e374ee68..04fe1eba2acd1835f0ab8ab55f6ae542d04c789d 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 5aba94b50ab9815b3610dd71729c807464670987..1b1909854ac6f6bf871122253be0a7fc4bfb99bc 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 3787d8c241b55f47970e814495fb1f58e374ee68..04fe1eba2acd1835f0ab8ab55f6ae542d04c789d 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 692f995605285103fd12a6aef0e8c775d2778a34..90f049ee2932ad32e329b98b1ce39f9e13c24c41 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 e539634d5898f9c30f49a1c4cf83d3fdc128f637..04fe1eba2acd1835f0ab8ab55f6ae542d04c789d 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 3969d98c4247939d133c8f98386240d7ca11b803..f471d27e14b5f630886b41df4bb9f06ea2fc5bf8 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 a64bf928ebb33ccbafed53db0361c3c95ffc0fba..04fe1eba2acd1835f0ab8ab55f6ae542d04c789d 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 fdcf9d0bdee188c996a3d78edd77c0027a53b5f6..757de46e6b9b465ec1d089b3760c090eb107d1e6 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 e11c916b4fd3bb643cfa27996422371af2494332..04fe1eba2acd1835f0ab8ab55f6ae542d04c789d 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 47d3d5d662fdba23b4e05b020570819d3bf647c8..2c33caa404447bc7b181fbabfb308d218808a138 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 e539634d5898f9c30f49a1c4cf83d3fdc128f637..04fe1eba2acd1835f0ab8ab55f6ae542d04c789d 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 b9a17d41287097dfa92110da94ac887d8fdf2716..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 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 ec5addd85019b97e3c65115809c985214806a42e..f22f67ac6a478303d4233654148547a8dc0e4e20 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 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
--- 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 cf55db9815381a9eb9b1f21b4ae3e3736c1104f0..84d81c11d39508111a0e1f9170598f7f753ee7fd 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"],