From 63bc7b63a650c4da63611900437e06ea7d051f14 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 2 Apr 2024 09:45:44 -0700
Subject: Data-Driven Keyboard Conversions: A (#23379)
---
keyboards/abacus/config.h | 39 ---
keyboards/abacus/keyboard.json | 6 +
keyboards/abstract/ellipse/rev1/config.h | 39 ---
keyboards/abstract/ellipse/rev1/keyboard.json | 6 +
keyboards/acekeyboard/titan60/config.h | 23 --
keyboards/acekeyboard/titan60/keyboard.json | 6 +
keyboards/acheron/apollo/87h/delta/config.h | 5 -
keyboards/acheron/apollo/87h/delta/keyboard.json | 6 +
keyboards/acheron/apollo/87h/gamma/config.h | 5 -
keyboards/acheron/apollo/87h/gamma/info.json | 173 ------------
keyboards/acheron/apollo/87h/gamma/keyboard.json | 188 +++++++++++++
keyboards/acheron/apollo/87h/gamma/rules.mk | 15 -
keyboards/acheron/apollo/87htsc/config.h | 5 -
keyboards/acheron/apollo/87htsc/keyboard.json | 6 +
keyboards/acheron/apollo/88htsc/config.h | 5 -
keyboards/acheron/apollo/88htsc/keyboard.json | 6 +
keyboards/acheron/arctic/config.h | 39 ---
keyboards/acheron/arctic/keyboard.json | 6 +
keyboards/acheron/athena/alpha/config.h | 3 -
keyboards/acheron/athena/alpha/keyboard.json | 6 +
keyboards/acheron/athena/beta/config.h | 3 -
keyboards/acheron/athena/beta/keyboard.json | 6 +
keyboards/acheron/austin/config.h | 5 -
keyboards/acheron/austin/keyboard.json | 6 +
keyboards/acheron/elongate/beta/config.h | 39 ---
keyboards/acheron/elongate/beta/keyboard.json | 6 +
keyboards/acheron/elongate/delta/config.h | 5 -
keyboards/acheron/elongate/delta/keyboard.json | 6 +
keyboards/acheron/keebspcb/config.h | 39 ---
keyboards/acheron/keebspcb/keyboard.json | 6 +
keyboards/acheron/lasgweloth/config.h | 39 ---
keyboards/acheron/lasgweloth/keyboard.json | 6 +
keyboards/acheron/shark/alpha/config.h | 5 -
keyboards/acheron/shark/alpha/info.json | 14 +
keyboards/acheron/shark/alpha/rules.mk | 14 -
keyboards/acheron/shark/beta/config.h | 3 -
keyboards/acheron/shark/beta/keyboard.json | 6 +
keyboards/acheron/themis/87h/config.h | 3 -
keyboards/acheron/themis/87h/keyboard.json | 6 +
keyboards/acheron/themis/87htsc/config.h | 3 -
keyboards/acheron/themis/87htsc/keyboard.json | 6 +
keyboards/acheron/themis/88htsc/config.h | 3 -
keyboards/acheron/themis/88htsc/keyboard.json | 6 +
keyboards/ada/infinity81/config.h | 25 --
keyboards/ada/infinity81/keyboard.json | 6 +
keyboards/adafruit/macropad/info.json | 10 +
keyboards/adafruit/macropad/rules.mk | 15 -
keyboards/adelheid/config.h | 39 ---
keyboards/adelheid/keyboard.json | 6 +
keyboards/adkb96/info.json | 134 ---------
keyboards/adkb96/rev1/config.h | 40 ---
keyboards/adkb96/rev1/keyboard.json | 148 ++++++++++
keyboards/adkb96/rev1/rules.mk | 0
keyboards/adkb96/rules.mk | 15 -
keyboards/aeboards/aegis/config.h | 23 --
keyboards/aeboards/aegis/keyboard.json | 6 +
keyboards/aeboards/constellation/rev1/config.h | 24 --
keyboards/aeboards/constellation/rev1/info.json | 174 ------------
.../aeboards/constellation/rev1/keyboard.json | 191 +++++++++++++
keyboards/aeboards/constellation/rev1/rules.mk | 12 -
keyboards/aeboards/constellation/rev2/config.h | 6 -
keyboards/aeboards/constellation/rev2/info.json | 177 ------------
.../aeboards/constellation/rev2/keyboard.json | 190 +++++++++++++
keyboards/aeboards/constellation/rev2/rules.mk | 11 -
keyboards/aeboards/constellation/rev3/config.h | 24 --
keyboards/aeboards/constellation/rev3/info.json | 174 ------------
.../aeboards/constellation/rev3/keyboard.json | 191 +++++++++++++
keyboards/aeboards/constellation/rev3/rules.mk | 12 -
keyboards/aeboards/ext65/rev1/info.json | 124 ---------
keyboards/aeboards/ext65/rev1/keyboard.json | 130 +++++++++
keyboards/aeboards/ext65/rev1/rules.mk | 11 -
keyboards/aeboards/ext65/rev2/info.json | 148 ----------
keyboards/aeboards/ext65/rev2/keyboard.json | 158 +++++++++++
keyboards/aeboards/ext65/rev2/rules.mk | 14 -
keyboards/aeboards/ext65/rev3/info.json | 9 +
keyboards/aeboards/ext65/rev3/rules.mk | 12 -
keyboards/aeboards/satellite/rev1/info.json | 10 +
keyboards/aeboards/satellite/rev1/rules.mk | 15 -
keyboards/afternoonlabs/breeze/rev0/info.json | 109 --------
keyboards/afternoonlabs/breeze/rev0/keyboard.json | 116 ++++++++
keyboards/afternoonlabs/breeze/rev0/rules.mk | 13 -
keyboards/afternoonlabs/breeze/rev1/info.json | 109 --------
keyboards/afternoonlabs/breeze/rev1/keyboard.json | 116 ++++++++
keyboards/afternoonlabs/breeze/rev1/rules.mk | 13 -
keyboards/afternoonlabs/oceanbreeze/rev1/info.json | 113 --------
.../afternoonlabs/oceanbreeze/rev1/keyboard.json | 120 ++++++++
keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk | 13 -
.../afternoonlabs/southern_breeze/rev1/info.json | 109 --------
.../southern_breeze/rev1/keyboard.json | 116 ++++++++
.../afternoonlabs/southern_breeze/rev1/rules.mk | 13 -
.../afternoonlabs/summer_breeze/rev1/info.json | 123 --------
.../afternoonlabs/summer_breeze/rev1/keyboard.json | 130 +++++++++
.../afternoonlabs/summer_breeze/rev1/rules.mk | 13 -
keyboards/ai03/andromeda/config.h | 23 --
keyboards/ai03/andromeda/keyboard.json | 6 +
keyboards/ai03/equinox/config.h | 39 ---
keyboards/ai03/equinox/info.json | 6 +
keyboards/ai03/jp60/config.h | 39 ---
keyboards/ai03/jp60/keyboard.json | 6 +
keyboards/ai03/lunar/config.h | 39 ---
keyboards/ai03/lunar/keyboard.json | 6 +
keyboards/ai03/lunar_ii/config.h | 5 -
keyboards/ai03/lunar_ii/info.json | 14 +
keyboards/ai03/lunar_ii/rules.mk | 14 -
keyboards/ai03/orbit/config.h | 5 -
keyboards/ai03/orbit/info.json | 119 --------
keyboards/ai03/orbit/keyboard.json | 133 +++++++++
keyboards/ai03/orbit/rules.mk | 13 -
keyboards/ai03/orbit_x/config.h | 5 -
keyboards/ai03/orbit_x/info.json | 88 ------
keyboards/ai03/orbit_x/keyboard.json | 102 +++++++
keyboards/ai03/orbit_x/rules.mk | 13 -
keyboards/ai03/polaris/config.h | 39 ---
keyboards/ai03/polaris/keyboard.json | 6 +
keyboards/ai03/quasar/config.h | 39 ---
keyboards/ai03/quasar/keyboard.json | 6 +
keyboards/ai03/soyuz/config.h | 39 ---
keyboards/ai03/soyuz/keyboard.json | 6 +
keyboards/ai03/vega/config.h | 40 ---
keyboards/ai03/vega/keyboard.json | 6 +
keyboards/akb/raine/config.h | 22 --
keyboards/akb/raine/keyboard.json | 6 +
keyboards/akegata_denki/device_one/info.json | 302 --------------------
keyboards/akegata_denki/device_one/keyboard.json | 308 +++++++++++++++++++++
keyboards/akegata_denki/device_one/rules.mk | 10 -
keyboards/akko/5087/config.h | 5 -
keyboards/akko/5087/keyboard.json | 6 +
keyboards/akko/5108/config.h | 5 -
keyboards/akko/5108/keyboard.json | 6 +
keyboards/akko/acr87/config.h | 5 -
keyboards/akko/acr87/keyboard.json | 6 +
keyboards/akko/top40/config.h | 5 -
keyboards/akko/top40/keyboard.json | 6 +
keyboards/al1/config.h | 5 -
keyboards/al1/info.json | 14 +
keyboards/al1/rules.mk | 13 -
keyboards/alas/info.json | 7 +
keyboards/alas/rules.mk | 15 -
keyboards/aleblazer/zodiark/info.json | 154 -----------
keyboards/aleblazer/zodiark/keyboard.json | 165 +++++++++++
keyboards/aleblazer/zodiark/rules.mk | 16 --
keyboards/alf/dc60/config.h | 39 ---
keyboards/alf/dc60/keyboard.json | 6 +
keyboards/alf/x11/config.h | 39 ---
keyboards/alf/x11/keyboard.json | 6 +
keyboards/alf/x2/config.h | 23 --
keyboards/alf/x2/keyboard.json | 6 +
keyboards/aliceh66/pianoforte/config.h | 23 --
keyboards/aliceh66/pianoforte/info.json | 15 +
keyboards/aliceh66/pianoforte/rules.mk | 14 -
keyboards/aliceh66/pianoforte_hs/config.h | 23 --
keyboards/aliceh66/pianoforte_hs/info.json | 15 +
keyboards/aliceh66/pianoforte_hs/rules.mk | 14 -
keyboards/alpha/config.h | 7 -
keyboards/alpha/keyboard.json | 6 +
keyboards/alpine65/config.h | 39 ---
keyboards/alpine65/keyboard.json | 6 +
keyboards/alps64/config.h | 39 ---
keyboards/alps64/keyboard.json | 6 +
keyboards/alt34/rev1/config.h | 5 -
keyboards/alt34/rev1/info.json | 66 -----
keyboards/alt34/rev1/keyboard.json | 80 ++++++
keyboards/alt34/rev1/rules.mk | 14 -
keyboards/amag23/config.h | 21 --
keyboards/amag23/keyboard.json | 6 +
keyboards/amjkeyboard/amj40/config.h | 39 ---
keyboards/amjkeyboard/amj40/keyboard.json | 6 +
keyboards/amjkeyboard/amj60/config.h | 39 ---
keyboards/amjkeyboard/amj60/keyboard.json | 6 +
keyboards/amjkeyboard/amj66/config.h | 24 --
keyboards/amjkeyboard/amj66/info.json | 14 +
keyboards/amjkeyboard/amj66/rules.mk | 12 -
keyboards/amjkeyboard/amj84/config.h | 25 --
keyboards/amjkeyboard/amj84/keyboard.json | 6 +
keyboards/amjkeyboard/amj96/config.h | 5 -
keyboards/amjkeyboard/amj96/info.json | 14 +
keyboards/amjkeyboard/amj96/rules.mk | 13 -
keyboards/amjkeyboard/amjpad/config.h | 39 ---
keyboards/amjkeyboard/amjpad/keyboard.json | 6 +
keyboards/anavi/knob1/info.json | 63 -----
keyboards/anavi/knob1/keyboard.json | 64 +++++
keyboards/anavi/knob1/rules.mk | 1 -
keyboards/anavi/knobs3/info.json | 67 -----
keyboards/anavi/knobs3/keyboard.json | 68 +++++
keyboards/anavi/knobs3/rules.mk | 1 -
keyboards/ano/config.h | 38 ---
keyboards/ano/keyboard.json | 6 +-
keyboards/anomalykb/a65i/config.h | 24 --
keyboards/anomalykb/a65i/keyboard.json | 6 +
keyboards/aos/tkl/config.h | 22 --
keyboards/aos/tkl/keyboard.json | 6 +
keyboards/arabica37/rev1/info.json | 87 ------
keyboards/arabica37/rev1/keyboard.json | 94 +++++++
keyboards/arabica37/rev1/rules.mk | 14 -
.../argo_works/ishi/80/mk0_avr_extra/info.json | 120 --------
.../argo_works/ishi/80/mk0_avr_extra/keyboard.json | 122 ++++++++
.../argo_works/ishi/80/mk0_avr_extra/rules.mk | 2 -
keyboards/arisu/config.h | 39 ---
keyboards/arisu/keyboard.json | 6 +
keyboards/ash1800/config.h | 39 ---
keyboards/ash1800/keyboard.json | 6 +
keyboards/ash_xiix/config.h | 19 --
keyboards/ash_xiix/keyboard.json | 6 +
keyboards/ask55/config.h | 23 --
keyboards/ask55/keyboard.json | 6 +
keyboards/at_at/660m/config.h | 6 -
keyboards/at_at/660m/info.json | 96 -------
keyboards/at_at/660m/keyboard.json | 111 ++++++++
keyboards/at_at/660m/rules.mk | 14 -
keyboards/atlantis/ak81_ve/config.h | 6 -
keyboards/atlantis/ak81_ve/keyboard.json | 6 +
keyboards/atlantis/ps17/info.json | 108 --------
keyboards/atlantis/ps17/keyboard.json | 111 ++++++++
keyboards/atlantis/ps17/rules.mk | 1 -
keyboards/atlas_65/config.h | 38 ---
keyboards/atlas_65/keyboard.json | 6 +
keyboards/atomic/config.h | 39 ---
keyboards/atomic/keyboard.json | 6 +
keyboards/atreus/f103/info.json | 9 -
keyboards/atreus/f103/keyboard.json | 12 +
keyboards/atreus/f103/rules.mk | 2 -
keyboards/atreus/feather/info.json | 4 +
keyboards/atreus/feather/rules.mk | 6 -
keyboards/atreus62/config.h | 39 ---
keyboards/atreus62/keyboard.json | 6 +
keyboards/atreyu/info.json | 8 +
keyboards/atreyu/rev1/config.h | 38 ---
keyboards/atreyu/rev1/keyboard.json | 6 +
keyboards/atreyu/rev2/config.h | 38 ---
keyboards/atreyu/rev2/keyboard.json | 6 +
keyboards/atreyu/rules.mk | 15 -
keyboards/atset/at1/config.h | 21 --
keyboards/atset/at1/keyboard.json | 6 +
keyboards/atset/at12/config.h | 21 --
keyboards/atset/at12/keyboard.json | 6 +
keyboards/atset/at16/config.h | 21 --
keyboards/atset/at16/keyboard.json | 6 +
keyboards/atset/at3/config.h | 21 --
keyboards/atset/at3/keyboard.json | 6 +
keyboards/atset/at6/config.h | 21 --
keyboards/atset/at6/keyboard.json | 6 +
keyboards/atset/at9/config.h | 21 --
keyboards/atset/at9/keyboard.json | 6 +
keyboards/atxkb/1894/config.h | 39 ---
keyboards/atxkb/1894/keyboard.json | 6 +
keyboards/aurora65/info.json | 7 +
keyboards/aurora65/rules.mk | 13 -
keyboards/avalanche/v1/info.json | 98 -------
keyboards/avalanche/v1/keyboard.json | 105 +++++++
keyboards/avalanche/v1/rules.mk | 14 -
keyboards/avalanche/v2/info.json | 112 --------
keyboards/avalanche/v2/keyboard.json | 121 ++++++++
keyboards/avalanche/v2/rules.mk | 15 -
keyboards/avalanche/v3/info.json | 112 --------
keyboards/avalanche/v3/keyboard.json | 120 ++++++++
keyboards/avalanche/v3/rules.mk | 15 -
keyboards/avalanche/v4/info.json | 126 ---------
keyboards/avalanche/v4/keyboard.json | 135 +++++++++
keyboards/avalanche/v4/rules.mk | 16 --
keyboards/aves60/config.h | 25 --
keyboards/aves60/keyboard.json | 6 +
keyboards/aves65/config.h | 23 --
keyboards/aves65/keyboard.json | 6 +
keyboards/axolstudio/helpo/info.json | 5 +
keyboards/axolstudio/helpo/rules.mk | 13 -
keyboards/aya/info.json | 98 -------
keyboards/aya/keyboard.json | 107 +++++++
keyboards/aya/rules.mk | 13 -
268 files changed, 4313 insertions(+), 5920 deletions(-)
delete mode 100644 keyboards/abacus/config.h
delete mode 100644 keyboards/abstract/ellipse/rev1/config.h
delete mode 100644 keyboards/acekeyboard/titan60/config.h
delete mode 100644 keyboards/acheron/apollo/87h/gamma/info.json
create mode 100644 keyboards/acheron/apollo/87h/gamma/keyboard.json
delete mode 100644 keyboards/acheron/apollo/87h/gamma/rules.mk
delete mode 100644 keyboards/acheron/arctic/config.h
delete mode 100644 keyboards/acheron/elongate/beta/config.h
delete mode 100644 keyboards/acheron/keebspcb/config.h
delete mode 100644 keyboards/acheron/lasgweloth/config.h
delete mode 100644 keyboards/ada/infinity81/config.h
delete mode 100644 keyboards/adelheid/config.h
delete mode 100644 keyboards/adkb96/info.json
delete mode 100644 keyboards/adkb96/rev1/config.h
create mode 100644 keyboards/adkb96/rev1/keyboard.json
delete mode 100644 keyboards/adkb96/rev1/rules.mk
delete mode 100644 keyboards/aeboards/aegis/config.h
delete mode 100755 keyboards/aeboards/constellation/rev1/config.h
delete mode 100644 keyboards/aeboards/constellation/rev1/info.json
create mode 100644 keyboards/aeboards/constellation/rev1/keyboard.json
delete mode 100755 keyboards/aeboards/constellation/rev1/rules.mk
delete mode 100644 keyboards/aeboards/constellation/rev2/info.json
create mode 100644 keyboards/aeboards/constellation/rev2/keyboard.json
delete mode 100755 keyboards/aeboards/constellation/rev2/rules.mk
delete mode 100755 keyboards/aeboards/constellation/rev3/config.h
delete mode 100644 keyboards/aeboards/constellation/rev3/info.json
create mode 100644 keyboards/aeboards/constellation/rev3/keyboard.json
delete mode 100755 keyboards/aeboards/constellation/rev3/rules.mk
delete mode 100644 keyboards/aeboards/ext65/rev1/info.json
create mode 100644 keyboards/aeboards/ext65/rev1/keyboard.json
delete mode 100644 keyboards/aeboards/ext65/rev1/rules.mk
delete mode 100644 keyboards/aeboards/ext65/rev2/info.json
create mode 100644 keyboards/aeboards/ext65/rev2/keyboard.json
delete mode 100644 keyboards/aeboards/ext65/rev2/rules.mk
delete mode 100644 keyboards/afternoonlabs/breeze/rev0/info.json
create mode 100644 keyboards/afternoonlabs/breeze/rev0/keyboard.json
delete mode 100644 keyboards/afternoonlabs/breeze/rev0/rules.mk
delete mode 100644 keyboards/afternoonlabs/breeze/rev1/info.json
create mode 100644 keyboards/afternoonlabs/breeze/rev1/keyboard.json
delete mode 100644 keyboards/afternoonlabs/breeze/rev1/rules.mk
delete mode 100644 keyboards/afternoonlabs/oceanbreeze/rev1/info.json
create mode 100644 keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json
delete mode 100644 keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk
delete mode 100644 keyboards/afternoonlabs/southern_breeze/rev1/info.json
create mode 100644 keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json
delete mode 100644 keyboards/afternoonlabs/southern_breeze/rev1/rules.mk
delete mode 100644 keyboards/afternoonlabs/summer_breeze/rev1/info.json
create mode 100644 keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json
delete mode 100644 keyboards/afternoonlabs/summer_breeze/rev1/rules.mk
delete mode 100644 keyboards/ai03/andromeda/config.h
delete mode 100644 keyboards/ai03/equinox/config.h
delete mode 100644 keyboards/ai03/jp60/config.h
delete mode 100644 keyboards/ai03/lunar/config.h
delete mode 100644 keyboards/ai03/orbit/info.json
create mode 100644 keyboards/ai03/orbit/keyboard.json
delete mode 100644 keyboards/ai03/orbit/rules.mk
delete mode 100644 keyboards/ai03/orbit_x/info.json
create mode 100644 keyboards/ai03/orbit_x/keyboard.json
delete mode 100644 keyboards/ai03/orbit_x/rules.mk
delete mode 100644 keyboards/ai03/polaris/config.h
delete mode 100644 keyboards/ai03/quasar/config.h
delete mode 100644 keyboards/ai03/soyuz/config.h
delete mode 100644 keyboards/ai03/vega/config.h
delete mode 100644 keyboards/akb/raine/config.h
delete mode 100644 keyboards/akegata_denki/device_one/info.json
create mode 100644 keyboards/akegata_denki/device_one/keyboard.json
delete mode 100644 keyboards/akegata_denki/device_one/rules.mk
delete mode 100644 keyboards/aleblazer/zodiark/info.json
create mode 100644 keyboards/aleblazer/zodiark/keyboard.json
delete mode 100644 keyboards/aleblazer/zodiark/rules.mk
delete mode 100644 keyboards/alf/dc60/config.h
delete mode 100644 keyboards/alf/x11/config.h
delete mode 100644 keyboards/alf/x2/config.h
delete mode 100644 keyboards/aliceh66/pianoforte/config.h
delete mode 100644 keyboards/aliceh66/pianoforte_hs/config.h
delete mode 100755 keyboards/alpha/config.h
delete mode 100644 keyboards/alpine65/config.h
delete mode 100644 keyboards/alps64/config.h
delete mode 100644 keyboards/alt34/rev1/info.json
create mode 100644 keyboards/alt34/rev1/keyboard.json
delete mode 100644 keyboards/alt34/rev1/rules.mk
delete mode 100644 keyboards/amag23/config.h
delete mode 100755 keyboards/amjkeyboard/amj40/config.h
delete mode 100644 keyboards/amjkeyboard/amj60/config.h
delete mode 100644 keyboards/amjkeyboard/amj66/config.h
delete mode 100644 keyboards/amjkeyboard/amj84/config.h
delete mode 100644 keyboards/amjkeyboard/amjpad/config.h
delete mode 100644 keyboards/anavi/knob1/info.json
create mode 100644 keyboards/anavi/knob1/keyboard.json
delete mode 100644 keyboards/anavi/knob1/rules.mk
delete mode 100644 keyboards/anavi/knobs3/info.json
create mode 100644 keyboards/anavi/knobs3/keyboard.json
delete mode 100644 keyboards/anavi/knobs3/rules.mk
delete mode 100644 keyboards/ano/config.h
delete mode 100644 keyboards/anomalykb/a65i/config.h
delete mode 100644 keyboards/aos/tkl/config.h
delete mode 100644 keyboards/arabica37/rev1/info.json
create mode 100644 keyboards/arabica37/rev1/keyboard.json
delete mode 100644 keyboards/arabica37/rev1/rules.mk
delete mode 100644 keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
create mode 100644 keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json
delete mode 100644 keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
delete mode 100644 keyboards/arisu/config.h
delete mode 100644 keyboards/ash1800/config.h
delete mode 100644 keyboards/ash_xiix/config.h
delete mode 100644 keyboards/ask55/config.h
delete mode 100644 keyboards/at_at/660m/info.json
create mode 100644 keyboards/at_at/660m/keyboard.json
delete mode 100644 keyboards/at_at/660m/rules.mk
delete mode 100644 keyboards/atlantis/ps17/info.json
create mode 100644 keyboards/atlantis/ps17/keyboard.json
delete mode 100644 keyboards/atlantis/ps17/rules.mk
delete mode 100644 keyboards/atlas_65/config.h
delete mode 100644 keyboards/atomic/config.h
delete mode 100644 keyboards/atreus/f103/info.json
create mode 100644 keyboards/atreus/f103/keyboard.json
delete mode 100644 keyboards/atreus/f103/rules.mk
delete mode 100644 keyboards/atreus62/config.h
create mode 100644 keyboards/atreyu/info.json
delete mode 100644 keyboards/atreyu/rev1/config.h
delete mode 100644 keyboards/atreyu/rev2/config.h
delete mode 100644 keyboards/atset/at1/config.h
delete mode 100644 keyboards/atset/at12/config.h
delete mode 100644 keyboards/atset/at16/config.h
delete mode 100644 keyboards/atset/at3/config.h
delete mode 100644 keyboards/atset/at6/config.h
delete mode 100644 keyboards/atset/at9/config.h
delete mode 100644 keyboards/atxkb/1894/config.h
delete mode 100644 keyboards/avalanche/v1/info.json
create mode 100644 keyboards/avalanche/v1/keyboard.json
delete mode 100644 keyboards/avalanche/v1/rules.mk
delete mode 100644 keyboards/avalanche/v2/info.json
create mode 100644 keyboards/avalanche/v2/keyboard.json
delete mode 100644 keyboards/avalanche/v2/rules.mk
delete mode 100644 keyboards/avalanche/v3/info.json
create mode 100644 keyboards/avalanche/v3/keyboard.json
delete mode 100644 keyboards/avalanche/v3/rules.mk
delete mode 100644 keyboards/avalanche/v4/info.json
create mode 100644 keyboards/avalanche/v4/keyboard.json
delete mode 100644 keyboards/avalanche/v4/rules.mk
delete mode 100644 keyboards/aves60/config.h
delete mode 100644 keyboards/aves65/config.h
delete mode 100644 keyboards/aya/info.json
create mode 100644 keyboards/aya/keyboard.json
delete mode 100644 keyboards/aya/rules.mk
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
deleted file mode 100644
index 84e1acbb3c..0000000000
--- a/keyboards/abacus/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 nickolaij
-
-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/abacus/keyboard.json b/keyboards/abacus/keyboard.json
index c34fb32c52..9622089bbf 100644
--- a/keyboards/abacus/keyboard.json
+++ b/keyboards/abacus/keyboard.json
@@ -22,6 +22,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"],
"rows": ["D3", "D2", "D4", "C6"]
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
deleted file mode 100644
index 81349657ef..0000000000
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 AbstractKB
-
-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/abstract/ellipse/rev1/keyboard.json b/keyboards/abstract/ellipse/rev1/keyboard.json
index 31a17301a7..8e38f29d56 100644
--- a/keyboards/abstract/ellipse/rev1/keyboard.json
+++ b/keyboards/abstract/ellipse/rev1/keyboard.json
@@ -18,6 +18,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F0", "B6", "B5"],
"rows": ["D3", "C7"]
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
deleted file mode 100644
index 2bcc184a30..0000000000
--- a/keyboards/acekeyboard/titan60/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 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
diff --git a/keyboards/acekeyboard/titan60/keyboard.json b/keyboards/acekeyboard/titan60/keyboard.json
index 3111e1e9d7..4446927ab8 100644
--- a/keyboards/acekeyboard/titan60/keyboard.json
+++ b/keyboards/acekeyboard/titan60/keyboard.json
@@ -18,6 +18,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
"rows": ["B1", "B2", "B3", "F0", "F1"]
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 17c09f0f57..cda883bd63 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -17,11 +17,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
-
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/acheron/apollo/87h/delta/keyboard.json b/keyboards/acheron/apollo/87h/delta/keyboard.json
index c2d5e20692..5d01c1b8f7 100644
--- a/keyboards/acheron/apollo/87h/delta/keyboard.json
+++ b/keyboards/acheron/apollo/87h/delta/keyboard.json
@@ -68,6 +68,12 @@
"nkro": false,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
"rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index 42b27d55ba..8870c3c9c9 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -17,11 +17,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
-
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
// RGB Matrix defines
diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json
deleted file mode 100644
index 150f838c89..0000000000
--- a/keyboards/acheron/apollo/87h/gamma/info.json
+++ /dev/null
@@ -1,173 +0,0 @@
-{
- "keyboard_name": "Apollo87H rev. Gamma",
- "usb": {
- "pid": "0x8774",
- "device_version": "0.0.3"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "fractal": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
- "solid_splash": true,
- "solid_multisplash": true
- },
- "default": {
- "animation": "hue_wave",
- "val": 80
- },
- "driver": "is31fl3741",
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"],
- "rows": ["C14", "C13", "B9", "B4", "A3", "A2"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT_tkl_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 13], "x": 15.25, "y": 0},
- {"matrix": [0, 14], "x": 16.25, "y": 0},
- {"matrix": [0, 15], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"matrix": [4, 15], "x": 17.25, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"matrix": [4, 14], "x": 17.25, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"matrix": [4, 13], "x": 16.25, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
- {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
- {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
-
- {"matrix": [5, 13], "x": 15.25, "y": 5.25},
- {"matrix": [5, 14], "x": 16.25, "y": 5.25},
- {"matrix": [5, 15], "x": 17.25, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/acheron/apollo/87h/gamma/keyboard.json b/keyboards/acheron/apollo/87h/gamma/keyboard.json
new file mode 100644
index 0000000000..5c2087c968
--- /dev/null
+++ b/keyboards/acheron/apollo/87h/gamma/keyboard.json
@@ -0,0 +1,188 @@
+{
+ "keyboard_name": "Apollo87H rev. Gamma",
+ "usb": {
+ "pid": "0x8774",
+ "device_version": "0.0.3",
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "fractal": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "default": {
+ "animation": "hue_wave",
+ "val": 80
+ },
+ "driver": "is31fl3741",
+ "sleep": true
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"],
+ "rows": ["C14", "C13", "B9", "B4", "A3", "A2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F411",
+ "bootloader": "stm32-dfu",
+ "layouts": {
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+ {"matrix": [0, 14], "x": 16.25, "y": 0},
+ {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 15], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [4, 14], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 14], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 17.25, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk
deleted file mode 100644
index 4af646ec02..0000000000
--- a/keyboards/acheron/apollo/87h/gamma/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 = 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
-RGB_MATRIX_ENABLE = yes
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 17c09f0f57..cda883bd63 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -17,11 +17,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
-
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/acheron/apollo/87htsc/keyboard.json b/keyboards/acheron/apollo/87htsc/keyboard.json
index 5f7d30e65a..55229706b1 100644
--- a/keyboards/acheron/apollo/87htsc/keyboard.json
+++ b/keyboards/acheron/apollo/87htsc/keyboard.json
@@ -72,6 +72,12 @@
"nkro": false,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
"rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 17c09f0f57..cda883bd63 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -17,11 +17,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
-
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/acheron/apollo/88htsc/keyboard.json b/keyboards/acheron/apollo/88htsc/keyboard.json
index e29300019c..9b9482874f 100644
--- a/keyboards/acheron/apollo/88htsc/keyboard.json
+++ b/keyboards/acheron/apollo/88htsc/keyboard.json
@@ -72,6 +72,12 @@
"nkro": false,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
"rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h
deleted file mode 100644
index f608132b5a..0000000000
--- a/keyboards/acheron/arctic/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato
-
-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/acheron/arctic/keyboard.json b/keyboards/acheron/arctic/keyboard.json
index e8c9e92f61..cc686be5fa 100644
--- a/keyboards/acheron/arctic/keyboard.json
+++ b/keyboards/acheron/arctic/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", "F1", "F0", "C15", "C14", "C13", "B9", "B8"],
"rows": ["B7", "B6", "A6", "A7", "B1"]
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index c9f1d29f24..b1264c3fa5 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/acheron/athena/alpha/keyboard.json b/keyboards/acheron/athena/alpha/keyboard.json
index 8570fa1274..7e29cdc037 100644
--- a/keyboards/acheron/athena/alpha/keyboard.json
+++ b/keyboards/acheron/athena/alpha/keyboard.json
@@ -17,6 +17,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["A8", "B14", "B12", "B10", "B1", "B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A7", "B4", "B3", "A15"],
"rows": ["B9", "C13", "B8", "B5", "A14", "C14"]
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index b2a8d2edf8..79add9aedc 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
diff --git a/keyboards/acheron/athena/beta/keyboard.json b/keyboards/acheron/athena/beta/keyboard.json
index 21aa189470..ba96b20151 100644
--- a/keyboards/acheron/athena/beta/keyboard.json
+++ b/keyboards/acheron/athena/beta/keyboard.json
@@ -17,6 +17,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C7", "C6", "B14", "B12", "B10", "B1", "C4", "A7", "A6", "A5", "A4", "A3", "A2", "C5", "A10", "A8", "C9"],
"rows": ["C11", "C12", "C10", "A15", "C0", "A1"]
diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h
index a47b76953a..974ecf1c6c 100644
--- a/keyboards/acheron/austin/config.h
+++ b/keyboards/acheron/austin/config.h
@@ -21,11 +21,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
-/* 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/acheron/austin/keyboard.json b/keyboards/acheron/austin/keyboard.json
index 6c467a7da0..bee675472c 100755
--- a/keyboards/acheron/austin/keyboard.json
+++ b/keyboards/acheron/austin/keyboard.json
@@ -17,6 +17,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"],
"rows": ["C13", "A4", "A7", "B0", "B1", "B2"]
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
deleted file mode 100644
index 62093e37b2..0000000000
--- a/keyboards/acheron/elongate/beta/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Gondolindrim
-
-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/acheron/elongate/beta/keyboard.json b/keyboards/acheron/elongate/beta/keyboard.json
index 80c984caab..d15f178991 100644
--- a/keyboards/acheron/elongate/beta/keyboard.json
+++ b/keyboards/acheron/elongate/beta/keyboard.json
@@ -41,6 +41,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"],
"rows": ["D3", "B7", "D5", "B5", "D6"]
diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
index 81342ef26d..09ccd74164 100755
--- a/keyboards/acheron/elongate/delta/config.h
+++ b/keyboards/acheron/elongate/delta/config.h
@@ -23,11 +23,6 @@ along with this program. If not, see .
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5)
-/* 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
-
// Elongate has six indicator LEDs. These def's are the indicator pin defs. The LEDs are distributed in two clusters: one next to the numpad and another between spacebars; LEDs are numbered top-to-bottom.
#define LED1_PIN A2
diff --git a/keyboards/acheron/elongate/delta/keyboard.json b/keyboards/acheron/elongate/delta/keyboard.json
index 33fc5b55dd..1c6d0927d6 100644
--- a/keyboards/acheron/elongate/delta/keyboard.json
+++ b/keyboards/acheron/elongate/delta/keyboard.json
@@ -18,6 +18,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["A10", "A9", "A8", "B14", "B12", "B11", "B10", "B2", "B1", "A7", "A5", "B9", "B8", "B7", "B6"],
"rows": ["B3", "A15", "B0", "B4", "B5"]
diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h
deleted file mode 100644
index 4b007cf387..0000000000
--- a/keyboards/acheron/keebspcb/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 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/acheron/keebspcb/keyboard.json b/keyboards/acheron/keebspcb/keyboard.json
index 1017cf47ec..a4815e1014 100644
--- a/keyboards/acheron/keebspcb/keyboard.json
+++ b/keyboards/acheron/keebspcb/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B12", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5"],
"rows": ["B4", "B3", "A2", "A3", "A4"]
diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h
deleted file mode 100644
index f608132b5a..0000000000
--- a/keyboards/acheron/lasgweloth/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato
-
-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/acheron/lasgweloth/keyboard.json b/keyboards/acheron/lasgweloth/keyboard.json
index ccdf9d6f30..35d30e89b2 100644
--- a/keyboards/acheron/lasgweloth/keyboard.json
+++ b/keyboards/acheron/lasgweloth/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B12", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5", "A4", "B7"],
"rows": ["B9", "B8", "A3", "B0", "B1"]
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index a34ea41cff..0786a3ac0e 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/keyboards/acheron/shark/alpha/config.h
@@ -19,11 +19,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_DRIVER PWMD3
-/* 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/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json
index 5250da4727..f88c312a25 100644
--- a/keyboards/acheron/shark/alpha/info.json
+++ b/keyboards/acheron/shark/alpha/info.json
@@ -6,6 +6,20 @@
"pid": "0x5368",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "encoder": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B1", "B12", "A1", "A7", "A5", "A4", "A3", "A2", "A0", "C15", "C14", "C13"],
"rows": ["B4", "A15", "B10", "B2"]
diff --git a/keyboards/acheron/shark/alpha/rules.mk b/keyboards/acheron/shark/alpha/rules.mk
index 27db06a044..1605120646 100644
--- a/keyboards/acheron/shark/alpha/rules.mk
+++ b/keyboards/acheron/shark/alpha/rules.mk
@@ -1,17 +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 = 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
-ENCODER_ENABLE = yes
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index 1182d39d3b..4e1b46d085 100644
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/acheron/shark/beta/keyboard.json b/keyboards/acheron/shark/beta/keyboard.json
index 7f182068a0..2433f61fec 100644
--- a/keyboards/acheron/shark/beta/keyboard.json
+++ b/keyboards/acheron/shark/beta/keyboard.json
@@ -15,6 +15,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"],
"rows": ["A8", "B14", "A4", "A3"]
diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h
index fb2a5e1ed7..ebe7e5398a 100644
--- a/keyboards/acheron/themis/87h/config.h
+++ b/keyboards/acheron/themis/87h/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/acheron/themis/87h/keyboard.json b/keyboards/acheron/themis/87h/keyboard.json
index ce2037bfad..488cb324c1 100644
--- a/keyboards/acheron/themis/87h/keyboard.json
+++ b/keyboards/acheron/themis/87h/keyboard.json
@@ -19,6 +19,12 @@
"rgblight": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"diode_direction": "COL2ROW",
"eeprom": {
"wear_leveling": {
diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h
index fb2a5e1ed7..ebe7e5398a 100644
--- a/keyboards/acheron/themis/87htsc/config.h
+++ b/keyboards/acheron/themis/87htsc/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/acheron/themis/87htsc/keyboard.json b/keyboards/acheron/themis/87htsc/keyboard.json
index eaf8a323ab..46cdb09247 100644
--- a/keyboards/acheron/themis/87htsc/keyboard.json
+++ b/keyboards/acheron/themis/87htsc/keyboard.json
@@ -19,6 +19,12 @@
"rgblight": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"diode_direction": "COL2ROW",
"eeprom": {
"wear_leveling": {
diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h
index fb2a5e1ed7..ebe7e5398a 100644
--- a/keyboards/acheron/themis/88htsc/config.h
+++ b/keyboards/acheron/themis/88htsc/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/acheron/themis/88htsc/keyboard.json b/keyboards/acheron/themis/88htsc/keyboard.json
index f8e65afbad..1e193d2661 100644
--- a/keyboards/acheron/themis/88htsc/keyboard.json
+++ b/keyboards/acheron/themis/88htsc/keyboard.json
@@ -19,6 +19,12 @@
"rgblight": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"diode_direction": "COL2ROW",
"eeprom": {
"wear_leveling": {
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
deleted file mode 100644
index 86415b251a..0000000000
--- a/keyboards/ada/infinity81/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// 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
-
-/*
- * 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/ada/infinity81/keyboard.json b/keyboards/ada/infinity81/keyboard.json
index 934bd6fca2..40c5bd2f18 100644
--- a/keyboards/ada/infinity81/keyboard.json
+++ b/keyboards/ada/infinity81/keyboard.json
@@ -38,6 +38,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F1", "F4"],
"rows": ["B3", "B2", "B1", "B0", "F6", "B7"]
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index 295af78339..86601c0167 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -8,6 +8,16 @@
"pid": "0x0108",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "audio": true,
+ "encoder": true,
+ "rgb_matrix": true,
+ "oled": true
+ },
"audio": {
"power_control": {
"pin": "GP14"
diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk
index a84e29da3d..1630b74cea 100644
--- a/keyboards/adafruit/macropad/rules.mk
+++ b/keyboards/adafruit/macropad/rules.mk
@@ -1,17 +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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes # Audio output
AUDIO_DRIVER = pwm_hardware
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-OLED_ENABLE = yes
OLED_TRANSPORT = spi
diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h
deleted file mode 100644
index db23a53119..0000000000
--- a/keyboards/adelheid/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 floookay
-
-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/adelheid/keyboard.json b/keyboards/adelheid/keyboard.json
index e066e5d5f1..7766a44a8d 100644
--- a/keyboards/adelheid/keyboard.json
+++ b/keyboards/adelheid/keyboard.json
@@ -17,6 +17,12 @@
"mousekey": false,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "F6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
"rows": ["D0", "F4", "D1", "D2", "D3", "D5", "F7"]
diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json
deleted file mode 100644
index aa7e5a6921..0000000000
--- a/keyboards/adkb96/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
- "keyboard_name": "ADKB96",
- "manufacturer": "Bit Trade One",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x00A5",
- "pid": "0xAD96",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
- "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "tapping": {
- "term": 100
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layout_aliases": {
- "LAYOUT": "LAYOUT_ortho_6x16"
- },
- "layouts": {
- "LAYOUT_ortho_6x16": {
- "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": [6, 0], "x": 8, "y": 0},
- {"matrix": [6, 1], "x": 9, "y": 0},
- {"matrix": [6, 2], "x": 10, "y": 0},
- {"matrix": [6, 3], "x": 11, "y": 0},
- {"matrix": [6, 4], "x": 12, "y": 0},
- {"matrix": [6, 5], "x": 13, "y": 0},
- {"matrix": [6, 6], "x": 14, "y": 0},
- {"matrix": [6, 7], "x": 15, "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": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
- {"matrix": [1, 6], "x": 6, "y": 1},
- {"matrix": [1, 7], "x": 7, "y": 1},
- {"matrix": [7, 0], "x": 8, "y": 1},
- {"matrix": [7, 1], "x": 9, "y": 1},
- {"matrix": [7, 2], "x": 10, "y": 1},
- {"matrix": [7, 3], "x": 11, "y": 1},
- {"matrix": [7, 4], "x": 12, "y": 1},
- {"matrix": [7, 5], "x": 13, "y": 1},
- {"matrix": [7, 6], "x": 14, "y": 1},
- {"matrix": [7, 7], "x": 15, "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": [2, 4], "x": 4, "y": 2},
- {"matrix": [2, 5], "x": 5, "y": 2},
- {"matrix": [2, 6], "x": 6, "y": 2},
- {"matrix": [2, 7], "x": 7, "y": 2},
- {"matrix": [8, 0], "x": 8, "y": 2},
- {"matrix": [8, 1], "x": 9, "y": 2},
- {"matrix": [8, 2], "x": 10, "y": 2},
- {"matrix": [8, 3], "x": 11, "y": 2},
- {"matrix": [8, 4], "x": 12, "y": 2},
- {"matrix": [8, 5], "x": 13, "y": 2},
- {"matrix": [8, 6], "x": 14, "y": 2},
- {"matrix": [8, 7], "x": 15, "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},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3},
- {"matrix": [3, 6], "x": 6, "y": 3},
- {"matrix": [3, 7], "x": 7, "y": 3},
- {"matrix": [9, 0], "x": 8, "y": 3},
- {"matrix": [9, 1], "x": 9, "y": 3},
- {"matrix": [9, 2], "x": 10, "y": 3},
- {"matrix": [9, 3], "x": 11, "y": 3},
- {"matrix": [9, 4], "x": 12, "y": 3},
- {"matrix": [9, 5], "x": 13, "y": 3},
- {"matrix": [9, 6], "x": 14, "y": 3},
- {"matrix": [9, 7], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
- {"matrix": [4, 6], "x": 6, "y": 4},
- {"matrix": [4, 7], "x": 7, "y": 4},
- {"matrix": [10, 0], "x": 8, "y": 4},
- {"matrix": [10, 1], "x": 9, "y": 4},
- {"matrix": [10, 2], "x": 10, "y": 4},
- {"matrix": [10, 3], "x": 11, "y": 4},
- {"matrix": [10, 4], "x": 12, "y": 4},
- {"matrix": [10, 5], "x": 13, "y": 4},
- {"matrix": [10, 6], "x": 14, "y": 4},
- {"matrix": [10, 7], "x": 15, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5},
- {"matrix": [5, 1], "x": 1, "y": 5},
- {"matrix": [5, 2], "x": 2, "y": 5},
- {"matrix": [5, 3], "x": 3, "y": 5},
- {"matrix": [5, 4], "x": 4, "y": 5},
- {"matrix": [5, 5], "x": 5, "y": 5},
- {"matrix": [5, 6], "x": 6, "y": 5},
- {"matrix": [5, 7], "x": 7, "y": 5},
- {"matrix": [11, 0], "x": 8, "y": 5},
- {"matrix": [11, 1], "x": 9, "y": 5},
- {"matrix": [11, 2], "x": 10, "y": 5},
- {"matrix": [11, 3], "x": 11, "y": 5},
- {"matrix": [11, 4], "x": 12, "y": 5},
- {"matrix": [11, 5], "x": 13, "y": 5},
- {"matrix": [11, 6], "x": 14, "y": 5},
- {"matrix": [11, 7], "x": 15, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
deleted file mode 100644
index 0b8941e776..0000000000
--- a/keyboards/adkb96/rev1/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-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/adkb96/rev1/keyboard.json b/keyboards/adkb96/rev1/keyboard.json
new file mode 100644
index 0000000000..77f9177555
--- /dev/null
+++ b/keyboards/adkb96/rev1/keyboard.json
@@ -0,0 +1,148 @@
+{
+ "keyboard_name": "ADKB96",
+ "manufacturer": "Bit Trade One",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x00A5",
+ "pid": "0xAD96",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "tapping": {
+ "term": 100
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_6x16"
+ },
+ "layouts": {
+ "LAYOUT_ortho_6x16": {
+ "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": [6, 0], "x": 8, "y": 0},
+ {"matrix": [6, 1], "x": 9, "y": 0},
+ {"matrix": [6, 2], "x": 10, "y": 0},
+ {"matrix": [6, 3], "x": 11, "y": 0},
+ {"matrix": [6, 4], "x": 12, "y": 0},
+ {"matrix": [6, 5], "x": 13, "y": 0},
+ {"matrix": [6, 6], "x": 14, "y": 0},
+ {"matrix": [6, 7], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [7, 0], "x": 8, "y": 1},
+ {"matrix": [7, 1], "x": 9, "y": 1},
+ {"matrix": [7, 2], "x": 10, "y": 1},
+ {"matrix": [7, 3], "x": 11, "y": 1},
+ {"matrix": [7, 4], "x": 12, "y": 1},
+ {"matrix": [7, 5], "x": 13, "y": 1},
+ {"matrix": [7, 6], "x": 14, "y": 1},
+ {"matrix": [7, 7], "x": 15, "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": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [8, 0], "x": 8, "y": 2},
+ {"matrix": [8, 1], "x": 9, "y": 2},
+ {"matrix": [8, 2], "x": 10, "y": 2},
+ {"matrix": [8, 3], "x": 11, "y": 2},
+ {"matrix": [8, 4], "x": 12, "y": 2},
+ {"matrix": [8, 5], "x": 13, "y": 2},
+ {"matrix": [8, 6], "x": 14, "y": 2},
+ {"matrix": [8, 7], "x": 15, "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},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [9, 0], "x": 8, "y": 3},
+ {"matrix": [9, 1], "x": 9, "y": 3},
+ {"matrix": [9, 2], "x": 10, "y": 3},
+ {"matrix": [9, 3], "x": 11, "y": 3},
+ {"matrix": [9, 4], "x": 12, "y": 3},
+ {"matrix": [9, 5], "x": 13, "y": 3},
+ {"matrix": [9, 6], "x": 14, "y": 3},
+ {"matrix": [9, 7], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [10, 0], "x": 8, "y": 4},
+ {"matrix": [10, 1], "x": 9, "y": 4},
+ {"matrix": [10, 2], "x": 10, "y": 4},
+ {"matrix": [10, 3], "x": 11, "y": 4},
+ {"matrix": [10, 4], "x": 12, "y": 4},
+ {"matrix": [10, 5], "x": 13, "y": 4},
+ {"matrix": [10, 6], "x": 14, "y": 4},
+ {"matrix": [10, 7], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5},
+ {"matrix": [5, 4], "x": 4, "y": 5},
+ {"matrix": [5, 5], "x": 5, "y": 5},
+ {"matrix": [5, 6], "x": 6, "y": 5},
+ {"matrix": [5, 7], "x": 7, "y": 5},
+ {"matrix": [11, 0], "x": 8, "y": 5},
+ {"matrix": [11, 1], "x": 9, "y": 5},
+ {"matrix": [11, 2], "x": 10, "y": 5},
+ {"matrix": [11, 3], "x": 11, "y": 5},
+ {"matrix": [11, 4], "x": 12, "y": 5},
+ {"matrix": [11, 5], "x": 13, "y": 5},
+ {"matrix": [11, 6], "x": 14, "y": 5},
+ {"matrix": [11, 7], "x": 15, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/adkb96/rev1/rules.mk b/keyboards/adkb96/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/adkb96/rules.mk b/keyboards/adkb96/rules.mk
index 2b74eb4183..ac7561b21d 100644
--- a/keyboards/adkb96/rules.mk
+++ b/keyboards/adkb96/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 = 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
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = adkb96/rev1
diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h
deleted file mode 100644
index 8606067a4c..0000000000
--- a/keyboards/aeboards/aegis/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * 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/aeboards/aegis/keyboard.json b/keyboards/aeboards/aegis/keyboard.json
index 26414ba55a..26f5f2a0c1 100644
--- a/keyboards/aeboards/aegis/keyboard.json
+++ b/keyboards/aeboards/aegis/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": false,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C7", "C6", "B7", "D2", "D3", "B3", "B2", "B1", "B0"],
"rows": ["F5", "F6", "E6", "F7", "D1", "D0", "D6", "D4", "B4", "D7", "B6", "B5"]
diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h
deleted file mode 100755
index 01155887a5..0000000000
--- a/keyboards/aeboards/constellation/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * 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/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/info.json
deleted file mode 100644
index 9001eec1c5..0000000000
--- a/keyboards/aeboards/constellation/rev1/info.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
- "keyboard_name": "Constellation Rev1",
- "manufacturer": "AEBoards",
- "url": "",
- "maintainer": "Xelus22",
- "usb": {
- "vid": "0x4145",
- "pid": "0x065C",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["B0", "B1", "F0", "F1", "F4"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
- },
- "layouts": {
- "LAYOUT_65_ansi_rwkl": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_rwkl_split_bs": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/aeboards/constellation/rev1/keyboard.json b/keyboards/aeboards/constellation/rev1/keyboard.json
new file mode 100644
index 0000000000..5a43568d57
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev1/keyboard.json
@@ -0,0 +1,191 @@
+{
+ "keyboard_name": "Constellation Rev1",
+ "manufacturer": "AEBoards",
+ "url": "",
+ "maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x4145",
+ "pid": "0x065C",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["B0", "B1", "F0", "F1", "F4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_65_ansi_rwkl": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_rwkl_split_bs": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/aeboards/constellation/rev1/rules.mk b/keyboards/aeboards/constellation/rev1/rules.mk
deleted file mode 100755
index bc5a3a3498..0000000000
--- a/keyboards/aeboards/constellation/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h
index f4b7be6bdf..2091bab964 100755
--- a/keyboards/aeboards/constellation/rev2/config.h
+++ b/keyboards/aeboards/constellation/rev2/config.h
@@ -16,12 +16,6 @@
#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
-
// I2C setup
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/info.json
deleted file mode 100644
index b8dae5f20c..0000000000
--- a/keyboards/aeboards/constellation/rev2/info.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
- "keyboard_name": "Constellation Rev2",
- "manufacturer": "AEBoards",
- "url": "",
- "maintainer": "Xelus22",
- "usb": {
- "vid": "0x4145",
- "pid": "0x065C",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B12", "A1", "H0", "C15", "C14", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
- "rows": ["B15", "A14", "A2", "B13", "B14"]
- },
- "diode_direction": "COL2ROW",
- "eeprom": {
- "driver": "i2c"
- },
- "processor": "STM32L422",
- "bootloader": "stm32-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
- },
- "layouts": {
- "LAYOUT_65_ansi_rwkl": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_rwkl_split_bs": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/aeboards/constellation/rev2/keyboard.json b/keyboards/aeboards/constellation/rev2/keyboard.json
new file mode 100644
index 0000000000..f296b523e0
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev2/keyboard.json
@@ -0,0 +1,190 @@
+{
+ "keyboard_name": "Constellation Rev2",
+ "manufacturer": "AEBoards",
+ "url": "",
+ "maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x4145",
+ "pid": "0x065C",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B12", "A1", "H0", "C15", "C14", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+ "rows": ["B15", "A14", "A2", "B13", "B14"]
+ },
+ "diode_direction": "COL2ROW",
+ "eeprom": {
+ "driver": "i2c"
+ },
+ "processor": "STM32L422",
+ "bootloader": "stm32-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_65_ansi_rwkl": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_rwkl_split_bs": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/aeboards/constellation/rev2/rules.mk b/keyboards/aeboards/constellation/rev2/rules.mk
deleted file mode 100755
index c12086843f..0000000000
--- a/keyboards/aeboards/constellation/rev2/rules.mk
+++ /dev/null
@@ -1,11 +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 = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/aeboards/constellation/rev3/config.h b/keyboards/aeboards/constellation/rev3/config.h
deleted file mode 100755
index 01155887a5..0000000000
--- a/keyboards/aeboards/constellation/rev3/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * 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/aeboards/constellation/rev3/info.json b/keyboards/aeboards/constellation/rev3/info.json
deleted file mode 100644
index 6e38e99fe9..0000000000
--- a/keyboards/aeboards/constellation/rev3/info.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
- "keyboard_name": "Constellation Rev3",
- "manufacturer": "AEBoards",
- "url": "",
- "maintainer": "Xelus22",
- "usb": {
- "vid": "0x4145",
- "pid": "0x065D",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["B0", "B1", "F0", "F1", "F4"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
- },
- "layouts": {
- "LAYOUT_65_ansi_rwkl": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_rwkl_split_bs": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/aeboards/constellation/rev3/keyboard.json b/keyboards/aeboards/constellation/rev3/keyboard.json
new file mode 100644
index 0000000000..ab39641b74
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev3/keyboard.json
@@ -0,0 +1,191 @@
+{
+ "keyboard_name": "Constellation Rev3",
+ "manufacturer": "AEBoards",
+ "url": "",
+ "maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x4145",
+ "pid": "0x065D",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["B0", "B1", "F0", "F1", "F4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_65_ansi_rwkl": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_rwkl_split_bs": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/aeboards/constellation/rev3/rules.mk b/keyboards/aeboards/constellation/rev3/rules.mk
deleted file mode 100755
index bc5a3a3498..0000000000
--- a/keyboards/aeboards/constellation/rev3/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/info.json
deleted file mode 100644
index 0e110e9235..0000000000
--- a/keyboards/aeboards/ext65/rev1/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "keyboard_name": "Ext65 Rev1",
- "manufacturer": "AEBoards",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "pid": "0xAE65",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["B2", "B3", "B1", "B0", "F7", "F0", "F1", "F4", "F5", "F6"],
- "rows": ["C6", "C7", "B5", "B6", "D7", "B4", "D4", "D6", "B7", "E6"]
- },
- "layout_aliases": {
- "LAYOUT_ext65": "LAYOUT"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [1, 0], "x": 1, "y": 0},
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [1, 1], "x": 3, "y": 0},
-
- {"matrix": [0, 2], "x": 4.5, "y": 0},
- {"matrix": [1, 2], "x": 5.5, "y": 0},
- {"matrix": [0, 3], "x": 6.5, "y": 0},
- {"matrix": [1, 3], "x": 7.5, "y": 0},
- {"matrix": [0, 4], "x": 8.5, "y": 0},
- {"matrix": [1, 4], "x": 9.5, "y": 0},
- {"matrix": [0, 5], "x": 10.5, "y": 0},
- {"matrix": [1, 5], "x": 11.5, "y": 0},
- {"matrix": [0, 6], "x": 12.5, "y": 0},
- {"matrix": [1, 6], "x": 13.5, "y": 0},
- {"matrix": [0, 7], "x": 14.5, "y": 0},
- {"matrix": [1, 7], "x": 15.5, "y": 0},
- {"matrix": [0, 8], "x": 16.5, "y": 0},
- {"matrix": [1, 8], "x": 17.5, "y": 0},
- {"matrix": [5, 8], "x": 18.5, "y": 0},
- {"matrix": [0, 9], "x": 19.5, "y": 0},
-
- {"matrix": [2, 0], "x": 0, "y": 1},
- {"matrix": [3, 0], "x": 1, "y": 1},
- {"matrix": [2, 1], "x": 2, "y": 1},
- {"matrix": [3, 1], "x": 3, "y": 1},
-
- {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
- {"matrix": [3, 2], "x": 6, "y": 1},
- {"matrix": [2, 3], "x": 7, "y": 1},
- {"matrix": [3, 3], "x": 8, "y": 1},
- {"matrix": [2, 4], "x": 9, "y": 1},
- {"matrix": [3, 4], "x": 10, "y": 1},
- {"matrix": [2, 5], "x": 11, "y": 1},
- {"matrix": [3, 5], "x": 12, "y": 1},
- {"matrix": [2, 6], "x": 13, "y": 1},
- {"matrix": [3, 6], "x": 14, "y": 1},
- {"matrix": [2, 7], "x": 15, "y": 1},
- {"matrix": [3, 7], "x": 16, "y": 1},
- {"matrix": [2, 8], "x": 17, "y": 1},
- {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
- {"matrix": [2, 9], "x": 19.5, "y": 1},
-
- {"matrix": [4, 0], "x": 0, "y": 2},
- {"matrix": [5, 0], "x": 1, "y": 2},
- {"matrix": [4, 1], "x": 2, "y": 2},
- {"matrix": [5, 1], "x": 3, "y": 2},
-
- {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
- {"matrix": [5, 2], "x": 6.25, "y": 2},
- {"matrix": [4, 3], "x": 7.25, "y": 2},
- {"matrix": [5, 3], "x": 8.25, "y": 2},
- {"matrix": [4, 4], "x": 9.25, "y": 2},
- {"matrix": [5, 4], "x": 10.25, "y": 2},
- {"matrix": [4, 5], "x": 11.25, "y": 2},
- {"matrix": [5, 5], "x": 12.25, "y": 2},
- {"matrix": [4, 6], "x": 13.25, "y": 2},
- {"matrix": [5, 6], "x": 14.25, "y": 2},
- {"matrix": [4, 7], "x": 15.25, "y": 2},
- {"matrix": [5, 7], "x": 16.25, "y": 2},
- {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
- {"matrix": [4, 9], "x": 19.5, "y": 2},
-
- {"matrix": [6, 0], "x": 0, "y": 3},
- {"matrix": [7, 0], "x": 1, "y": 3},
- {"matrix": [6, 1], "x": 2, "y": 3},
- {"matrix": [7, 1], "x": 3, "y": 3},
-
- {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
- {"matrix": [7, 2], "x": 6.75, "y": 3},
- {"matrix": [6, 3], "x": 7.75, "y": 3},
- {"matrix": [7, 3], "x": 8.75, "y": 3},
- {"matrix": [6, 4], "x": 9.75, "y": 3},
- {"matrix": [7, 4], "x": 10.75, "y": 3},
- {"matrix": [6, 5], "x": 11.75, "y": 3},
- {"matrix": [7, 5], "x": 12.75, "y": 3},
- {"matrix": [6, 6], "x": 13.75, "y": 3},
- {"matrix": [7, 6], "x": 14.75, "y": 3},
- {"matrix": [6, 7], "x": 15.75, "y": 3},
- {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
- {"matrix": [6, 8], "x": 18.5, "y": 3},
- {"matrix": [7, 9], "x": 19.5, "y": 3},
-
- {"matrix": [8, 0], "x": 0, "y": 4},
- {"matrix": [9, 0], "x": 1, "y": 4},
- {"matrix": [8, 1], "x": 2, "y": 4},
- {"matrix": [9, 1], "x": 3, "y": 4},
-
- {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5},
- {"matrix": [9, 2], "x": 6, "y": 4},
- {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5},
- {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25},
- {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25},
- {"matrix": [8, 7], "x": 16, "y": 4},
-
- {"matrix": [9, 8], "x": 17.5, "y": 4},
- {"matrix": [8, 8], "x": 18.5, "y": 4},
- {"matrix": [9, 9], "x": 19.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/aeboards/ext65/rev1/keyboard.json b/keyboards/aeboards/ext65/rev1/keyboard.json
new file mode 100644
index 0000000000..c254a67142
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev1/keyboard.json
@@ -0,0 +1,130 @@
+{
+ "keyboard_name": "Ext65 Rev1",
+ "manufacturer": "AEBoards",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "pid": "0xAE65",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B1", "B0", "F7", "F0", "F1", "F4", "F5", "F6"],
+ "rows": ["C6", "C7", "B5", "B6", "D7", "B4", "D4", "D6", "B7", "E6"]
+ },
+ "layout_aliases": {
+ "LAYOUT_ext65": "LAYOUT"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+ {"matrix": [0, 5], "x": 10.5, "y": 0},
+ {"matrix": [1, 5], "x": 11.5, "y": 0},
+ {"matrix": [0, 6], "x": 12.5, "y": 0},
+ {"matrix": [1, 6], "x": 13.5, "y": 0},
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [1, 8], "x": 17.5, "y": 0},
+ {"matrix": [5, 8], "x": 18.5, "y": 0},
+ {"matrix": [0, 9], "x": 19.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+
+ {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
+ {"matrix": [3, 2], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [3, 3], "x": 8, "y": 1},
+ {"matrix": [2, 4], "x": 9, "y": 1},
+ {"matrix": [3, 4], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+ {"matrix": [3, 5], "x": 12, "y": 1},
+ {"matrix": [2, 6], "x": 13, "y": 1},
+ {"matrix": [3, 6], "x": 14, "y": 1},
+ {"matrix": [2, 7], "x": 15, "y": 1},
+ {"matrix": [3, 7], "x": 16, "y": 1},
+ {"matrix": [2, 8], "x": 17, "y": 1},
+ {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
+ {"matrix": [2, 9], "x": 19.5, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+
+ {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
+ {"matrix": [5, 2], "x": 6.25, "y": 2},
+ {"matrix": [4, 3], "x": 7.25, "y": 2},
+ {"matrix": [5, 3], "x": 8.25, "y": 2},
+ {"matrix": [4, 4], "x": 9.25, "y": 2},
+ {"matrix": [5, 4], "x": 10.25, "y": 2},
+ {"matrix": [4, 5], "x": 11.25, "y": 2},
+ {"matrix": [5, 5], "x": 12.25, "y": 2},
+ {"matrix": [4, 6], "x": 13.25, "y": 2},
+ {"matrix": [5, 6], "x": 14.25, "y": 2},
+ {"matrix": [4, 7], "x": 15.25, "y": 2},
+ {"matrix": [5, 7], "x": 16.25, "y": 2},
+ {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
+ {"matrix": [4, 9], "x": 19.5, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+
+ {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
+ {"matrix": [7, 2], "x": 6.75, "y": 3},
+ {"matrix": [6, 3], "x": 7.75, "y": 3},
+ {"matrix": [7, 3], "x": 8.75, "y": 3},
+ {"matrix": [6, 4], "x": 9.75, "y": 3},
+ {"matrix": [7, 4], "x": 10.75, "y": 3},
+ {"matrix": [6, 5], "x": 11.75, "y": 3},
+ {"matrix": [7, 5], "x": 12.75, "y": 3},
+ {"matrix": [6, 6], "x": 13.75, "y": 3},
+ {"matrix": [7, 6], "x": 14.75, "y": 3},
+ {"matrix": [6, 7], "x": 15.75, "y": 3},
+ {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
+ {"matrix": [6, 8], "x": 18.5, "y": 3},
+ {"matrix": [7, 9], "x": 19.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [9, 0], "x": 1, "y": 4},
+ {"matrix": [8, 1], "x": 2, "y": 4},
+ {"matrix": [9, 1], "x": 3, "y": 4},
+
+ {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 6, "y": 4},
+ {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5},
+ {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25},
+ {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 16, "y": 4},
+
+ {"matrix": [9, 8], "x": 17.5, "y": 4},
+ {"matrix": [8, 8], "x": 18.5, "y": 4},
+ {"matrix": [9, 9], "x": 19.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/aeboards/ext65/rev1/rules.mk b/keyboards/aeboards/ext65/rev1/rules.mk
deleted file mode 100644
index 29eb5c8fbe..0000000000
--- a/keyboards/aeboards/ext65/rev1/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json
deleted file mode 100644
index ab229e19ec..0000000000
--- a/keyboards/aeboards/ext65/rev2/info.json
+++ /dev/null
@@ -1,148 +0,0 @@
-{
- "keyboard_name": "Ext65 Rev2",
- "manufacturer": "AEBoards",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "pid": "0xA652",
- "device_version": "0.0.1"
- },
- "backlight": {
- "pin": "B5",
- "levels": 6,
- "breathing": true
- },
- "rgblight": {
- "led_count": 24,
- "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": "B15",
- "driver": "spi"
- },
- "processor": "STM32F072",
- "bootloader": "stm32-dfu",
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["B14", "B6", "A0", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
- "rows": ["A10", "A9", "A8", "B7", "A2", "A1", "B12", "B11", "B10", "B2"]
- },
- "layout_aliases": {
- "LAYOUT_ext65": "LAYOUT"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [1, 0], "x": 1, "y": 0},
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [1, 1], "x": 3, "y": 0},
-
- {"matrix": [0, 2], "x": 4.5, "y": 0},
- {"matrix": [1, 2], "x": 5.5, "y": 0},
- {"matrix": [0, 3], "x": 6.5, "y": 0},
- {"matrix": [1, 3], "x": 7.5, "y": 0},
- {"matrix": [0, 4], "x": 8.5, "y": 0},
- {"matrix": [1, 4], "x": 9.5, "y": 0},
- {"matrix": [0, 5], "x": 10.5, "y": 0},
- {"matrix": [1, 5], "x": 11.5, "y": 0},
- {"matrix": [0, 6], "x": 12.5, "y": 0},
- {"matrix": [1, 6], "x": 13.5, "y": 0},
- {"matrix": [0, 7], "x": 14.5, "y": 0},
- {"matrix": [1, 7], "x": 15.5, "y": 0},
- {"matrix": [0, 8], "x": 16.5, "y": 0},
- {"matrix": [1, 8], "x": 17.5, "y": 0},
- {"matrix": [5, 8], "x": 18.5, "y": 0},
- {"matrix": [0, 9], "x": 19.5, "y": 0},
-
- {"matrix": [2, 0], "x": 0, "y": 1},
- {"matrix": [3, 0], "x": 1, "y": 1},
- {"matrix": [2, 1], "x": 2, "y": 1},
- {"matrix": [3, 1], "x": 3, "y": 1},
-
- {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
- {"matrix": [3, 2], "x": 6, "y": 1},
- {"matrix": [2, 3], "x": 7, "y": 1},
- {"matrix": [3, 3], "x": 8, "y": 1},
- {"matrix": [2, 4], "x": 9, "y": 1},
- {"matrix": [3, 4], "x": 10, "y": 1},
- {"matrix": [2, 5], "x": 11, "y": 1},
- {"matrix": [3, 5], "x": 12, "y": 1},
- {"matrix": [2, 6], "x": 13, "y": 1},
- {"matrix": [3, 6], "x": 14, "y": 1},
- {"matrix": [2, 7], "x": 15, "y": 1},
- {"matrix": [3, 7], "x": 16, "y": 1},
- {"matrix": [2, 8], "x": 17, "y": 1},
- {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
- {"matrix": [2, 9], "x": 19.5, "y": 1},
-
- {"matrix": [4, 0], "x": 0, "y": 2},
- {"matrix": [5, 0], "x": 1, "y": 2},
- {"matrix": [4, 1], "x": 2, "y": 2},
- {"matrix": [5, 1], "x": 3, "y": 2},
-
- {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
- {"matrix": [5, 2], "x": 6.25, "y": 2},
- {"matrix": [4, 3], "x": 7.25, "y": 2},
- {"matrix": [5, 3], "x": 8.25, "y": 2},
- {"matrix": [4, 4], "x": 9.25, "y": 2},
- {"matrix": [5, 4], "x": 10.25, "y": 2},
- {"matrix": [4, 5], "x": 11.25, "y": 2},
- {"matrix": [5, 5], "x": 12.25, "y": 2},
- {"matrix": [4, 6], "x": 13.25, "y": 2},
- {"matrix": [5, 6], "x": 14.25, "y": 2},
- {"matrix": [4, 7], "x": 15.25, "y": 2},
- {"matrix": [5, 7], "x": 16.25, "y": 2},
- {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
- {"matrix": [4, 9], "x": 19.5, "y": 2},
-
- {"matrix": [6, 0], "x": 0, "y": 3},
- {"matrix": [7, 0], "x": 1, "y": 3},
- {"matrix": [6, 1], "x": 2, "y": 3},
- {"matrix": [7, 1], "x": 3, "y": 3},
-
- {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
- {"matrix": [7, 2], "x": 6.75, "y": 3},
- {"matrix": [6, 3], "x": 7.75, "y": 3},
- {"matrix": [7, 3], "x": 8.75, "y": 3},
- {"matrix": [6, 4], "x": 9.75, "y": 3},
- {"matrix": [7, 4], "x": 10.75, "y": 3},
- {"matrix": [6, 5], "x": 11.75, "y": 3},
- {"matrix": [7, 5], "x": 12.75, "y": 3},
- {"matrix": [6, 6], "x": 13.75, "y": 3},
- {"matrix": [7, 6], "x": 14.75, "y": 3},
- {"matrix": [6, 7], "x": 15.75, "y": 3},
- {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
- {"matrix": [6, 8], "x": 18.5, "y": 3},
- {"matrix": [7, 9], "x": 19.5, "y": 3},
-
- {"matrix": [8, 0], "x": 0, "y": 4},
- {"matrix": [9, 0], "x": 1, "y": 4},
- {"matrix": [8, 1], "x": 2, "y": 4},
- {"matrix": [9, 1], "x": 3, "y": 4},
-
- {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5},
- {"matrix": [9, 2], "x": 6, "y": 4},
- {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5},
- {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25},
- {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25},
- {"matrix": [8, 7], "x": 16, "y": 4},
-
- {"matrix": [9, 8], "x": 17.5, "y": 4},
- {"matrix": [8, 8], "x": 18.5, "y": 4},
- {"matrix": [9, 9], "x": 19.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/aeboards/ext65/rev2/keyboard.json b/keyboards/aeboards/ext65/rev2/keyboard.json
new file mode 100644
index 0000000000..0ab50f9258
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev2/keyboard.json
@@ -0,0 +1,158 @@
+{
+ "keyboard_name": "Ext65 Rev2",
+ "manufacturer": "AEBoards",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "pid": "0xA652",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true,
+ "sleep_led": true
+ },
+ "backlight": {
+ "pin": "B5",
+ "levels": 6,
+ "breathing": true
+ },
+ "rgblight": {
+ "led_count": 24,
+ "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": "B15",
+ "driver": "spi"
+ },
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["B14", "B6", "A0", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+ "rows": ["A10", "A9", "A8", "B7", "A2", "A1", "B12", "B11", "B10", "B2"]
+ },
+ "layout_aliases": {
+ "LAYOUT_ext65": "LAYOUT"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+ {"matrix": [0, 5], "x": 10.5, "y": 0},
+ {"matrix": [1, 5], "x": 11.5, "y": 0},
+ {"matrix": [0, 6], "x": 12.5, "y": 0},
+ {"matrix": [1, 6], "x": 13.5, "y": 0},
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [1, 8], "x": 17.5, "y": 0},
+ {"matrix": [5, 8], "x": 18.5, "y": 0},
+ {"matrix": [0, 9], "x": 19.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+
+ {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
+ {"matrix": [3, 2], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [3, 3], "x": 8, "y": 1},
+ {"matrix": [2, 4], "x": 9, "y": 1},
+ {"matrix": [3, 4], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+ {"matrix": [3, 5], "x": 12, "y": 1},
+ {"matrix": [2, 6], "x": 13, "y": 1},
+ {"matrix": [3, 6], "x": 14, "y": 1},
+ {"matrix": [2, 7], "x": 15, "y": 1},
+ {"matrix": [3, 7], "x": 16, "y": 1},
+ {"matrix": [2, 8], "x": 17, "y": 1},
+ {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
+ {"matrix": [2, 9], "x": 19.5, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+
+ {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
+ {"matrix": [5, 2], "x": 6.25, "y": 2},
+ {"matrix": [4, 3], "x": 7.25, "y": 2},
+ {"matrix": [5, 3], "x": 8.25, "y": 2},
+ {"matrix": [4, 4], "x": 9.25, "y": 2},
+ {"matrix": [5, 4], "x": 10.25, "y": 2},
+ {"matrix": [4, 5], "x": 11.25, "y": 2},
+ {"matrix": [5, 5], "x": 12.25, "y": 2},
+ {"matrix": [4, 6], "x": 13.25, "y": 2},
+ {"matrix": [5, 6], "x": 14.25, "y": 2},
+ {"matrix": [4, 7], "x": 15.25, "y": 2},
+ {"matrix": [5, 7], "x": 16.25, "y": 2},
+ {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
+ {"matrix": [4, 9], "x": 19.5, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+
+ {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
+ {"matrix": [7, 2], "x": 6.75, "y": 3},
+ {"matrix": [6, 3], "x": 7.75, "y": 3},
+ {"matrix": [7, 3], "x": 8.75, "y": 3},
+ {"matrix": [6, 4], "x": 9.75, "y": 3},
+ {"matrix": [7, 4], "x": 10.75, "y": 3},
+ {"matrix": [6, 5], "x": 11.75, "y": 3},
+ {"matrix": [7, 5], "x": 12.75, "y": 3},
+ {"matrix": [6, 6], "x": 13.75, "y": 3},
+ {"matrix": [7, 6], "x": 14.75, "y": 3},
+ {"matrix": [6, 7], "x": 15.75, "y": 3},
+ {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
+ {"matrix": [6, 8], "x": 18.5, "y": 3},
+ {"matrix": [7, 9], "x": 19.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [9, 0], "x": 1, "y": 4},
+ {"matrix": [8, 1], "x": 2, "y": 4},
+ {"matrix": [9, 1], "x": 3, "y": 4},
+
+ {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 6, "y": 4},
+ {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5},
+ {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25},
+ {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 16, "y": 4},
+
+ {"matrix": [9, 8], "x": 17.5, "y": 4},
+ {"matrix": [8, 8], "x": 18.5, "y": 4},
+ {"matrix": [9, 9], "x": 19.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/aeboards/ext65/rev2/rules.mk b/keyboards/aeboards/ext65/rev2/rules.mk
deleted file mode 100644
index b9637955ff..0000000000
--- a/keyboards/aeboards/ext65/rev2/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # 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
-SLEEP_LED_ENABLE = yes
-
diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/info.json
index 0faf6fa135..8c8051fc44 100644
--- a/keyboards/aeboards/ext65/rev3/info.json
+++ b/keyboards/aeboards/ext65/rev3/info.json
@@ -7,6 +7,15 @@
"pid": "0xA653",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
"indicators": {
"caps_lock": "F4",
"num_lock": "F5",
diff --git a/keyboards/aeboards/ext65/rev3/rules.mk b/keyboards/aeboards/ext65/rev3/rules.mk
index f1ec651506..1716098b3e 100644
--- a/keyboards/aeboards/ext65/rev3/rules.mk
+++ b/keyboards/aeboards/ext65/rev3/rules.mk
@@ -1,13 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
OPT = 3
-LTO_ENABLE = yes
diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/info.json
index 68256ed869..8b90704efa 100644
--- a/keyboards/aeboards/satellite/rev1/info.json
+++ b/keyboards/aeboards/satellite/rev1/info.json
@@ -8,6 +8,16 @@
"pid": "0x6553",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "build": {
+ "lto": true
+ },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
diff --git a/keyboards/aeboards/satellite/rev1/rules.mk b/keyboards/aeboards/satellite/rev1/rules.mk
index f95b0f015d..7149ec106a 100644
--- a/keyboards/aeboards/satellite/rev1/rules.mk
+++ b/keyboards/aeboards/satellite/rev1/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
-
COMMON_VPATH += $(DRIVER_PATH)/issi
# project specific files
diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json
deleted file mode 100644
index 0afb37957f..0000000000
--- a/keyboards/afternoonlabs/breeze/rev0/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
- "keyboard_name": "Breeze",
- "manufacturer": "AfternoonLabs",
- "url": "afternoonlabs.com/breeze",
- "maintainer": "eithanshavit",
- "usb": {
- "vid": "0x616C",
- "pid": "0x0001",
- "device_version": "0.0.0"
- },
- "matrix_pins": {
- "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7", "B1"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "bootmagic": {
- "matrix": [0, 5]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 5], "x": 0, "y": 0.375},
- {"matrix": [0, 4], "x": 1, "y": 0.375},
- {"matrix": [0, 3], "x": 2, "y": 0.125},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 1], "x": 4, "y": 0.125},
- {"matrix": [0, 0], "x": 5, "y": 0.25},
-
- {"matrix": [5, 0], "x": 9.75, "y": 0.25},
- {"matrix": [5, 1], "x": 10.75, "y": 0.125},
- {"matrix": [5, 2], "x": 11.75, "y": 0},
- {"matrix": [5, 3], "x": 12.75, "y": 0.125},
- {"matrix": [5, 4], "x": 13.75, "y": 0.375},
- {"matrix": [5, 5], "x": 14.75, "y": 0.375},
-
- {"matrix": [5, 6], "x": 16, "y": 0.375},
- {"matrix": [5, 7], "x": 17, "y": 0.375},
- {"matrix": [5, 8], "x": 18, "y": 0.375},
-
- {"matrix": [1, 5], "x": 0, "y": 1.375},
- {"matrix": [1, 4], "x": 1, "y": 1.375},
- {"matrix": [1, 3], "x": 2, "y": 1.125},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [1, 1], "x": 4, "y": 1.125},
- {"matrix": [1, 0], "x": 5, "y": 1.25},
-
- {"matrix": [6, 0], "x": 9.75, "y": 1.25},
- {"matrix": [6, 1], "x": 10.75, "y": 1.125},
- {"matrix": [6, 2], "x": 11.75, "y": 1},
- {"matrix": [6, 3], "x": 12.75, "y": 1.125},
- {"matrix": [6, 4], "x": 13.75, "y": 1.375},
- {"matrix": [6, 5], "x": 14.75, "y": 1.375},
-
- {"matrix": [6, 6], "x": 16, "y": 1.375},
- {"matrix": [6, 7], "x": 17, "y": 1.375},
- {"matrix": [6, 8], "x": 18, "y": 1.375},
-
- {"matrix": [2, 5], "x": 0, "y": 2.375},
- {"matrix": [2, 4], "x": 1, "y": 2.375},
- {"matrix": [2, 3], "x": 2, "y": 2.125},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 1], "x": 4, "y": 2.125},
- {"matrix": [2, 0], "x": 5, "y": 2.25},
-
- {"matrix": [7, 0], "x": 9.75, "y": 2.25},
- {"matrix": [7, 1], "x": 10.75, "y": 2.125},
- {"matrix": [7, 2], "x": 11.75, "y": 2},
- {"matrix": [7, 3], "x": 12.75, "y": 2.125},
- {"matrix": [7, 4], "x": 13.75, "y": 2.375},
- {"matrix": [7, 5], "x": 14.75, "y": 2.375},
-
- {"matrix": [7, 7], "x": 17, "y": 2.375},
-
- {"matrix": [3, 5], "x": 0, "y": 3.375},
- {"matrix": [3, 4], "x": 1, "y": 3.375},
- {"matrix": [3, 3], "x": 2, "y": 3.125},
- {"matrix": [3, 2], "x": 3, "y": 3},
- {"matrix": [3, 1], "x": 4, "y": 3.125},
- {"matrix": [3, 0], "x": 5, "y": 3.25},
-
- {"matrix": [8, 0], "x": 9.75, "y": 3.25},
- {"matrix": [8, 1], "x": 10.75, "y": 3.125},
- {"matrix": [8, 2], "x": 11.75, "y": 3},
- {"matrix": [8, 3], "x": 12.75, "y": 3.125},
- {"matrix": [8, 4], "x": 13.75, "y": 3.375},
- {"matrix": [8, 5], "x": 14.75, "y": 3.375},
-
- {"matrix": [8, 6], "x": 16, "y": 3.375},
- {"matrix": [8, 7], "x": 17, "y": 3.375},
- {"matrix": [8, 8], "x": 18, "y": 3.375},
-
- {"matrix": [4, 3], "x": 2.5, "y": 4.25},
- {"matrix": [4, 2], "x": 3.5, "y": 4.25},
- {"matrix": [4, 1], "x": 4.5, "y": 4.5},
- {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30},
-
- {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30},
- {"matrix": [9, 1], "x": 10.25, "y": 4.5},
- {"matrix": [9, 2], "x": 11.25, "y": 4.25},
- {"matrix": [9, 3], "x": 12.25, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/afternoonlabs/breeze/rev0/keyboard.json b/keyboards/afternoonlabs/breeze/rev0/keyboard.json
new file mode 100644
index 0000000000..f20f082ec9
--- /dev/null
+++ b/keyboards/afternoonlabs/breeze/rev0/keyboard.json
@@ -0,0 +1,116 @@
+{
+ "keyboard_name": "Breeze",
+ "manufacturer": "AfternoonLabs",
+ "url": "afternoonlabs.com/breeze",
+ "maintainer": "eithanshavit",
+ "usb": {
+ "vid": "0x616C",
+ "pid": "0x0001",
+ "device_version": "0.0.0"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "console": true
+ },
+ "matrix_pins": {
+ "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7", "B1"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "bootmagic": {
+ "matrix": [0, 5]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 5], "x": 0, "y": 0.375},
+ {"matrix": [0, 4], "x": 1, "y": 0.375},
+ {"matrix": [0, 3], "x": 2, "y": 0.125},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0.125},
+ {"matrix": [0, 0], "x": 5, "y": 0.25},
+
+ {"matrix": [5, 0], "x": 9.75, "y": 0.25},
+ {"matrix": [5, 1], "x": 10.75, "y": 0.125},
+ {"matrix": [5, 2], "x": 11.75, "y": 0},
+ {"matrix": [5, 3], "x": 12.75, "y": 0.125},
+ {"matrix": [5, 4], "x": 13.75, "y": 0.375},
+ {"matrix": [5, 5], "x": 14.75, "y": 0.375},
+
+ {"matrix": [5, 6], "x": 16, "y": 0.375},
+ {"matrix": [5, 7], "x": 17, "y": 0.375},
+ {"matrix": [5, 8], "x": 18, "y": 0.375},
+
+ {"matrix": [1, 5], "x": 0, "y": 1.375},
+ {"matrix": [1, 4], "x": 1, "y": 1.375},
+ {"matrix": [1, 3], "x": 2, "y": 1.125},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1.125},
+ {"matrix": [1, 0], "x": 5, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 9.75, "y": 1.25},
+ {"matrix": [6, 1], "x": 10.75, "y": 1.125},
+ {"matrix": [6, 2], "x": 11.75, "y": 1},
+ {"matrix": [6, 3], "x": 12.75, "y": 1.125},
+ {"matrix": [6, 4], "x": 13.75, "y": 1.375},
+ {"matrix": [6, 5], "x": 14.75, "y": 1.375},
+
+ {"matrix": [6, 6], "x": 16, "y": 1.375},
+ {"matrix": [6, 7], "x": 17, "y": 1.375},
+ {"matrix": [6, 8], "x": 18, "y": 1.375},
+
+ {"matrix": [2, 5], "x": 0, "y": 2.375},
+ {"matrix": [2, 4], "x": 1, "y": 2.375},
+ {"matrix": [2, 3], "x": 2, "y": 2.125},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2.125},
+ {"matrix": [2, 0], "x": 5, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+ {"matrix": [7, 1], "x": 10.75, "y": 2.125},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 3], "x": 12.75, "y": 2.125},
+ {"matrix": [7, 4], "x": 13.75, "y": 2.375},
+ {"matrix": [7, 5], "x": 14.75, "y": 2.375},
+
+ {"matrix": [7, 7], "x": 17, "y": 2.375},
+
+ {"matrix": [3, 5], "x": 0, "y": 3.375},
+ {"matrix": [3, 4], "x": 1, "y": 3.375},
+ {"matrix": [3, 3], "x": 2, "y": 3.125},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 1], "x": 4, "y": 3.125},
+ {"matrix": [3, 0], "x": 5, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 9.75, "y": 3.25},
+ {"matrix": [8, 1], "x": 10.75, "y": 3.125},
+ {"matrix": [8, 2], "x": 11.75, "y": 3},
+ {"matrix": [8, 3], "x": 12.75, "y": 3.125},
+ {"matrix": [8, 4], "x": 13.75, "y": 3.375},
+ {"matrix": [8, 5], "x": 14.75, "y": 3.375},
+
+ {"matrix": [8, 6], "x": 16, "y": 3.375},
+ {"matrix": [8, 7], "x": 17, "y": 3.375},
+ {"matrix": [8, 8], "x": 18, "y": 3.375},
+
+ {"matrix": [4, 3], "x": 2.5, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+ {"matrix": [4, 1], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30},
+
+ {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30},
+ {"matrix": [9, 1], "x": 10.25, "y": 4.5},
+ {"matrix": [9, 2], "x": 11.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 12.25, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/afternoonlabs/breeze/rev0/rules.mk b/keyboards/afternoonlabs/breeze/rev0/rules.mk
deleted file mode 100644
index 7b63c0c298..0000000000
--- a/keyboards/afternoonlabs/breeze/rev0/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json
deleted file mode 100644
index 21b6a7a436..0000000000
--- a/keyboards/afternoonlabs/breeze/rev1/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
- "keyboard_name": "Breeze",
- "manufacturer": "AfternoonLabs",
- "url": "afternoonlabs.com/breeze",
- "maintainer": "eithanshavit",
- "usb": {
- "vid": "0x616C",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7", "B1"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "bootmagic": {
- "matrix": [0, 5]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 5], "x": 0, "y": 0.375},
- {"matrix": [0, 4], "x": 1, "y": 0.375},
- {"matrix": [0, 3], "x": 2, "y": 0.125},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 1], "x": 4, "y": 0.125},
- {"matrix": [0, 0], "x": 5, "y": 0.25},
-
- {"matrix": [5, 0], "x": 9.75, "y": 0.25},
- {"matrix": [5, 1], "x": 10.75, "y": 0.125},
- {"matrix": [5, 2], "x": 11.75, "y": 0},
- {"matrix": [5, 3], "x": 12.75, "y": 0.125},
- {"matrix": [5, 4], "x": 13.75, "y": 0.375},
- {"matrix": [5, 5], "x": 14.75, "y": 0.375},
-
- {"matrix": [5, 6], "x": 16, "y": 0.375},
- {"matrix": [5, 7], "x": 17, "y": 0.375},
- {"matrix": [5, 8], "x": 18, "y": 0.375},
-
- {"matrix": [1, 5], "x": 0, "y": 1.375},
- {"matrix": [1, 4], "x": 1, "y": 1.375},
- {"matrix": [1, 3], "x": 2, "y": 1.125},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [1, 1], "x": 4, "y": 1.125},
- {"matrix": [1, 0], "x": 5, "y": 1.25},
-
- {"matrix": [6, 0], "x": 9.75, "y": 1.25},
- {"matrix": [6, 1], "x": 10.75, "y": 1.125},
- {"matrix": [6, 2], "x": 11.75, "y": 1},
- {"matrix": [6, 3], "x": 12.75, "y": 1.125},
- {"matrix": [6, 4], "x": 13.75, "y": 1.375},
- {"matrix": [6, 5], "x": 14.75, "y": 1.375},
-
- {"matrix": [6, 6], "x": 16, "y": 1.375},
- {"matrix": [6, 7], "x": 17, "y": 1.375},
- {"matrix": [6, 8], "x": 18, "y": 1.375},
-
- {"matrix": [2, 5], "x": 0, "y": 2.375},
- {"matrix": [2, 4], "x": 1, "y": 2.375},
- {"matrix": [2, 3], "x": 2, "y": 2.125},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 1], "x": 4, "y": 2.125},
- {"matrix": [2, 0], "x": 5, "y": 2.25},
-
- {"matrix": [7, 0], "x": 9.75, "y": 2.25},
- {"matrix": [7, 1], "x": 10.75, "y": 2.125},
- {"matrix": [7, 2], "x": 11.75, "y": 2},
- {"matrix": [7, 3], "x": 12.75, "y": 2.125},
- {"matrix": [7, 4], "x": 13.75, "y": 2.375},
- {"matrix": [7, 5], "x": 14.75, "y": 2.375},
-
- {"matrix": [7, 7], "x": 17, "y": 2.375},
-
- {"matrix": [3, 5], "x": 0, "y": 3.375},
- {"matrix": [3, 4], "x": 1, "y": 3.375},
- {"matrix": [3, 3], "x": 2, "y": 3.125},
- {"matrix": [3, 2], "x": 3, "y": 3},
- {"matrix": [3, 1], "x": 4, "y": 3.125},
- {"matrix": [3, 0], "x": 5, "y": 3.25},
-
- {"matrix": [8, 0], "x": 9.75, "y": 3.25},
- {"matrix": [8, 1], "x": 10.75, "y": 3.125},
- {"matrix": [8, 2], "x": 11.75, "y": 3},
- {"matrix": [8, 3], "x": 12.75, "y": 3.125},
- {"matrix": [8, 4], "x": 13.75, "y": 3.375},
- {"matrix": [8, 5], "x": 14.75, "y": 3.375},
-
- {"matrix": [8, 6], "x": 16, "y": 3.375},
- {"matrix": [8, 7], "x": 17, "y": 3.375},
- {"matrix": [8, 8], "x": 18, "y": 3.375},
-
- {"matrix": [4, 3], "x": 2.5, "y": 4.25},
- {"matrix": [4, 2], "x": 3.5, "y": 4.25},
- {"matrix": [4, 1], "x": 4.5, "y": 4.5},
- {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30},
-
- {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30},
- {"matrix": [9, 1], "x": 10.25, "y": 4.5},
- {"matrix": [9, 2], "x": 11.25, "y": 4.25},
- {"matrix": [9, 3], "x": 12.25, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/afternoonlabs/breeze/rev1/keyboard.json b/keyboards/afternoonlabs/breeze/rev1/keyboard.json
new file mode 100644
index 0000000000..ccb13551c1
--- /dev/null
+++ b/keyboards/afternoonlabs/breeze/rev1/keyboard.json
@@ -0,0 +1,116 @@
+{
+ "keyboard_name": "Breeze",
+ "manufacturer": "AfternoonLabs",
+ "url": "afternoonlabs.com/breeze",
+ "maintainer": "eithanshavit",
+ "usb": {
+ "vid": "0x616C",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true
+ },
+ "matrix_pins": {
+ "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7", "B1"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "bootmagic": {
+ "matrix": [0, 5]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 5], "x": 0, "y": 0.375},
+ {"matrix": [0, 4], "x": 1, "y": 0.375},
+ {"matrix": [0, 3], "x": 2, "y": 0.125},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0.125},
+ {"matrix": [0, 0], "x": 5, "y": 0.25},
+
+ {"matrix": [5, 0], "x": 9.75, "y": 0.25},
+ {"matrix": [5, 1], "x": 10.75, "y": 0.125},
+ {"matrix": [5, 2], "x": 11.75, "y": 0},
+ {"matrix": [5, 3], "x": 12.75, "y": 0.125},
+ {"matrix": [5, 4], "x": 13.75, "y": 0.375},
+ {"matrix": [5, 5], "x": 14.75, "y": 0.375},
+
+ {"matrix": [5, 6], "x": 16, "y": 0.375},
+ {"matrix": [5, 7], "x": 17, "y": 0.375},
+ {"matrix": [5, 8], "x": 18, "y": 0.375},
+
+ {"matrix": [1, 5], "x": 0, "y": 1.375},
+ {"matrix": [1, 4], "x": 1, "y": 1.375},
+ {"matrix": [1, 3], "x": 2, "y": 1.125},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1.125},
+ {"matrix": [1, 0], "x": 5, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 9.75, "y": 1.25},
+ {"matrix": [6, 1], "x": 10.75, "y": 1.125},
+ {"matrix": [6, 2], "x": 11.75, "y": 1},
+ {"matrix": [6, 3], "x": 12.75, "y": 1.125},
+ {"matrix": [6, 4], "x": 13.75, "y": 1.375},
+ {"matrix": [6, 5], "x": 14.75, "y": 1.375},
+
+ {"matrix": [6, 6], "x": 16, "y": 1.375},
+ {"matrix": [6, 7], "x": 17, "y": 1.375},
+ {"matrix": [6, 8], "x": 18, "y": 1.375},
+
+ {"matrix": [2, 5], "x": 0, "y": 2.375},
+ {"matrix": [2, 4], "x": 1, "y": 2.375},
+ {"matrix": [2, 3], "x": 2, "y": 2.125},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2.125},
+ {"matrix": [2, 0], "x": 5, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+ {"matrix": [7, 1], "x": 10.75, "y": 2.125},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 3], "x": 12.75, "y": 2.125},
+ {"matrix": [7, 4], "x": 13.75, "y": 2.375},
+ {"matrix": [7, 5], "x": 14.75, "y": 2.375},
+
+ {"matrix": [7, 7], "x": 17, "y": 2.375},
+
+ {"matrix": [3, 5], "x": 0, "y": 3.375},
+ {"matrix": [3, 4], "x": 1, "y": 3.375},
+ {"matrix": [3, 3], "x": 2, "y": 3.125},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 1], "x": 4, "y": 3.125},
+ {"matrix": [3, 0], "x": 5, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 9.75, "y": 3.25},
+ {"matrix": [8, 1], "x": 10.75, "y": 3.125},
+ {"matrix": [8, 2], "x": 11.75, "y": 3},
+ {"matrix": [8, 3], "x": 12.75, "y": 3.125},
+ {"matrix": [8, 4], "x": 13.75, "y": 3.375},
+ {"matrix": [8, 5], "x": 14.75, "y": 3.375},
+
+ {"matrix": [8, 6], "x": 16, "y": 3.375},
+ {"matrix": [8, 7], "x": 17, "y": 3.375},
+ {"matrix": [8, 8], "x": 18, "y": 3.375},
+
+ {"matrix": [4, 3], "x": 2.5, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+ {"matrix": [4, 1], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30},
+
+ {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30},
+ {"matrix": [9, 1], "x": 10.25, "y": 4.5},
+ {"matrix": [9, 2], "x": 11.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 12.25, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/afternoonlabs/breeze/rev1/rules.mk b/keyboards/afternoonlabs/breeze/rev1/rules.mk
deleted file mode 100644
index 151c93f779..0000000000
--- a/keyboards/afternoonlabs/breeze/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-SPLIT_KEYBOARD = yes
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
deleted file mode 100644
index 44f7fa7006..0000000000
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
- "keyboard_name": "OceanBreeze",
- "manufacturer": "AfternoonLabs",
- "url": "afternoonlabs.com",
- "maintainer": "afternoonlabs",
- "usb": {
- "vid": "0x616C",
- "pid": "0x0003",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7", "B1", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "bootmagic": {
- "matrix": [0, 5]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 5], "x": 0, "y": 0.375},
- {"matrix": [0, 4], "x": 1, "y": 0.375},
- {"matrix": [0, 3], "x": 2, "y": 0.125},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 1], "x": 4, "y": 0.125},
- {"matrix": [0, 0], "x": 5, "y": 0.25},
-
- {"matrix": [6, 0], "x": 9.75, "y": 0.25},
- {"matrix": [6, 1], "x": 10.75, "y": 0.125},
- {"matrix": [6, 2], "x": 11.75, "y": 0},
- {"matrix": [6, 3], "x": 12.75, "y": 0.125},
- {"matrix": [6, 4], "x": 13.75, "y": 0.375},
- {"matrix": [6, 5], "x": 14.75, "y": 0.375},
-
- {"matrix": [6, 6], "x": 16, "y": 0.375},
- {"matrix": [6, 7], "x": 17, "y": 0.375},
- {"matrix": [6, 8], "x": 18, "y": 0.375},
-
- {"matrix": [1, 5], "x": 0, "y": 1.375},
- {"matrix": [1, 4], "x": 1, "y": 1.375},
- {"matrix": [1, 3], "x": 2, "y": 1.125},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [1, 1], "x": 4, "y": 1.125},
- {"matrix": [1, 0], "x": 5, "y": 1.25},
-
- {"matrix": [7, 0], "x": 9.75, "y": 1.25},
- {"matrix": [7, 1], "x": 10.75, "y": 1.125},
- {"matrix": [7, 2], "x": 11.75, "y": 1},
- {"matrix": [7, 3], "x": 12.75, "y": 1.125},
- {"matrix": [7, 4], "x": 13.75, "y": 1.375},
- {"matrix": [7, 5], "x": 14.75, "y": 1.375},
-
- {"matrix": [7, 6], "x": 16, "y": 1.375},
- {"matrix": [7, 7], "x": 17, "y": 1.375},
- {"matrix": [7, 8], "x": 18, "y": 1.375},
-
- {"matrix": [2, 5], "x": 0, "y": 2.375},
- {"matrix": [2, 4], "x": 1, "y": 2.375},
- {"matrix": [2, 3], "x": 2, "y": 2.125},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 1], "x": 4, "y": 2.125},
- {"matrix": [2, 0], "x": 5, "y": 2.25},
-
- {"matrix": [8, 0], "x": 9.75, "y": 2.25},
- {"matrix": [8, 1], "x": 10.75, "y": 2.125},
- {"matrix": [8, 2], "x": 11.75, "y": 2},
- {"matrix": [8, 3], "x": 12.75, "y": 2.125},
- {"matrix": [8, 4], "x": 13.75, "y": 2.375},
- {"matrix": [8, 5], "x": 14.75, "y": 2.375},
-
- {"matrix": [8, 7], "x": 17, "y": 2.375},
-
- {"matrix": [3, 5], "x": 0, "y": 3.375},
- {"matrix": [3, 4], "x": 1, "y": 3.375},
- {"matrix": [3, 3], "x": 2, "y": 3.125},
- {"matrix": [3, 2], "x": 3, "y": 3},
- {"matrix": [3, 1], "x": 4, "y": 3.125},
- {"matrix": [3, 0], "x": 5, "y": 3.25},
-
- {"matrix": [5, 0], "x": 6.25, "y": 3.75},
-
- {"matrix": [11, 0], "x": 8.5, "y": 3.75},
-
- {"matrix": [9, 0], "x": 9.75, "y": 3.25},
- {"matrix": [9, 1], "x": 10.75, "y": 3.125},
- {"matrix": [9, 2], "x": 11.75, "y": 3},
- {"matrix": [9, 3], "x": 12.75, "y": 3.125},
- {"matrix": [9, 4], "x": 13.75, "y": 3.375},
- {"matrix": [9, 5], "x": 14.75, "y": 3.375},
-
- {"matrix": [9, 6], "x": 16, "y": 3.375},
- {"matrix": [9, 7], "x": 17, "y": 3.375},
- {"matrix": [9, 8], "x": 18, "y": 3.375},
-
- {"matrix": [4, 3], "x": 2.5, "y": 4.25},
- {"matrix": [4, 2], "x": 3.5, "y": 4.25},
- {"matrix": [4, 1], "x": 4.5, "y": 4.5},
- {"matrix": [4, 0], "x": 6.25, "y": 4.75},
-
- {"matrix": [10, 0], "x": 8.5, "y": 4.75},
- {"matrix": [10, 1], "x": 10.25, "y": 4.5},
- {"matrix": [10, 2], "x": 11.25, "y": 4.25},
- {"matrix": [10, 3], "x": 12.25, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json b/keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json
new file mode 100644
index 0000000000..2a80a0bc2b
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json
@@ -0,0 +1,120 @@
+{
+ "keyboard_name": "OceanBreeze",
+ "manufacturer": "AfternoonLabs",
+ "url": "afternoonlabs.com",
+ "maintainer": "afternoonlabs",
+ "usb": {
+ "vid": "0x616C",
+ "pid": "0x0003",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true
+ },
+ "matrix_pins": {
+ "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7", "B1", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "bootmagic": {
+ "matrix": [0, 5]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 5], "x": 0, "y": 0.375},
+ {"matrix": [0, 4], "x": 1, "y": 0.375},
+ {"matrix": [0, 3], "x": 2, "y": 0.125},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0.125},
+ {"matrix": [0, 0], "x": 5, "y": 0.25},
+
+ {"matrix": [6, 0], "x": 9.75, "y": 0.25},
+ {"matrix": [6, 1], "x": 10.75, "y": 0.125},
+ {"matrix": [6, 2], "x": 11.75, "y": 0},
+ {"matrix": [6, 3], "x": 12.75, "y": 0.125},
+ {"matrix": [6, 4], "x": 13.75, "y": 0.375},
+ {"matrix": [6, 5], "x": 14.75, "y": 0.375},
+
+ {"matrix": [6, 6], "x": 16, "y": 0.375},
+ {"matrix": [6, 7], "x": 17, "y": 0.375},
+ {"matrix": [6, 8], "x": 18, "y": 0.375},
+
+ {"matrix": [1, 5], "x": 0, "y": 1.375},
+ {"matrix": [1, 4], "x": 1, "y": 1.375},
+ {"matrix": [1, 3], "x": 2, "y": 1.125},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1.125},
+ {"matrix": [1, 0], "x": 5, "y": 1.25},
+
+ {"matrix": [7, 0], "x": 9.75, "y": 1.25},
+ {"matrix": [7, 1], "x": 10.75, "y": 1.125},
+ {"matrix": [7, 2], "x": 11.75, "y": 1},
+ {"matrix": [7, 3], "x": 12.75, "y": 1.125},
+ {"matrix": [7, 4], "x": 13.75, "y": 1.375},
+ {"matrix": [7, 5], "x": 14.75, "y": 1.375},
+
+ {"matrix": [7, 6], "x": 16, "y": 1.375},
+ {"matrix": [7, 7], "x": 17, "y": 1.375},
+ {"matrix": [7, 8], "x": 18, "y": 1.375},
+
+ {"matrix": [2, 5], "x": 0, "y": 2.375},
+ {"matrix": [2, 4], "x": 1, "y": 2.375},
+ {"matrix": [2, 3], "x": 2, "y": 2.125},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2.125},
+ {"matrix": [2, 0], "x": 5, "y": 2.25},
+
+ {"matrix": [8, 0], "x": 9.75, "y": 2.25},
+ {"matrix": [8, 1], "x": 10.75, "y": 2.125},
+ {"matrix": [8, 2], "x": 11.75, "y": 2},
+ {"matrix": [8, 3], "x": 12.75, "y": 2.125},
+ {"matrix": [8, 4], "x": 13.75, "y": 2.375},
+ {"matrix": [8, 5], "x": 14.75, "y": 2.375},
+
+ {"matrix": [8, 7], "x": 17, "y": 2.375},
+
+ {"matrix": [3, 5], "x": 0, "y": 3.375},
+ {"matrix": [3, 4], "x": 1, "y": 3.375},
+ {"matrix": [3, 3], "x": 2, "y": 3.125},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 1], "x": 4, "y": 3.125},
+ {"matrix": [3, 0], "x": 5, "y": 3.25},
+
+ {"matrix": [5, 0], "x": 6.25, "y": 3.75},
+
+ {"matrix": [11, 0], "x": 8.5, "y": 3.75},
+
+ {"matrix": [9, 0], "x": 9.75, "y": 3.25},
+ {"matrix": [9, 1], "x": 10.75, "y": 3.125},
+ {"matrix": [9, 2], "x": 11.75, "y": 3},
+ {"matrix": [9, 3], "x": 12.75, "y": 3.125},
+ {"matrix": [9, 4], "x": 13.75, "y": 3.375},
+ {"matrix": [9, 5], "x": 14.75, "y": 3.375},
+
+ {"matrix": [9, 6], "x": 16, "y": 3.375},
+ {"matrix": [9, 7], "x": 17, "y": 3.375},
+ {"matrix": [9, 8], "x": 18, "y": 3.375},
+
+ {"matrix": [4, 3], "x": 2.5, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+ {"matrix": [4, 1], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 0], "x": 6.25, "y": 4.75},
+
+ {"matrix": [10, 0], "x": 8.5, "y": 4.75},
+ {"matrix": [10, 1], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 2], "x": 11.25, "y": 4.25},
+ {"matrix": [10, 3], "x": 12.25, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk b/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk
deleted file mode 100644
index 904c6b60cb..0000000000
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk
+++ /dev/null
@@ -1,13 +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 = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json
deleted file mode 100644
index c71feef8ba..0000000000
--- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
- "keyboard_name": "Southern Breeze",
- "manufacturer": "AfternoonLabs",
- "url": "afternoonlabs.com/breeze",
- "maintainer": "eithanshavit",
- "usb": {
- "vid": "0x616C",
- "pid": "0x0005",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7", "B1"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "bootmagic": {
- "matrix": [0, 5]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 8], "x": 0, "y": 0.375},
- {"matrix": [0, 7], "x": 1, "y": 0.375},
- {"matrix": [0, 6], "x": 2, "y": 0.375},
-
- {"matrix": [0, 5], "x": 3.25, "y": 0.375},
- {"matrix": [0, 4], "x": 4.25, "y": 0.375},
- {"matrix": [0, 3], "x": 5.25, "y": 0.125},
- {"matrix": [0, 2], "x": 6.25, "y": 0},
- {"matrix": [0, 1], "x": 7.25, "y": 0.125},
- {"matrix": [0, 0], "x": 8.25, "y": 0.25},
-
- {"matrix": [5, 0], "x": 13, "y": 0.25},
- {"matrix": [5, 1], "x": 14, "y": 0.125},
- {"matrix": [5, 2], "x": 15, "y": 0},
- {"matrix": [5, 3], "x": 16, "y": 0.125},
- {"matrix": [5, 4], "x": 17, "y": 0.375},
- {"matrix": [5, 5], "x": 18, "y": 0.375},
-
- {"matrix": [1, 8], "x": 0, "y": 1.375},
- {"matrix": [1, 7], "x": 1, "y": 1.375},
- {"matrix": [1, 6], "x": 2, "y": 1.375},
-
- {"matrix": [1, 5], "x": 3.25, "y": 1.375},
- {"matrix": [1, 4], "x": 4.25, "y": 1.375},
- {"matrix": [1, 3], "x": 5.25, "y": 1.125},
- {"matrix": [1, 2], "x": 6.25, "y": 1},
- {"matrix": [1, 1], "x": 7.25, "y": 1.125},
- {"matrix": [1, 0], "x": 8.25, "y": 1.25},
-
- {"matrix": [6, 0], "x": 13, "y": 1.25},
- {"matrix": [6, 1], "x": 14, "y": 1.125},
- {"matrix": [6, 2], "x": 15, "y": 1},
- {"matrix": [6, 3], "x": 16, "y": 1.125},
- {"matrix": [6, 4], "x": 17, "y": 1.375},
- {"matrix": [6, 5], "x": 18, "y": 1.375},
-
- {"matrix": [2, 7], "x": 1, "y": 2.375},
-
- {"matrix": [2, 5], "x": 3.25, "y": 2.375},
- {"matrix": [2, 4], "x": 4.25, "y": 2.375},
- {"matrix": [2, 3], "x": 5.25, "y": 2.125},
- {"matrix": [2, 2], "x": 6.25, "y": 2},
- {"matrix": [2, 1], "x": 7.25, "y": 2.125},
- {"matrix": [2, 0], "x": 8.25, "y": 2.25},
-
- {"matrix": [7, 0], "x": 13, "y": 2.25},
- {"matrix": [7, 1], "x": 14, "y": 2.125},
- {"matrix": [7, 2], "x": 15, "y": 2},
- {"matrix": [7, 3], "x": 16, "y": 2.125},
- {"matrix": [7, 4], "x": 17, "y": 2.375},
- {"matrix": [7, 5], "x": 18, "y": 2.375},
-
- {"matrix": [3, 8], "x": 0, "y": 3.375},
- {"matrix": [3, 7], "x": 1, "y": 3.375},
- {"matrix": [3, 6], "x": 2, "y": 3.375},
-
- {"matrix": [3, 5], "x": 3.25, "y": 3.375},
- {"matrix": [3, 4], "x": 4.25, "y": 3.375},
- {"matrix": [3, 3], "x": 5.25, "y": 3.125},
- {"matrix": [3, 2], "x": 6.25, "y": 3},
- {"matrix": [3, 1], "x": 7.25, "y": 3.125},
- {"matrix": [3, 0], "x": 8.25, "y": 3.25},
-
- {"matrix": [8, 0], "x": 13, "y": 3.25},
- {"matrix": [8, 1], "x": 14, "y": 3.125},
- {"matrix": [8, 2], "x": 15, "y": 3},
- {"matrix": [8, 3], "x": 16, "y": 3.125},
- {"matrix": [8, 4], "x": 17, "y": 3.375},
- {"matrix": [8, 5], "x": 18, "y": 3.375},
-
- {"matrix": [4, 3], "x": 5.75, "y": 4.25},
- {"matrix": [4, 2], "x": 6.75, "y": 4.25},
- {"matrix": [4, 1], "x": 7.75, "y": 4.5},
- {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30},
-
- {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30},
- {"matrix": [9, 1], "x": 13.5, "y": 4.5},
- {"matrix": [9, 2], "x": 14.5, "y": 4.25},
- {"matrix": [9, 3], "x": 15.5, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json b/keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json
new file mode 100644
index 0000000000..c4d38a7a69
--- /dev/null
+++ b/keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json
@@ -0,0 +1,116 @@
+{
+ "keyboard_name": "Southern Breeze",
+ "manufacturer": "AfternoonLabs",
+ "url": "afternoonlabs.com/breeze",
+ "maintainer": "eithanshavit",
+ "usb": {
+ "vid": "0x616C",
+ "pid": "0x0005",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "console": true
+ },
+ "matrix_pins": {
+ "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7", "B1"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "bootmagic": {
+ "matrix": [0, 5]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 8], "x": 0, "y": 0.375},
+ {"matrix": [0, 7], "x": 1, "y": 0.375},
+ {"matrix": [0, 6], "x": 2, "y": 0.375},
+
+ {"matrix": [0, 5], "x": 3.25, "y": 0.375},
+ {"matrix": [0, 4], "x": 4.25, "y": 0.375},
+ {"matrix": [0, 3], "x": 5.25, "y": 0.125},
+ {"matrix": [0, 2], "x": 6.25, "y": 0},
+ {"matrix": [0, 1], "x": 7.25, "y": 0.125},
+ {"matrix": [0, 0], "x": 8.25, "y": 0.25},
+
+ {"matrix": [5, 0], "x": 13, "y": 0.25},
+ {"matrix": [5, 1], "x": 14, "y": 0.125},
+ {"matrix": [5, 2], "x": 15, "y": 0},
+ {"matrix": [5, 3], "x": 16, "y": 0.125},
+ {"matrix": [5, 4], "x": 17, "y": 0.375},
+ {"matrix": [5, 5], "x": 18, "y": 0.375},
+
+ {"matrix": [1, 8], "x": 0, "y": 1.375},
+ {"matrix": [1, 7], "x": 1, "y": 1.375},
+ {"matrix": [1, 6], "x": 2, "y": 1.375},
+
+ {"matrix": [1, 5], "x": 3.25, "y": 1.375},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.375},
+ {"matrix": [1, 3], "x": 5.25, "y": 1.125},
+ {"matrix": [1, 2], "x": 6.25, "y": 1},
+ {"matrix": [1, 1], "x": 7.25, "y": 1.125},
+ {"matrix": [1, 0], "x": 8.25, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 13, "y": 1.25},
+ {"matrix": [6, 1], "x": 14, "y": 1.125},
+ {"matrix": [6, 2], "x": 15, "y": 1},
+ {"matrix": [6, 3], "x": 16, "y": 1.125},
+ {"matrix": [6, 4], "x": 17, "y": 1.375},
+ {"matrix": [6, 5], "x": 18, "y": 1.375},
+
+ {"matrix": [2, 7], "x": 1, "y": 2.375},
+
+ {"matrix": [2, 5], "x": 3.25, "y": 2.375},
+ {"matrix": [2, 4], "x": 4.25, "y": 2.375},
+ {"matrix": [2, 3], "x": 5.25, "y": 2.125},
+ {"matrix": [2, 2], "x": 6.25, "y": 2},
+ {"matrix": [2, 1], "x": 7.25, "y": 2.125},
+ {"matrix": [2, 0], "x": 8.25, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 13, "y": 2.25},
+ {"matrix": [7, 1], "x": 14, "y": 2.125},
+ {"matrix": [7, 2], "x": 15, "y": 2},
+ {"matrix": [7, 3], "x": 16, "y": 2.125},
+ {"matrix": [7, 4], "x": 17, "y": 2.375},
+ {"matrix": [7, 5], "x": 18, "y": 2.375},
+
+ {"matrix": [3, 8], "x": 0, "y": 3.375},
+ {"matrix": [3, 7], "x": 1, "y": 3.375},
+ {"matrix": [3, 6], "x": 2, "y": 3.375},
+
+ {"matrix": [3, 5], "x": 3.25, "y": 3.375},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.375},
+ {"matrix": [3, 3], "x": 5.25, "y": 3.125},
+ {"matrix": [3, 2], "x": 6.25, "y": 3},
+ {"matrix": [3, 1], "x": 7.25, "y": 3.125},
+ {"matrix": [3, 0], "x": 8.25, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 13, "y": 3.25},
+ {"matrix": [8, 1], "x": 14, "y": 3.125},
+ {"matrix": [8, 2], "x": 15, "y": 3},
+ {"matrix": [8, 3], "x": 16, "y": 3.125},
+ {"matrix": [8, 4], "x": 17, "y": 3.375},
+ {"matrix": [8, 5], "x": 18, "y": 3.375},
+
+ {"matrix": [4, 3], "x": 5.75, "y": 4.25},
+ {"matrix": [4, 2], "x": 6.75, "y": 4.25},
+ {"matrix": [4, 1], "x": 7.75, "y": 4.5},
+ {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30},
+
+ {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30},
+ {"matrix": [9, 1], "x": 13.5, "y": 4.5},
+ {"matrix": [9, 2], "x": 14.5, "y": 4.25},
+ {"matrix": [9, 3], "x": 15.5, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk b/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk
deleted file mode 100644
index 7b63c0c298..0000000000
--- a/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json
deleted file mode 100644
index 4ec3db219c..0000000000
--- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
- "keyboard_name": "Summer Breeze",
- "manufacturer": "AfternoonLabs",
- "url": "afternoonlabs.com/breeze",
- "maintainer": "eithanshavit",
- "usb": {
- "vid": "0x616C",
- "pid": "0x0004",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7", "B1"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "bootmagic": {
- "matrix": [0, 5]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 8], "x": 0, "y": 0.375},
- {"matrix": [0, 7], "x": 1, "y": 0.375},
- {"matrix": [0, 6], "x": 2, "y": 0.375},
-
- {"matrix": [0, 5], "x": 3.25, "y": 0.375},
- {"matrix": [0, 4], "x": 4.25, "y": 0.375},
- {"matrix": [0, 3], "x": 5.25, "y": 0.125},
- {"matrix": [0, 2], "x": 6.25, "y": 0},
- {"matrix": [0, 1], "x": 7.25, "y": 0.125},
- {"matrix": [0, 0], "x": 8.25, "y": 0.25},
-
- {"matrix": [5, 0], "x": 13, "y": 0.25},
- {"matrix": [5, 1], "x": 14, "y": 0.125},
- {"matrix": [5, 2], "x": 15, "y": 0},
- {"matrix": [5, 3], "x": 16, "y": 0.125},
- {"matrix": [5, 4], "x": 17, "y": 0.375},
- {"matrix": [5, 5], "x": 18, "y": 0.375},
-
- {"matrix": [5, 6], "x": 19.25, "y": 0.375},
- {"matrix": [5, 7], "x": 20.25, "y": 0.375},
- {"matrix": [5, 8], "x": 21.25, "y": 0.375},
-
- {"matrix": [1, 8], "x": 0, "y": 1.375},
- {"matrix": [1, 7], "x": 1, "y": 1.375},
- {"matrix": [1, 6], "x": 2, "y": 1.375},
-
- {"matrix": [1, 5], "x": 3.25, "y": 1.375},
- {"matrix": [1, 4], "x": 4.25, "y": 1.375},
- {"matrix": [1, 3], "x": 5.25, "y": 1.125},
- {"matrix": [1, 2], "x": 6.25, "y": 1},
- {"matrix": [1, 1], "x": 7.25, "y": 1.125},
- {"matrix": [1, 0], "x": 8.25, "y": 1.25},
-
- {"matrix": [6, 0], "x": 13, "y": 1.25},
- {"matrix": [6, 1], "x": 14, "y": 1.125},
- {"matrix": [6, 2], "x": 15, "y": 1},
- {"matrix": [6, 3], "x": 16, "y": 1.125},
- {"matrix": [6, 4], "x": 17, "y": 1.375},
- {"matrix": [6, 5], "x": 18, "y": 1.375},
-
- {"matrix": [6, 6], "x": 19.25, "y": 1.375},
- {"matrix": [6, 7], "x": 20.25, "y": 1.375},
- {"matrix": [6, 8], "x": 21.25, "y": 1.375},
-
- {"matrix": [2, 7], "x": 1, "y": 2.375},
-
- {"matrix": [2, 5], "x": 3.25, "y": 2.375},
- {"matrix": [2, 4], "x": 4.25, "y": 2.375},
- {"matrix": [2, 3], "x": 5.25, "y": 2.125},
- {"matrix": [2, 2], "x": 6.25, "y": 2},
- {"matrix": [2, 1], "x": 7.25, "y": 2.125},
- {"matrix": [2, 0], "x": 8.25, "y": 2.25},
-
- {"matrix": [7, 0], "x": 13, "y": 2.25},
- {"matrix": [7, 1], "x": 14, "y": 2.125},
- {"matrix": [7, 2], "x": 15, "y": 2},
- {"matrix": [7, 3], "x": 16, "y": 2.125},
- {"matrix": [7, 4], "x": 17, "y": 2.375},
- {"matrix": [7, 5], "x": 18, "y": 2.375},
-
- {"matrix": [7, 7], "x": 20.25, "y": 2.375},
-
- {"matrix": [3, 8], "x": 0, "y": 3.375},
- {"matrix": [3, 7], "x": 1, "y": 3.375},
- {"matrix": [3, 6], "x": 2, "y": 3.375},
-
- {"matrix": [3, 5], "x": 3.25, "y": 3.375},
- {"matrix": [3, 4], "x": 4.25, "y": 3.375},
- {"matrix": [3, 3], "x": 5.25, "y": 3.125},
- {"matrix": [3, 2], "x": 6.25, "y": 3},
- {"matrix": [3, 1], "x": 7.25, "y": 3.125},
- {"matrix": [3, 0], "x": 8.25, "y": 3.25},
-
- {"matrix": [8, 0], "x": 13, "y": 3.25},
- {"matrix": [8, 1], "x": 14, "y": 3.125},
- {"matrix": [8, 2], "x": 15, "y": 3},
- {"matrix": [8, 3], "x": 16, "y": 3.125},
- {"matrix": [8, 4], "x": 17, "y": 3.375},
- {"matrix": [8, 5], "x": 18, "y": 3.375},
-
- {"matrix": [8, 6], "x": 19.25, "y": 3.375},
- {"matrix": [8, 7], "x": 20.25, "y": 3.375},
- {"matrix": [8, 8], "x": 21.25, "y": 3.375},
-
- {"matrix": [4, 3], "x": 5.75, "y": 4.25},
- {"matrix": [4, 2], "x": 6.75, "y": 4.25},
- {"matrix": [4, 1], "x": 7.75, "y": 4.5},
- {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30},
-
- {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30},
- {"matrix": [9, 1], "x": 13.5, "y": 4.5},
- {"matrix": [9, 2], "x": 14.5, "y": 4.25},
- {"matrix": [9, 3], "x": 15.5, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json b/keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json
new file mode 100644
index 0000000000..702a942a3c
--- /dev/null
+++ b/keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json
@@ -0,0 +1,130 @@
+{
+ "keyboard_name": "Summer Breeze",
+ "manufacturer": "AfternoonLabs",
+ "url": "afternoonlabs.com/breeze",
+ "maintainer": "eithanshavit",
+ "usb": {
+ "vid": "0x616C",
+ "pid": "0x0004",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "console": true
+ },
+ "matrix_pins": {
+ "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7", "B1"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "bootmagic": {
+ "matrix": [0, 5]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 8], "x": 0, "y": 0.375},
+ {"matrix": [0, 7], "x": 1, "y": 0.375},
+ {"matrix": [0, 6], "x": 2, "y": 0.375},
+
+ {"matrix": [0, 5], "x": 3.25, "y": 0.375},
+ {"matrix": [0, 4], "x": 4.25, "y": 0.375},
+ {"matrix": [0, 3], "x": 5.25, "y": 0.125},
+ {"matrix": [0, 2], "x": 6.25, "y": 0},
+ {"matrix": [0, 1], "x": 7.25, "y": 0.125},
+ {"matrix": [0, 0], "x": 8.25, "y": 0.25},
+
+ {"matrix": [5, 0], "x": 13, "y": 0.25},
+ {"matrix": [5, 1], "x": 14, "y": 0.125},
+ {"matrix": [5, 2], "x": 15, "y": 0},
+ {"matrix": [5, 3], "x": 16, "y": 0.125},
+ {"matrix": [5, 4], "x": 17, "y": 0.375},
+ {"matrix": [5, 5], "x": 18, "y": 0.375},
+
+ {"matrix": [5, 6], "x": 19.25, "y": 0.375},
+ {"matrix": [5, 7], "x": 20.25, "y": 0.375},
+ {"matrix": [5, 8], "x": 21.25, "y": 0.375},
+
+ {"matrix": [1, 8], "x": 0, "y": 1.375},
+ {"matrix": [1, 7], "x": 1, "y": 1.375},
+ {"matrix": [1, 6], "x": 2, "y": 1.375},
+
+ {"matrix": [1, 5], "x": 3.25, "y": 1.375},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.375},
+ {"matrix": [1, 3], "x": 5.25, "y": 1.125},
+ {"matrix": [1, 2], "x": 6.25, "y": 1},
+ {"matrix": [1, 1], "x": 7.25, "y": 1.125},
+ {"matrix": [1, 0], "x": 8.25, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 13, "y": 1.25},
+ {"matrix": [6, 1], "x": 14, "y": 1.125},
+ {"matrix": [6, 2], "x": 15, "y": 1},
+ {"matrix": [6, 3], "x": 16, "y": 1.125},
+ {"matrix": [6, 4], "x": 17, "y": 1.375},
+ {"matrix": [6, 5], "x": 18, "y": 1.375},
+
+ {"matrix": [6, 6], "x": 19.25, "y": 1.375},
+ {"matrix": [6, 7], "x": 20.25, "y": 1.375},
+ {"matrix": [6, 8], "x": 21.25, "y": 1.375},
+
+ {"matrix": [2, 7], "x": 1, "y": 2.375},
+
+ {"matrix": [2, 5], "x": 3.25, "y": 2.375},
+ {"matrix": [2, 4], "x": 4.25, "y": 2.375},
+ {"matrix": [2, 3], "x": 5.25, "y": 2.125},
+ {"matrix": [2, 2], "x": 6.25, "y": 2},
+ {"matrix": [2, 1], "x": 7.25, "y": 2.125},
+ {"matrix": [2, 0], "x": 8.25, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 13, "y": 2.25},
+ {"matrix": [7, 1], "x": 14, "y": 2.125},
+ {"matrix": [7, 2], "x": 15, "y": 2},
+ {"matrix": [7, 3], "x": 16, "y": 2.125},
+ {"matrix": [7, 4], "x": 17, "y": 2.375},
+ {"matrix": [7, 5], "x": 18, "y": 2.375},
+
+ {"matrix": [7, 7], "x": 20.25, "y": 2.375},
+
+ {"matrix": [3, 8], "x": 0, "y": 3.375},
+ {"matrix": [3, 7], "x": 1, "y": 3.375},
+ {"matrix": [3, 6], "x": 2, "y": 3.375},
+
+ {"matrix": [3, 5], "x": 3.25, "y": 3.375},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.375},
+ {"matrix": [3, 3], "x": 5.25, "y": 3.125},
+ {"matrix": [3, 2], "x": 6.25, "y": 3},
+ {"matrix": [3, 1], "x": 7.25, "y": 3.125},
+ {"matrix": [3, 0], "x": 8.25, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 13, "y": 3.25},
+ {"matrix": [8, 1], "x": 14, "y": 3.125},
+ {"matrix": [8, 2], "x": 15, "y": 3},
+ {"matrix": [8, 3], "x": 16, "y": 3.125},
+ {"matrix": [8, 4], "x": 17, "y": 3.375},
+ {"matrix": [8, 5], "x": 18, "y": 3.375},
+
+ {"matrix": [8, 6], "x": 19.25, "y": 3.375},
+ {"matrix": [8, 7], "x": 20.25, "y": 3.375},
+ {"matrix": [8, 8], "x": 21.25, "y": 3.375},
+
+ {"matrix": [4, 3], "x": 5.75, "y": 4.25},
+ {"matrix": [4, 2], "x": 6.75, "y": 4.25},
+ {"matrix": [4, 1], "x": 7.75, "y": 4.5},
+ {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30},
+
+ {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30},
+ {"matrix": [9, 1], "x": 13.5, "y": 4.5},
+ {"matrix": [9, 2], "x": 14.5, "y": 4.25},
+ {"matrix": [9, 3], "x": 15.5, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk b/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk
deleted file mode 100644
index 7b63c0c298..0000000000
--- a/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h
deleted file mode 100644
index 056f54d521..0000000000
--- a/keyboards/ai03/andromeda/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Andrew Kannan
-
-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/ai03/andromeda/keyboard.json b/keyboards/ai03/andromeda/keyboard.json
index 5a9bf32ef1..d085b91ad1 100644
--- a/keyboards/ai03/andromeda/keyboard.json
+++ b/keyboards/ai03/andromeda/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "B5", "B8", "B9"],
"rows": ["B4", "B3", "A15", "A3", "A4", "A5"]
diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h
deleted file mode 100644
index 50001e978c..0000000000
--- a/keyboards/ai03/equinox/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-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/ai03/equinox/info.json b/keyboards/ai03/equinox/info.json
index 2912f0c1d8..7c2cc46500 100644
--- a/keyboards/ai03/equinox/info.json
+++ b/keyboards/ai03/equinox/info.json
@@ -8,6 +8,12 @@
"pid": "0x0004",
"device_version": "0.0.1"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h
deleted file mode 100644
index 9fe6627ecc..0000000000
--- a/keyboards/ai03/jp60/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 ai03
-
-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/ai03/jp60/keyboard.json b/keyboards/ai03/jp60/keyboard.json
index bc366e60e5..389993626d 100644
--- a/keyboards/ai03/jp60/keyboard.json
+++ b/keyboards/ai03/jp60/keyboard.json
@@ -19,6 +19,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D2", "D1", "D3", "D5", "D4", "D6", "C6", "F0", "F1", "F4", "F5", "F6", "F7", "C7"],
"rows": ["B6", "B5", "B4", "D7", "E6"]
diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h
deleted file mode 100644
index 50001e978c..0000000000
--- a/keyboards/ai03/lunar/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-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/ai03/lunar/keyboard.json b/keyboards/ai03/lunar/keyboard.json
index 8a5bc14576..00ff761d3f 100644
--- a/keyboards/ai03/lunar/keyboard.json
+++ b/keyboards/ai03/lunar/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
"rows": ["B3", "D0", "D1", "D2", "D3"]
diff --git a/keyboards/ai03/lunar_ii/config.h b/keyboards/ai03/lunar_ii/config.h
index 1b02059356..07dde6cb89 100644
--- a/keyboards/ai03/lunar_ii/config.h
+++ b/keyboards/ai03/lunar_ii/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-
-/* Mechanical lock switch support */
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
/* Solenoid support */
#define SOLENOID_PIN B7
#define SOLENOID_DEFAULT_DWELL 15
diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json
index ee7f152758..38729595a2 100644
--- a/keyboards/ai03/lunar_ii/info.json
+++ b/keyboards/ai03/lunar_ii/info.json
@@ -8,6 +8,20 @@
"pid": "0x0016",
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "nkro": true,
+ "haptic": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
diff --git a/keyboards/ai03/lunar_ii/rules.mk b/keyboards/ai03/lunar_ii/rules.mk
index 7ad594e1f9..a521203b32 100644
--- a/keyboards/ai03/lunar_ii/rules.mk
+++ b/keyboards/ai03/lunar_ii/rules.mk
@@ -1,15 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-HAPTIC_ENABLE = yes # Enable solenoid support
HAPTIC_DRIVER = solenoid
diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index 53a057875f..f3a4ae2db3 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -21,11 +21,6 @@ along with this program. If not, see .
#define SPLIT_HAND_PIN D5
-/* 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/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json
deleted file mode 100644
index d7ff0b786c..0000000000
--- a/keyboards/ai03/orbit/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
- "keyboard_name": "Orbit",
- "manufacturer": "ai03 Keyboard Designs",
- "url": "https://github.com/ai03-2725/Orbit",
- "maintainer": "ai03",
- "usb": {
- "vid": "0xA103",
- "pid": "0x0003",
- "device_version": "0.0.3"
- },
- "matrix_pins": {
- "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"],
- "rows": ["F7", "F6", "F5", "F4", "D3"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B7"
- },
- "split": {
- "soft_serial_pin": "D0",
- "matrix_pins": {
- "right": {
- "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"],
- "rows": ["B6", "B5", "B4", "D7", "E6"]
- }
- },
- "transport":{
- "sync" :{
- "indicators": true,
- "layer_state": true
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.63},
- {"matrix": [0, 1], "x": 1, "y": 0.38},
- {"matrix": [0, 2], "x": 2, "y": 0.38},
- {"matrix": [0, 3], "x": 3, "y": 0.13},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0.13},
- {"matrix": [0, 6], "x": 6, "y": 0.25},
-
- {"matrix": [5, 0], "x": 9, "y": 0.25},
- {"matrix": [5, 1], "x": 10, "y": 0.13},
- {"matrix": [5, 2], "x": 11, "y": 0},
- {"matrix": [5, 3], "x": 12, "y": 0.13},
- {"matrix": [5, 4], "x": 13, "y": 0.38},
- {"matrix": [5, 5], "x": 14, "y": 0.38},
- {"matrix": [5, 6], "x": 15, "y": 0.63},
-
- {"matrix": [1, 0], "x": 0, "y": 1.63},
- {"matrix": [1, 1], "x": 1, "y": 1.38},
- {"matrix": [1, 2], "x": 2, "y": 1.38},
- {"matrix": [1, 3], "x": 3, "y": 1.13},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1.13},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
-
- {"matrix": [6, 0], "x": 9, "y": 1.25},
- {"matrix": [6, 1], "x": 10, "y": 1.13},
- {"matrix": [6, 2], "x": 11, "y": 1},
- {"matrix": [6, 3], "x": 12, "y": 1.13},
- {"matrix": [6, 4], "x": 13, "y": 1.38},
- {"matrix": [6, 5], "x": 14, "y": 1.38},
- {"matrix": [6, 6], "x": 15, "y": 1.63},
-
- {"matrix": [2, 0], "x": 0, "y": 2.63},
- {"matrix": [2, 1], "x": 1, "y": 2.38},
- {"matrix": [2, 2], "x": 2, "y": 2.38},
- {"matrix": [2, 3], "x": 3, "y": 2.13},
- {"matrix": [2, 4], "x": 4, "y": 2},
- {"matrix": [2, 5], "x": 5, "y": 2.13},
- {"matrix": [2, 6], "x": 6, "y": 2.25},
-
- {"matrix": [7, 0], "x": 9, "y": 2.25},
- {"matrix": [7, 1], "x": 10, "y": 2.13},
- {"matrix": [7, 2], "x": 11, "y": 2},
- {"matrix": [7, 3], "x": 12, "y": 2.13},
- {"matrix": [7, 4], "x": 13, "y": 2.38},
- {"matrix": [7, 5], "x": 14, "y": 2.38},
- {"matrix": [7, 6], "x": 15, "y": 2.63},
-
- {"matrix": [3, 0], "x": 0, "y": 3.63},
- {"matrix": [3, 1], "x": 1, "y": 3.38},
- {"matrix": [3, 2], "x": 2, "y": 3.38},
- {"matrix": [3, 3], "x": 3, "y": 3.13},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3.13},
- {"matrix": [3, 6], "x": 6, "y": 3.25},
-
- {"matrix": [8, 0], "x": 9, "y": 3.25},
- {"matrix": [8, 1], "x": 10, "y": 3.13},
- {"matrix": [8, 2], "x": 11, "y": 3},
- {"matrix": [8, 3], "x": 12, "y": 3.13},
- {"matrix": [8, 4], "x": 13, "y": 3.38},
- {"matrix": [8, 5], "x": 14, "y": 3.38},
- {"matrix": [8, 6], "x": 15, "y": 3.63},
-
- {"matrix": [4, 1], "x": 1, "y": 4.38},
- {"matrix": [4, 2], "x": 2, "y": 4.38},
- {"matrix": [4, 3], "x": 3, "y": 4.13},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5.5, "y": 4.25},
- {"matrix": [4, 6], "x": 6.5, "y": 4.5, "h": 1.5},
-
- {"matrix": [9, 0], "x": 8.5, "y": 4.5, "h": 1.5},
- {"matrix": [9, 1], "x": 9.5, "y": 4.25},
- {"matrix": [9, 2], "x": 11, "y": 4},
- {"matrix": [9, 3], "x": 12, "y": 4.13},
- {"matrix": [9, 4], "x": 13, "y": 4.38},
- {"matrix": [9, 5], "x": 14, "y": 4.38}
- ]
- }
- }
-}
diff --git a/keyboards/ai03/orbit/keyboard.json b/keyboards/ai03/orbit/keyboard.json
new file mode 100644
index 0000000000..ec30802812
--- /dev/null
+++ b/keyboards/ai03/orbit/keyboard.json
@@ -0,0 +1,133 @@
+{
+ "keyboard_name": "Orbit",
+ "manufacturer": "ai03 Keyboard Designs",
+ "url": "https://github.com/ai03-2725/Orbit",
+ "maintainer": "ai03",
+ "usb": {
+ "vid": "0xA103",
+ "pid": "0x0003",
+ "device_version": "0.0.3"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "backlight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"],
+ "rows": ["F7", "F6", "F5", "F4", "D3"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B7"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"],
+ "rows": ["B6", "B5", "B4", "D7", "E6"]
+ }
+ },
+ "transport":{
+ "sync" :{
+ "indicators": true,
+ "layer_state": true
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.63},
+ {"matrix": [0, 1], "x": 1, "y": 0.38},
+ {"matrix": [0, 2], "x": 2, "y": 0.38},
+ {"matrix": [0, 3], "x": 3, "y": 0.13},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0.13},
+ {"matrix": [0, 6], "x": 6, "y": 0.25},
+
+ {"matrix": [5, 0], "x": 9, "y": 0.25},
+ {"matrix": [5, 1], "x": 10, "y": 0.13},
+ {"matrix": [5, 2], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0.13},
+ {"matrix": [5, 4], "x": 13, "y": 0.38},
+ {"matrix": [5, 5], "x": 14, "y": 0.38},
+ {"matrix": [5, 6], "x": 15, "y": 0.63},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.63},
+ {"matrix": [1, 1], "x": 1, "y": 1.38},
+ {"matrix": [1, 2], "x": 2, "y": 1.38},
+ {"matrix": [1, 3], "x": 3, "y": 1.13},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1.13},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 9, "y": 1.25},
+ {"matrix": [6, 1], "x": 10, "y": 1.13},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1.13},
+ {"matrix": [6, 4], "x": 13, "y": 1.38},
+ {"matrix": [6, 5], "x": 14, "y": 1.38},
+ {"matrix": [6, 6], "x": 15, "y": 1.63},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.63},
+ {"matrix": [2, 1], "x": 1, "y": 2.38},
+ {"matrix": [2, 2], "x": 2, "y": 2.38},
+ {"matrix": [2, 3], "x": 3, "y": 2.13},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2.13},
+ {"matrix": [2, 6], "x": 6, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 9, "y": 2.25},
+ {"matrix": [7, 1], "x": 10, "y": 2.13},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2.13},
+ {"matrix": [7, 4], "x": 13, "y": 2.38},
+ {"matrix": [7, 5], "x": 14, "y": 2.38},
+ {"matrix": [7, 6], "x": 15, "y": 2.63},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.63},
+ {"matrix": [3, 1], "x": 1, "y": 3.38},
+ {"matrix": [3, 2], "x": 2, "y": 3.38},
+ {"matrix": [3, 3], "x": 3, "y": 3.13},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3.13},
+ {"matrix": [3, 6], "x": 6, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 9, "y": 3.25},
+ {"matrix": [8, 1], "x": 10, "y": 3.13},
+ {"matrix": [8, 2], "x": 11, "y": 3},
+ {"matrix": [8, 3], "x": 12, "y": 3.13},
+ {"matrix": [8, 4], "x": 13, "y": 3.38},
+ {"matrix": [8, 5], "x": 14, "y": 3.38},
+ {"matrix": [8, 6], "x": 15, "y": 3.63},
+
+ {"matrix": [4, 1], "x": 1, "y": 4.38},
+ {"matrix": [4, 2], "x": 2, "y": 4.38},
+ {"matrix": [4, 3], "x": 3, "y": 4.13},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.5, "y": 4.5, "h": 1.5},
+
+ {"matrix": [9, 0], "x": 8.5, "y": 4.5, "h": 1.5},
+ {"matrix": [9, 1], "x": 9.5, "y": 4.25},
+ {"matrix": [9, 2], "x": 11, "y": 4},
+ {"matrix": [9, 3], "x": 12, "y": 4.13},
+ {"matrix": [9, 4], "x": 13, "y": 4.38},
+ {"matrix": [9, 5], "x": 14, "y": 4.38}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ai03/orbit/rules.mk b/keyboards/ai03/orbit/rules.mk
deleted file mode 100644
index c95da2740d..0000000000
--- a/keyboards/ai03/orbit/rules.mk
+++ /dev/null
@@ -1,13 +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 = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes # Split keyboard flag disabled as manual edits had to be done to the split common files
diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h
index 05d319d030..2c63852cbe 100644
--- a/keyboards/ai03/orbit_x/config.h
+++ b/keyboards/ai03/orbit_x/config.h
@@ -21,11 +21,6 @@ along with this program. If not, see .
#define SPLIT_USB_DETECT
#define SPLIT_USB_TIMEOUT 2500
-/* 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/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json
deleted file mode 100644
index ebb11624fe..0000000000
--- a/keyboards/ai03/orbit_x/info.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
- "keyboard_name": "OrbitX",
- "manufacturer": "ai03 Design Studio",
- "url": "",
- "maintainer": "ai03",
- "usb": {
- "vid": "0xA103",
- "pid": "0x0014",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["E6", "F6", "B1", "B0", "C7", "C6"],
- "rows": ["D7", "D6", "D4", "F0"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0",
- "matrix_pins": {
- "right": {
- "cols": ["D6", "B6", "B1", "B0", "B3", "B2"],
- "rows": ["B5", "D7", "B4", "D4"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.38},
- {"matrix": [0, 1], "x": 1, "y": 0.38},
- {"matrix": [0, 2], "x": 2, "y": 0.13},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.13},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
-
- {"matrix": [4, 0], "x": 7.5, "y": 0.25},
- {"matrix": [4, 1], "x": 8.5, "y": 0.13},
- {"matrix": [4, 2], "x": 9.5, "y": 0},
- {"matrix": [4, 3], "x": 10.5, "y": 0.13},
- {"matrix": [4, 4], "x": 11.5, "y": 0.38},
- {"matrix": [4, 5], "x": 12.5, "y": 0.38},
-
- {"matrix": [1, 0], "x": 0, "y": 1.38},
- {"matrix": [1, 1], "x": 1, "y": 1.38},
- {"matrix": [1, 2], "x": 2, "y": 1.13},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.13},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
-
- {"matrix": [5, 0], "x": 7.5, "y": 1.25},
- {"matrix": [5, 1], "x": 8.5, "y": 1.13},
- {"matrix": [5, 2], "x": 9.5, "y": 1},
- {"matrix": [5, 3], "x": 10.5, "y": 1.13},
- {"matrix": [5, 4], "x": 11.5, "y": 1.38},
- {"matrix": [5, 5], "x": 12.5, "y": 1.38},
-
- {"matrix": [2, 0], "x": 0, "y": 2.38},
- {"matrix": [2, 1], "x": 1, "y": 2.38},
- {"matrix": [2, 2], "x": 2, "y": 2.13},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.13},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
-
- {"matrix": [6, 0], "x": 7.5, "y": 2.25},
- {"matrix": [6, 1], "x": 8.5, "y": 2.13},
- {"matrix": [6, 2], "x": 9.5, "y": 2},
- {"matrix": [6, 3], "x": 10.5, "y": 2.13},
- {"matrix": [6, 4], "x": 11.5, "y": 2.38},
- {"matrix": [6, 5], "x": 12.5, "y": 2.38},
-
- {"matrix": [3, 0], "x": 0, "y": 3.38},
- {"matrix": [3, 1], "x": 1, "y": 3.38},
- {"matrix": [3, 2], "x": 2, "y": 3.13},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3.38},
- {"matrix": [3, 5], "x": 5.25, "y": 3.25, "h": 1.5},
-
- {"matrix": [7, 0], "x": 7.25, "y": 3.25, "h": 1.5},
- {"matrix": [7, 1], "x": 8.25, "y": 3.38},
- {"matrix": [7, 2], "x": 9.5, "y": 3},
- {"matrix": [7, 3], "x": 10.5, "y": 3.13},
- {"matrix": [7, 4], "x": 11.5, "y": 3.38},
- {"matrix": [7, 5], "x": 12.5, "y": 3.38}
- ]
- }
- }
-}
diff --git a/keyboards/ai03/orbit_x/keyboard.json b/keyboards/ai03/orbit_x/keyboard.json
new file mode 100644
index 0000000000..edfbbb2796
--- /dev/null
+++ b/keyboards/ai03/orbit_x/keyboard.json
@@ -0,0 +1,102 @@
+{
+ "keyboard_name": "OrbitX",
+ "manufacturer": "ai03 Design Studio",
+ "url": "",
+ "maintainer": "ai03",
+ "usb": {
+ "vid": "0xA103",
+ "pid": "0x0014",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["E6", "F6", "B1", "B0", "C7", "C6"],
+ "rows": ["D7", "D6", "D4", "F0"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["D6", "B6", "B1", "B0", "B3", "B2"],
+ "rows": ["B5", "D7", "B4", "D4"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.38},
+ {"matrix": [0, 1], "x": 1, "y": 0.38},
+ {"matrix": [0, 2], "x": 2, "y": 0.13},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.13},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"matrix": [4, 0], "x": 7.5, "y": 0.25},
+ {"matrix": [4, 1], "x": 8.5, "y": 0.13},
+ {"matrix": [4, 2], "x": 9.5, "y": 0},
+ {"matrix": [4, 3], "x": 10.5, "y": 0.13},
+ {"matrix": [4, 4], "x": 11.5, "y": 0.38},
+ {"matrix": [4, 5], "x": 12.5, "y": 0.38},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.38},
+ {"matrix": [1, 1], "x": 1, "y": 1.38},
+ {"matrix": [1, 2], "x": 2, "y": 1.13},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.13},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [5, 0], "x": 7.5, "y": 1.25},
+ {"matrix": [5, 1], "x": 8.5, "y": 1.13},
+ {"matrix": [5, 2], "x": 9.5, "y": 1},
+ {"matrix": [5, 3], "x": 10.5, "y": 1.13},
+ {"matrix": [5, 4], "x": 11.5, "y": 1.38},
+ {"matrix": [5, 5], "x": 12.5, "y": 1.38},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.38},
+ {"matrix": [2, 1], "x": 1, "y": 2.38},
+ {"matrix": [2, 2], "x": 2, "y": 2.13},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.13},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 7.5, "y": 2.25},
+ {"matrix": [6, 1], "x": 8.5, "y": 2.13},
+ {"matrix": [6, 2], "x": 9.5, "y": 2},
+ {"matrix": [6, 3], "x": 10.5, "y": 2.13},
+ {"matrix": [6, 4], "x": 11.5, "y": 2.38},
+ {"matrix": [6, 5], "x": 12.5, "y": 2.38},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.38},
+ {"matrix": [3, 1], "x": 1, "y": 3.38},
+ {"matrix": [3, 2], "x": 2, "y": 3.13},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.38},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.25, "h": 1.5},
+
+ {"matrix": [7, 0], "x": 7.25, "y": 3.25, "h": 1.5},
+ {"matrix": [7, 1], "x": 8.25, "y": 3.38},
+ {"matrix": [7, 2], "x": 9.5, "y": 3},
+ {"matrix": [7, 3], "x": 10.5, "y": 3.13},
+ {"matrix": [7, 4], "x": 11.5, "y": 3.38},
+ {"matrix": [7, 5], "x": 12.5, "y": 3.38}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ai03/orbit_x/rules.mk b/keyboards/ai03/orbit_x/rules.mk
deleted file mode 100644
index 66711e4613..0000000000
--- a/keyboards/ai03/orbit_x/rules.mk
+++ /dev/null
@@ -1,13 +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 = 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
-SPLIT_KEYBOARD = yes # Split keyboard
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
deleted file mode 100644
index 50001e978c..0000000000
--- a/keyboards/ai03/polaris/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-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/ai03/polaris/keyboard.json b/keyboards/ai03/polaris/keyboard.json
index 169118a0cf..decedbab3d 100644
--- a/keyboards/ai03/polaris/keyboard.json
+++ b/keyboards/ai03/polaris/keyboard.json
@@ -18,6 +18,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
"rows": ["B1", "B2", "B3", "F0", "F1"]
diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h
deleted file mode 100644
index 50001e978c..0000000000
--- a/keyboards/ai03/quasar/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-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/ai03/quasar/keyboard.json b/keyboards/ai03/quasar/keyboard.json
index b0514f9e9a..52902e3067 100644
--- a/keyboards/ai03/quasar/keyboard.json
+++ b/keyboards/ai03/quasar/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4"],
"rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"]
diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h
deleted file mode 100644
index 50001e978c..0000000000
--- a/keyboards/ai03/soyuz/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-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/ai03/soyuz/keyboard.json b/keyboards/ai03/soyuz/keyboard.json
index 61e8375dd1..2abfbd5ead 100644
--- a/keyboards/ai03/soyuz/keyboard.json
+++ b/keyboards/ai03/soyuz/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "B3", "D7", "B5"],
"rows": ["D4", "C6", "B6", "E6", "B4"]
diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h
deleted file mode 100644
index b575a49f38..0000000000
--- a/keyboards/ai03/vega/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2015 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/ai03/vega/keyboard.json b/keyboards/ai03/vega/keyboard.json
index 64eaf5eadd..a58fa4fcae 100644
--- a/keyboards/ai03/vega/keyboard.json
+++ b/keyboards/ai03/vega/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B5", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"],
"rows": ["A1", "A2", "B3", "A15", "A10"]
diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h
deleted file mode 100644
index 4ffa418a09..0000000000
--- a/keyboards/akb/raine/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2019 Elliot Powell
-
-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/akb/raine/keyboard.json b/keyboards/akb/raine/keyboard.json
index f3631068fd..a8e841637a 100644
--- a/keyboards/akb/raine/keyboard.json
+++ b/keyboards/akb/raine/keyboard.json
@@ -15,6 +15,12 @@
"mousekey": false,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F6", "F5", "F4", "B1", "F1", "F0", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
"rows": ["E6", "C6", "F7", "B2", "B0"]
diff --git a/keyboards/akegata_denki/device_one/info.json b/keyboards/akegata_denki/device_one/info.json
deleted file mode 100644
index e1e69e2510..0000000000
--- a/keyboards/akegata_denki/device_one/info.json
+++ /dev/null
@@ -1,302 +0,0 @@
-{
- "keyboard_name": "device one",
- "manufacturer": "akegata denki",
- "url": "https://akegata.co",
- "usb": {
- "vid": "0xFEED",
- "pid": "0xADD0",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "A1", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
- "rows": ["B1", "B0", "A9", "A8", "A0"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F042",
- "bootloader": "stm32-dfu",
- "board": "ST_NUCLEO32_F042K6",
- "maintainer": "qmk",
- "community_layouts": ["60_ansi", "60_iso"],
- "layouts": {
- "LAYOUT_60_ansi": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_iso": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2},
- {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 14], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_arrow": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 13, "y": 3},
- {"matrix": [3, 14], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 13], "x": 13, "y": 4},
- {"matrix": [4, 14], "x": 14, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/akegata_denki/device_one/keyboard.json b/keyboards/akegata_denki/device_one/keyboard.json
new file mode 100644
index 0000000000..b85f186ad6
--- /dev/null
+++ b/keyboards/akegata_denki/device_one/keyboard.json
@@ -0,0 +1,308 @@
+{
+ "keyboard_name": "device one",
+ "manufacturer": "akegata denki",
+ "url": "https://akegata.co",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xADD0",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "A1", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+ "rows": ["B1", "B0", "A9", "A8", "A0"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F042",
+ "bootloader": "stm32-dfu",
+ "board": "ST_NUCLEO32_F042K6",
+ "maintainer": "qmk",
+ "community_layouts": ["60_ansi", "60_iso"],
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2},
+ {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 14], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_arrow": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/akegata_denki/device_one/rules.mk b/keyboards/akegata_denki/device_one/rules.mk
deleted file mode 100644
index ecb6265882..0000000000
--- a/keyboards/akegata_denki/device_one/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-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 = yes # Enable N-Key Rollover
diff --git a/keyboards/akko/5087/config.h b/keyboards/akko/5087/config.h
index ceb9872738..888dfa6f80 100644
--- a/keyboards/akko/5087/config.h
+++ b/keyboards/akko/5087/config.h
@@ -20,11 +20,6 @@
#define LED_MAC_OS_PIN C10
#define LED_WIN_LOCK_PIN C11
-/* 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
-
/* SPI Config for spi flash*/
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN B3
diff --git a/keyboards/akko/5087/keyboard.json b/keyboards/akko/5087/keyboard.json
index 67ea54c169..a2f72351ed 100644
--- a/keyboards/akko/5087/keyboard.json
+++ b/keyboards/akko/5087/keyboard.json
@@ -21,6 +21,12 @@
"nkro": true,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"dynamic_keymap": {
"layer_count": 6
},
diff --git a/keyboards/akko/5108/config.h b/keyboards/akko/5108/config.h
index 6a509733d6..f3d8ed4d67 100644
--- a/keyboards/akko/5108/config.h
+++ b/keyboards/akko/5108/config.h
@@ -19,11 +19,6 @@
/* LED Indicators */
#define LED_WIN_LOCK_PIN C11
-/* 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
-
/* SPI Config for spi flash*/
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN B3
diff --git a/keyboards/akko/5108/keyboard.json b/keyboards/akko/5108/keyboard.json
index 5e97d151c3..e98e421089 100644
--- a/keyboards/akko/5108/keyboard.json
+++ b/keyboards/akko/5108/keyboard.json
@@ -21,6 +21,12 @@
"nkro": true,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"],
"rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
diff --git a/keyboards/akko/acr87/config.h b/keyboards/akko/acr87/config.h
index cdc4b6011a..dc309c4a41 100644
--- a/keyboards/akko/acr87/config.h
+++ b/keyboards/akko/acr87/config.h
@@ -16,11 +16,6 @@
#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
-
/* SPI Config for spi flash*/
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN B3
diff --git a/keyboards/akko/acr87/keyboard.json b/keyboards/akko/acr87/keyboard.json
index 2702ee7915..9f37a91b9a 100644
--- a/keyboards/akko/acr87/keyboard.json
+++ b/keyboards/akko/acr87/keyboard.json
@@ -21,6 +21,12 @@
"nkro": true,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10"],
"rows": [ "B15", "C6", "C7", "C8", "C9", "A8"]
diff --git a/keyboards/akko/top40/config.h b/keyboards/akko/top40/config.h
index a23cf6db92..7924ae3214 100644
--- a/keyboards/akko/top40/config.h
+++ b/keyboards/akko/top40/config.h
@@ -16,11 +16,6 @@
#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
-
/* SPI Config for spi flash*/
#define SPI_DRIVER SPIDQ
#define SPI_SCK_PIN B3
diff --git a/keyboards/akko/top40/keyboard.json b/keyboards/akko/top40/keyboard.json
index 183c9242f4..fd7cf497e7 100644
--- a/keyboards/akko/top40/keyboard.json
+++ b/keyboards/akko/top40/keyboard.json
@@ -21,6 +21,12 @@
"nkro": true,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4"],
"rows": ["C7", "C8", "C9", "A8"]
diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h
index 32c7bcbd2a..e864567cec 100644
--- a/keyboards/al1/config.h
+++ b/keyboards/al1/config.h
@@ -27,11 +27,6 @@ along with this program. If not, see .
#define SN74X154_ADDRESS_PINS { D4, D5, D6, D7 }
#define SN74X154_E1_PIN D3
-/* 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/al1/info.json b/keyboards/al1/info.json
index 6051163dc7..7e6440560f 100644
--- a/keyboards/al1/info.json
+++ b/keyboards/al1/info.json
@@ -8,6 +8,20 @@
"pid": "0x6050",
"device_version": "1.0.4"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "backlight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"backlight": {
"pin": "B6",
"breathing": true
diff --git a/keyboards/al1/rules.mk b/keyboards/al1/rules.mk
index ca917bc548..73713d8a3f 100644
--- a/keyboards/al1/rules.mk
+++ b/keyboards/al1/rules.mk
@@ -1,16 +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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = lite
VPATH += drivers/gpio
SRC += matrix.c sn74x154.c
diff --git a/keyboards/alas/info.json b/keyboards/alas/info.json
index 5c5e29f595..b5617189de 100755
--- a/keyboards/alas/info.json
+++ b/keyboards/alas/info.json
@@ -8,6 +8,12 @@
"pid": "0x414C",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"indicators": {
"caps_lock": "B6",
"on_state": 0
@@ -19,6 +25,7 @@
"diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_tsangan_hhkb"],
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/alas/rules.mk b/keyboards/alas/rules.mk
index 916e1bf9bb..0ab54aaaf7 100644
--- a/keyboards/alas/rules.mk
+++ b/keyboards/alas/rules.mk
@@ -1,17 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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
-
-LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_ansi_tsangan 60_iso 60_iso_split_bs_rshift 60_iso_tsangan 60_tsangan_hhkb
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
deleted file mode 100644
index a66b5188b6..0000000000
--- a/keyboards/aleblazer/zodiark/info.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
- "keyboard_name": "Zodiark",
- "manufacturer": "Aleblazer",
- "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark",
- "maintainer": "Aleblazer",
- "usb": {
- "vid": "0xF901",
- "pid": "0xF902",
- "device_version": "0.0.1"
- },
- "ws2812": {
- "pin": "B5"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 68,
- "max_brightness": 170,
- "split_count": [34, 34],
- "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
- }
- },
- "rgb_matrix": {
- "driver": "ws2812",
- "max_brightness": 150,
- "sat_steps": 8,
- "speed_steps": 10,
- "split_count": [34, 34],
- "val_steps": 8
- },
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["C6", "D7", "E6", "B4", "F4"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "D2", "pin_b": "D4", "resolution": 3}
- ]
- },
- "split": {
- "soft_serial_pin": "D3",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "D4", "pin_b": "D2", "resolution": 3}
- ]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.53},
- {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.53},
- {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0.125},
- {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.125},
- {"label": "L05", "matrix": [0, 5], "x": 5, "y": 0.25},
-
- {"label": "R01", "matrix": [5, 5], "x": 12, "y": 0.25},
- {"label": "R02", "matrix": [5, 4], "x": 13, "y": 0.125},
- {"label": "R03", "matrix": [5, 3], "x": 14, "y": 0},
- {"label": "R04", "matrix": [5, 2], "x": 15, "y": 0.125},
- {"label": "R05", "matrix": [5, 1], "x": 16, "y": 0.53},
- {"label": "R06", "matrix": [5, 0], "x": 17, "y": 0.53},
-
- {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.53},
- {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.53},
- {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1.125},
- {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1},
- {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.125},
- {"label": "L15", "matrix": [1, 5], "x": 5, "y": 1.25},
-
- {"label": "L06", "matrix": [0, 6], "x": 6, "y": 1.7},
-
- {"label": "R00", "matrix": [5, 6], "x": 11, "y": 1.7},
-
- {"label": "R11", "matrix": [6, 5], "x": 12, "y": 1.25},
- {"label": "R12", "matrix": [6, 4], "x": 13, "y": 1.125},
- {"label": "R13", "matrix": [6, 3], "x": 14, "y": 1},
- {"label": "R14", "matrix": [6, 2], "x": 15, "y": 1.125},
- {"label": "R15", "matrix": [6, 1], "x": 16, "y": 1.53},
- {"label": "R16", "matrix": [6, 0], "x": 17, "y": 1.53},
-
- {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.53},
- {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.53},
- {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2.125},
- {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2},
- {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.125},
- {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2.25},
-
- {"label": "L16", "matrix": [1, 6], "x": 6, "y": 2.7},
-
- {"label": "R10", "matrix": [6, 6], "x": 11, "y": 2.7},
-
- {"label": "R21", "matrix": [7, 5], "x": 12, "y": 2.25},
- {"label": "R22", "matrix": [7, 4], "x": 13, "y": 2.125},
- {"label": "R23", "matrix": [7, 3], "x": 14, "y": 2},
- {"label": "R24", "matrix": [7, 2], "x": 15, "y": 2.125},
- {"label": "R25", "matrix": [7, 1], "x": 16, "y": 2.53},
- {"label": "R26", "matrix": [7, 0], "x": 17, "y": 2.53},
-
- {"label": "L30", "matrix": [3, 0], "x": 0, "y": 3.53},
- {"label": "L31", "matrix": [3, 1], "x": 1, "y": 3.53},
- {"label": "L32", "matrix": [3, 2], "x": 2, "y": 3.125},
- {"label": "L33", "matrix": [3, 3], "x": 3, "y": 3},
- {"label": "L34", "matrix": [3, 4], "x": 4, "y": 3.125},
- {"label": "L35", "matrix": [3, 5], "x": 5, "y": 3.25},
-
- {"label": "L26", "matrix": [2, 6], "x": 6.5, "y": 4.25},
- {"label": "L36", "matrix": [3, 6], "x": 7.5, "y": 4.25},
-
- {"label": "R30", "matrix": [8, 6], "x": 9.5, "y": 4.25},
- {"label": "R20", "matrix": [7, 6], "x": 10.5, "y": 4.25},
-
- {"label": "R31", "matrix": [8, 5], "x": 12, "y": 3.25},
- {"label": "R32", "matrix": [8, 4], "x": 13, "y": 3.125},
- {"label": "R33", "matrix": [8, 3], "x": 14, "y": 3},
- {"label": "R34", "matrix": [8, 2], "x": 15, "y": 3.125},
- {"label": "R35", "matrix": [8, 1], "x": 16, "y": 3.53},
- {"label": "R36", "matrix": [8, 0], "x": 17, "y": 3.53},
-
- {"label": "L40", "matrix": [4, 0], "x": 0, "y": 4.53},
- {"label": "L41", "matrix": [4, 1], "x": 1, "y": 4.53},
- {"label": "L42", "matrix": [4, 2], "x": 2, "y": 4.125},
- {"label": "L43", "matrix": [4, 3], "x": 3, "y": 4},
- {"label": "L44", "matrix": [4, 4], "x": 4, "y": 4.125},
- {"label": "L45", "matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.5},
- {"label": "L46", "matrix": [4, 6], "x": 7.5, "y": 5.25},
-
- {"label": "R40", "matrix": [9, 6], "x": 9.5, "y": 5.25},
- {"label": "R41", "matrix": [9, 5], "x": 10.5, "y": 5.25, "w": 1.5},
- {"label": "R42", "matrix": [9, 4], "x": 13, "y": 4.125},
- {"label": "R43", "matrix": [9, 3], "x": 14, "y": 4},
- {"label": "R44", "matrix": [9, 2], "x": 15, "y": 4.125},
- {"label": "R45", "matrix": [9, 1], "x": 16, "y": 4.53},
- {"label": "R46", "matrix": [9, 0], "x": 17, "y": 4.53}
- ]
- }
- }
-}
diff --git a/keyboards/aleblazer/zodiark/keyboard.json b/keyboards/aleblazer/zodiark/keyboard.json
new file mode 100644
index 0000000000..9f77049dee
--- /dev/null
+++ b/keyboards/aleblazer/zodiark/keyboard.json
@@ -0,0 +1,165 @@
+{
+ "keyboard_name": "Zodiark",
+ "manufacturer": "Aleblazer",
+ "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark",
+ "maintainer": "Aleblazer",
+ "usb": {
+ "vid": "0xF901",
+ "pid": "0xF902",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "oled": true,
+ "encoder": true
+ },
+ "build": {
+ "lto": true
+ },
+ "ws2812": {
+ "pin": "B5"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 68,
+ "max_brightness": 170,
+ "split_count": [34, 34],
+ "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
+ }
+ },
+ "rgb_matrix": {
+ "driver": "ws2812",
+ "max_brightness": 150,
+ "sat_steps": 8,
+ "speed_steps": 10,
+ "split_count": [34, 34],
+ "val_steps": 8
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["C6", "D7", "E6", "B4", "F4"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "D4", "resolution": 3}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D3",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "D4", "pin_b": "D2", "resolution": 3}
+ ]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.53},
+ {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.53},
+ {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0.125},
+ {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.125},
+ {"label": "L05", "matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"label": "R01", "matrix": [5, 5], "x": 12, "y": 0.25},
+ {"label": "R02", "matrix": [5, 4], "x": 13, "y": 0.125},
+ {"label": "R03", "matrix": [5, 3], "x": 14, "y": 0},
+ {"label": "R04", "matrix": [5, 2], "x": 15, "y": 0.125},
+ {"label": "R05", "matrix": [5, 1], "x": 16, "y": 0.53},
+ {"label": "R06", "matrix": [5, 0], "x": 17, "y": 0.53},
+
+ {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.53},
+ {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.53},
+ {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1.125},
+ {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.125},
+ {"label": "L15", "matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"label": "L06", "matrix": [0, 6], "x": 6, "y": 1.7},
+
+ {"label": "R00", "matrix": [5, 6], "x": 11, "y": 1.7},
+
+ {"label": "R11", "matrix": [6, 5], "x": 12, "y": 1.25},
+ {"label": "R12", "matrix": [6, 4], "x": 13, "y": 1.125},
+ {"label": "R13", "matrix": [6, 3], "x": 14, "y": 1},
+ {"label": "R14", "matrix": [6, 2], "x": 15, "y": 1.125},
+ {"label": "R15", "matrix": [6, 1], "x": 16, "y": 1.53},
+ {"label": "R16", "matrix": [6, 0], "x": 17, "y": 1.53},
+
+ {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.53},
+ {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.53},
+ {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2.125},
+ {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2},
+ {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.125},
+ {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2.25},
+
+ {"label": "L16", "matrix": [1, 6], "x": 6, "y": 2.7},
+
+ {"label": "R10", "matrix": [6, 6], "x": 11, "y": 2.7},
+
+ {"label": "R21", "matrix": [7, 5], "x": 12, "y": 2.25},
+ {"label": "R22", "matrix": [7, 4], "x": 13, "y": 2.125},
+ {"label": "R23", "matrix": [7, 3], "x": 14, "y": 2},
+ {"label": "R24", "matrix": [7, 2], "x": 15, "y": 2.125},
+ {"label": "R25", "matrix": [7, 1], "x": 16, "y": 2.53},
+ {"label": "R26", "matrix": [7, 0], "x": 17, "y": 2.53},
+
+ {"label": "L30", "matrix": [3, 0], "x": 0, "y": 3.53},
+ {"label": "L31", "matrix": [3, 1], "x": 1, "y": 3.53},
+ {"label": "L32", "matrix": [3, 2], "x": 2, "y": 3.125},
+ {"label": "L33", "matrix": [3, 3], "x": 3, "y": 3},
+ {"label": "L34", "matrix": [3, 4], "x": 4, "y": 3.125},
+ {"label": "L35", "matrix": [3, 5], "x": 5, "y": 3.25},
+
+ {"label": "L26", "matrix": [2, 6], "x": 6.5, "y": 4.25},
+ {"label": "L36", "matrix": [3, 6], "x": 7.5, "y": 4.25},
+
+ {"label": "R30", "matrix": [8, 6], "x": 9.5, "y": 4.25},
+ {"label": "R20", "matrix": [7, 6], "x": 10.5, "y": 4.25},
+
+ {"label": "R31", "matrix": [8, 5], "x": 12, "y": 3.25},
+ {"label": "R32", "matrix": [8, 4], "x": 13, "y": 3.125},
+ {"label": "R33", "matrix": [8, 3], "x": 14, "y": 3},
+ {"label": "R34", "matrix": [8, 2], "x": 15, "y": 3.125},
+ {"label": "R35", "matrix": [8, 1], "x": 16, "y": 3.53},
+ {"label": "R36", "matrix": [8, 0], "x": 17, "y": 3.53},
+
+ {"label": "L40", "matrix": [4, 0], "x": 0, "y": 4.53},
+ {"label": "L41", "matrix": [4, 1], "x": 1, "y": 4.53},
+ {"label": "L42", "matrix": [4, 2], "x": 2, "y": 4.125},
+ {"label": "L43", "matrix": [4, 3], "x": 3, "y": 4},
+ {"label": "L44", "matrix": [4, 4], "x": 4, "y": 4.125},
+ {"label": "L45", "matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.5},
+ {"label": "L46", "matrix": [4, 6], "x": 7.5, "y": 5.25},
+
+ {"label": "R40", "matrix": [9, 6], "x": 9.5, "y": 5.25},
+ {"label": "R41", "matrix": [9, 5], "x": 10.5, "y": 5.25, "w": 1.5},
+ {"label": "R42", "matrix": [9, 4], "x": 13, "y": 4.125},
+ {"label": "R43", "matrix": [9, 3], "x": 14, "y": 4},
+ {"label": "R44", "matrix": [9, 2], "x": 15, "y": 4.125},
+ {"label": "R45", "matrix": [9, 1], "x": 16, "y": 4.53},
+ {"label": "R46", "matrix": [9, 0], "x": 17, "y": 4.53}
+ ]
+ }
+ }
+}
diff --git a/keyboards/aleblazer/zodiark/rules.mk b/keyboards/aleblazer/zodiark/rules.mk
deleted file mode 100644
index 8fc2f2ff25..0000000000
--- a/keyboards/aleblazer/zodiark/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
deleted file mode 100644
index d876570c80..0000000000
--- a/keyboards/alf/dc60/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/alf/dc60/keyboard.json b/keyboards/alf/dc60/keyboard.json
index 7fd360d726..ea04748f84 100644
--- a/keyboards/alf/dc60/keyboard.json
+++ b/keyboards/alf/dc60/keyboard.json
@@ -17,6 +17,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"],
"rows": ["B0", "B1", "B2", "B3", "B4"]
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
deleted file mode 100644
index b5b661bef2..0000000000
--- a/keyboards/alf/x11/config.h
+++ /dev/null
@@ -1,39 +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/alf/x11/keyboard.json b/keyboards/alf/x11/keyboard.json
index 03abfc2dbe..c571705dc1 100644
--- a/keyboards/alf/x11/keyboard.json
+++ b/keyboards/alf/x11/keyboard.json
@@ -21,6 +21,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"]
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
deleted file mode 100644
index 02460e0bed..0000000000
--- a/keyboards/alf/x2/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2018-2021 @fixed, MechMerlin, QMK
- *
- * 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/alf/x2/keyboard.json b/keyboards/alf/x2/keyboard.json
index fe70097932..9dd011c7f1 100644
--- a/keyboards/alf/x2/keyboard.json
+++ b/keyboards/alf/x2/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/aliceh66/pianoforte/config.h b/keyboards/aliceh66/pianoforte/config.h
deleted file mode 100644
index ff87862693..0000000000
--- a/keyboards/aliceh66/pianoforte/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2022 AliceH
-
-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/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json
index 6cc2546794..b732b02db2 100644
--- a/keyboards/aliceh66/pianoforte/info.json
+++ b/keyboards/aliceh66/pianoforte/info.json
@@ -8,6 +8,21 @@
"pid": "0x7066",
"vid": "0x6168"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D4", "D6", "D7", "B4", "B5", "F1", "F0", "E6", "B6"],
"rows": ["D1", "D0", "D3", "D2", "D5", "B0", "C6", "C7", "F6", "F7", "F5", "F4"]
diff --git a/keyboards/aliceh66/pianoforte/rules.mk b/keyboards/aliceh66/pianoforte/rules.mk
index 2f9cd4eea9..4b54462335 100644
--- a/keyboards/aliceh66/pianoforte/rules.mk
+++ b/keyboards/aliceh66/pianoforte/rules.mk
@@ -1,16 +1,2 @@
# Processor Frequency
F_CPU = 8000000
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/aliceh66/pianoforte_hs/config.h b/keyboards/aliceh66/pianoforte_hs/config.h
deleted file mode 100644
index ff87862693..0000000000
--- a/keyboards/aliceh66/pianoforte_hs/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2022 AliceH
-
-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/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/info.json
index 7366e961c1..ff73a00ea8 100644
--- a/keyboards/aliceh66/pianoforte_hs/info.json
+++ b/keyboards/aliceh66/pianoforte_hs/info.json
@@ -8,6 +8,21 @@
"pid": "0x7068",
"vid": "0x6168"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D6", "D7", "B4", "B5", "B6", "F6", "F5", "E6", "D4"],
"rows": ["D2", "D1", "D3", "D0", "D5", "B0", "F0", "F1", "F7", "F4", "C7", "C6"]
diff --git a/keyboards/aliceh66/pianoforte_hs/rules.mk b/keyboards/aliceh66/pianoforte_hs/rules.mk
index 3488ea0dd2..4b54462335 100644
--- a/keyboards/aliceh66/pianoforte_hs/rules.mk
+++ b/keyboards/aliceh66/pianoforte_hs/rules.mk
@@ -1,16 +1,2 @@
# Processor Frequency
F_CPU = 8000000
-
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
deleted file mode 100755
index 5f36081323..0000000000
--- a/keyboards/alpha/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/alpha/keyboard.json b/keyboards/alpha/keyboard.json
index f708ad2b9f..1cb2fe71cd 100644
--- a/keyboards/alpha/keyboard.json
+++ b/keyboards/alpha/keyboard.json
@@ -36,6 +36,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"],
"rows": ["D4", "B4", "B5"]
diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h
deleted file mode 100644
index f608132b5a..0000000000
--- a/keyboards/alpine65/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato
-
-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/alpine65/keyboard.json b/keyboards/alpine65/keyboard.json
index 4fccb3c564..36bba880a8 100644
--- a/keyboards/alpine65/keyboard.json
+++ b/keyboards/alpine65/keyboard.json
@@ -37,6 +37,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A9", "A8", "B14", "B12", "A10", "A0", "A1"],
"rows": ["C14", "C15", "C13", "A2", "A3"]
diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h
deleted file mode 100644
index 4b007cf387..0000000000
--- a/keyboards/alps64/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 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/alps64/keyboard.json b/keyboards/alps64/keyboard.json
index 72f21d0c33..a6a60478f8 100644
--- a/keyboards/alps64/keyboard.json
+++ b/keyboards/alps64/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"],
"rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2"]
diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h
index ffff9dc8c6..9dd9e9bdde 100644
--- a/keyboards/alt34/rev1/config.h
+++ b/keyboards/alt34/rev1/config.h
@@ -17,11 +17,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
-
#define USE_I2C
/* Select hand configuration */
diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json
deleted file mode 100644
index cf90324c14..0000000000
--- a/keyboards/alt34/rev1/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
- "keyboard_name": "alt34",
- "manufacturer": "altosys",
- "url": "https://gitlab.com/altosys/alt34",
- "maintainer": "@altosys",
- "usb": {
- "vid": "0x1ABC",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B6", "B2", "B3", "B1", "F7"],
- "rows": ["D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["split_3x5_2"],
- "layouts": {
- "LAYOUT_split_3x5_2": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.93},
- {"matrix": [0, 1], "x": 1, "y": 0.31},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.28},
- {"matrix": [0, 4], "x": 4, "y": 0.42},
-
- {"matrix": [4, 4], "x": 7, "y": 0.42},
- {"matrix": [4, 3], "x": 8, "y": 0.28},
- {"matrix": [4, 2], "x": 9, "y": 0},
- {"matrix": [4, 1], "x": 10, "y": 0.31},
- {"matrix": [4, 0], "x": 11, "y": 0.93},
-
- {"matrix": [1, 0], "x": 0, "y": 1.93},
- {"matrix": [1, 1], "x": 1, "y": 1.31},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.28},
- {"matrix": [1, 4], "x": 4, "y": 1.42},
-
- {"matrix": [5, 4], "x": 7, "y": 1.42},
- {"matrix": [5, 3], "x": 8, "y": 1.28},
- {"matrix": [5, 2], "x": 9, "y": 1},
- {"matrix": [5, 1], "x": 10, "y": 1.31},
- {"matrix": [5, 0], "x": 11, "y": 1.93},
-
- {"matrix": [2, 0], "x": 0, "y": 2.93},
- {"matrix": [2, 1], "x": 1, "y": 2.31},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.28},
- {"matrix": [2, 4], "x": 4, "y": 2.42},
-
- {"matrix": [6, 4], "x": 7, "y": 2.42},
- {"matrix": [6, 3], "x": 8, "y": 2.28},
- {"matrix": [6, 2], "x": 9, "y": 2},
- {"matrix": [6, 1], "x": 10, "y": 2.31},
- {"matrix": [6, 0], "x": 11, "y": 2.93},
-
- {"matrix": [3, 3], "x": 3.5, "y": 3.45},
- {"matrix": [3, 4], "x": 4.5, "y": 3.7},
-
- {"matrix": [7, 4], "x": 6.5, "y": 3.7},
- {"matrix": [7, 3], "x": 7.5, "y": 3.45}
- ]
- }
- }
-}
diff --git a/keyboards/alt34/rev1/keyboard.json b/keyboards/alt34/rev1/keyboard.json
new file mode 100644
index 0000000000..712dd72943
--- /dev/null
+++ b/keyboards/alt34/rev1/keyboard.json
@@ -0,0 +1,80 @@
+{
+ "keyboard_name": "alt34",
+ "manufacturer": "altosys",
+ "url": "https://gitlab.com/altosys/alt34",
+ "maintainer": "@altosys",
+ "usb": {
+ "vid": "0x1ABC",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "split": {
+ "enabled": true
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7"],
+ "rows": ["D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["split_3x5_2"],
+ "layouts": {
+ "LAYOUT_split_3x5_2": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.93},
+ {"matrix": [0, 1], "x": 1, "y": 0.31},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.28},
+ {"matrix": [0, 4], "x": 4, "y": 0.42},
+
+ {"matrix": [4, 4], "x": 7, "y": 0.42},
+ {"matrix": [4, 3], "x": 8, "y": 0.28},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 1], "x": 10, "y": 0.31},
+ {"matrix": [4, 0], "x": 11, "y": 0.93},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.93},
+ {"matrix": [1, 1], "x": 1, "y": 1.31},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.28},
+ {"matrix": [1, 4], "x": 4, "y": 1.42},
+
+ {"matrix": [5, 4], "x": 7, "y": 1.42},
+ {"matrix": [5, 3], "x": 8, "y": 1.28},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1.31},
+ {"matrix": [5, 0], "x": 11, "y": 1.93},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.93},
+ {"matrix": [2, 1], "x": 1, "y": 2.31},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.28},
+ {"matrix": [2, 4], "x": 4, "y": 2.42},
+
+ {"matrix": [6, 4], "x": 7, "y": 2.42},
+ {"matrix": [6, 3], "x": 8, "y": 2.28},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 1], "x": 10, "y": 2.31},
+ {"matrix": [6, 0], "x": 11, "y": 2.93},
+
+ {"matrix": [3, 3], "x": 3.5, "y": 3.45},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.7},
+
+ {"matrix": [7, 4], "x": 6.5, "y": 3.7},
+ {"matrix": [7, 3], "x": 7.5, "y": 3.45}
+ ]
+ }
+ }
+}
diff --git a/keyboards/alt34/rev1/rules.mk b/keyboards/alt34/rev1/rules.mk
deleted file mode 100644
index 99541b285b..0000000000
--- a/keyboards/alt34/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change to "no" to disable the options
-#
-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
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h
deleted file mode 100644
index cdad6969cb..0000000000
--- a/keyboards/amag23/config.h
+++ /dev/null
@@ -1,21 +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
-
-/* 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/amag23/keyboard.json b/keyboards/amag23/keyboard.json
index ed37a36e54..e3eb16cdad 100644
--- a/keyboards/amag23/keyboard.json
+++ b/keyboards/amag23/keyboard.json
@@ -37,6 +37,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
"rows": ["A0", "A1", "A2", "A3"]
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
deleted file mode 100755
index b9449c4714..0000000000
--- a/keyboards/amjkeyboard/amj40/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/amjkeyboard/amj40/keyboard.json b/keyboards/amjkeyboard/amj40/keyboard.json
index 8ce166728c..de536cb55e 100644
--- a/keyboards/amjkeyboard/amj40/keyboard.json
+++ b/keyboards/amjkeyboard/amj40/keyboard.json
@@ -18,6 +18,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7"],
"rows": ["F4", "F5", "F6", "F7"]
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
deleted file mode 100644
index b9449c4714..0000000000
--- a/keyboards/amjkeyboard/amj60/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/amjkeyboard/amj60/keyboard.json b/keyboards/amjkeyboard/amj60/keyboard.json
index 0b65c742aa..5ab353675a 100644
--- a/keyboards/amjkeyboard/amj60/keyboard.json
+++ b/keyboards/amjkeyboard/amj60/keyboard.json
@@ -18,6 +18,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
"rows": ["F7", "F6", "F5", "F4", "D5"]
diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h
deleted file mode 100644
index b48aca7770..0000000000
--- a/keyboards/amjkeyboard/amj66/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2018 Alex Peters
-
-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/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json
index 07a170a3f6..72646e4fc7 100644
--- a/keyboards/amjkeyboard/amj66/info.json
+++ b/keyboards/amjkeyboard/amj66/info.json
@@ -8,6 +8,20 @@
"pid": "0xBD66",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "backlight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5", "B6"],
"rows": ["F7", "F6", "F5", "F4", "F1"]
diff --git a/keyboards/amjkeyboard/amj66/rules.mk b/keyboards/amjkeyboard/amj66/rules.mk
index cb4a880111..09057bea54 100644
--- a/keyboards/amjkeyboard/amj66/rules.mk
+++ b/keyboards/amjkeyboard/amj66/rules.mk
@@ -1,15 +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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h
deleted file mode 100644
index 86415b251a..0000000000
--- a/keyboards/amjkeyboard/amj84/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// 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
-
-/*
- * 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/amjkeyboard/amj84/keyboard.json b/keyboards/amjkeyboard/amj84/keyboard.json
index 217b685391..b544ffc8b3 100644
--- a/keyboards/amjkeyboard/amj84/keyboard.json
+++ b/keyboards/amjkeyboard/amj84/keyboard.json
@@ -18,6 +18,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "D1"],
"rows": ["D0", "F7", "F6", "F5", "F4", "D5"]
diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index b16c84d50e..81cbb4a5e0 100644
--- a/keyboards/amjkeyboard/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -36,11 +36,6 @@ 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
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json
index 60cb8ee9e8..23a131c615 100644
--- a/keyboards/amjkeyboard/amj96/info.json
+++ b/keyboards/amjkeyboard/amj96/info.json
@@ -8,6 +8,20 @@
"pid": "0x6074",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"rgblight": {
"led_count": 16,
"animations": {
diff --git a/keyboards/amjkeyboard/amj96/rules.mk b/keyboards/amjkeyboard/amj96/rules.mk
index dfe1d12b55..8784813b33 100644
--- a/keyboards/amjkeyboard/amj96/rules.mk
+++ b/keyboards/amjkeyboard/amj96/rules.mk
@@ -1,15 +1,2 @@
-# 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 = 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
-
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
deleted file mode 100644
index b9449c4714..0000000000
--- a/keyboards/amjkeyboard/amjpad/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/amjkeyboard/amjpad/keyboard.json b/keyboards/amjkeyboard/amjpad/keyboard.json
index bd960d8c8a..e331f3af19 100644
--- a/keyboards/amjkeyboard/amjpad/keyboard.json
+++ b/keyboards/amjkeyboard/amjpad/keyboard.json
@@ -17,6 +17,12 @@
"mousekey": false,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F1", "F0", "E6", "C7"],
"rows": ["F7", "F6", "F5", "F4", "D5", "D0"]
diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json
deleted file mode 100644
index 551d059bad..0000000000
--- a/keyboards/anavi/knob1/info.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
- "keyboard_name": "Knob 1",
- "manufacturer": "ANAVI",
- "url": "https://github.com/AnaviTechnology/anavi-knob-1",
- "maintainer": "leon-anavi",
- "processor": "RP2040",
- "bootloader": "rp2040",
- "features": {
- "bootmagic": false,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": false,
- "nkro": true,
- "rgblight": true
- },
- "rgblight": {
- "led_count": 1,
- "hue_steps": 10,
- "animations": {
- "alternating": true,
- "breathing": true,
- "christmas": true,
- "knight": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "rgb_test": true,
- "snake": true,
- "static_gradient": true,
- "twinkle": true
- },
- "default": {
- "animation": "rainbow_swirl"
- }
- },
- "ws2812": {
- "pin": "GP12",
- "driver": "vendor"
- },
- "encoder": {
- "enabled": true,
- "rotary": [
- {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2}
- ]
- },
- "matrix_pins": {
- "direct": [
- ["GP26"]
- ]
- },
- "layouts": {
- "LAYOUT_k1": {
- "layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]}
- ]
- }
- },
- "usb": {
- "device_version": "1.0.0",
- "pid": "0x9A25",
- "vid": "0xFEED"
- }
-}
diff --git a/keyboards/anavi/knob1/keyboard.json b/keyboards/anavi/knob1/keyboard.json
new file mode 100644
index 0000000000..9c4c60640e
--- /dev/null
+++ b/keyboards/anavi/knob1/keyboard.json
@@ -0,0 +1,64 @@
+{
+ "keyboard_name": "Knob 1",
+ "manufacturer": "ANAVI",
+ "url": "https://github.com/AnaviTechnology/anavi-knob-1",
+ "maintainer": "leon-anavi",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true,
+ "oled": true
+ },
+ "rgblight": {
+ "led_count": 1,
+ "hue_steps": 10,
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ },
+ "default": {
+ "animation": "rainbow_swirl"
+ }
+ },
+ "ws2812": {
+ "pin": "GP12",
+ "driver": "vendor"
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2}
+ ]
+ },
+ "matrix_pins": {
+ "direct": [
+ ["GP26"]
+ ]
+ },
+ "layouts": {
+ "LAYOUT_k1": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]}
+ ]
+ }
+ },
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x9A25",
+ "vid": "0xFEED"
+ }
+}
diff --git a/keyboards/anavi/knob1/rules.mk b/keyboards/anavi/knob1/rules.mk
deleted file mode 100644
index dd68e9d3b0..0000000000
--- a/keyboards/anavi/knob1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json
deleted file mode 100644
index ad51b7ce6c..0000000000
--- a/keyboards/anavi/knobs3/info.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "keyboard_name": "Knobs 3",
- "manufacturer": "ANAVI",
- "url": "https://github.com/AnaviTechnology/anavi-knobs-3",
- "maintainer": "leon-anavi",
- "processor": "RP2040",
- "bootloader": "rp2040",
- "matrix_pins": {
- "direct": [
- ["GP26", "GP29", "GP0"]
- ]
- },
- "features": {
- "bootmagic": false,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": false,
- "nkro": true,
- "rgblight": true
- },
- "rgblight": {
- "led_count": 1,
- "hue_steps": 10,
- "saturation_steps": 17,
- "brightness_steps": 17,
- "max_brightness": 255,
- "animations": {
- "alternating": true,
- "breathing": true,
- "christmas": true,
- "knight": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "rgb_test": true,
- "snake": true,
- "static_gradient": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "pin": "GP12",
- "driver": "vendor"
- },
- "encoder": {
- "enabled": true,
- "rotary": [
- {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2},
- {"pin_a": "GP4", "pin_b": "GP3", "resolution": 2},
- {"pin_a": "GP1", "pin_b": "GP2", "resolution": 2}
- ]
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label": "Mute", "x": 0, "y": 0, "matrix": [0, 0]},
- {"label": "RGB", "x": 0, "y": 1, "matrix": [0, 1]},
- {"label": "Animation", "x": 0, "y": 2, "matrix": [0, 2]}
- ]
- }
- },
- "usb": {
- "device_version": "1.0.0",
- "pid": "0x9A25",
- "vid": "0xFEED"
- }
-}
diff --git a/keyboards/anavi/knobs3/keyboard.json b/keyboards/anavi/knobs3/keyboard.json
new file mode 100644
index 0000000000..11081ee086
--- /dev/null
+++ b/keyboards/anavi/knobs3/keyboard.json
@@ -0,0 +1,68 @@
+{
+ "keyboard_name": "Knobs 3",
+ "manufacturer": "ANAVI",
+ "url": "https://github.com/AnaviTechnology/anavi-knobs-3",
+ "maintainer": "leon-anavi",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "matrix_pins": {
+ "direct": [
+ ["GP26", "GP29", "GP0"]
+ ]
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true,
+ "oled": true
+ },
+ "rgblight": {
+ "led_count": 1,
+ "hue_steps": 10,
+ "saturation_steps": 17,
+ "brightness_steps": 17,
+ "max_brightness": 255,
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "pin": "GP12",
+ "driver": "vendor"
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2},
+ {"pin_a": "GP4", "pin_b": "GP3", "resolution": 2},
+ {"pin_a": "GP1", "pin_b": "GP2", "resolution": 2}
+ ]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "Mute", "x": 0, "y": 0, "matrix": [0, 0]},
+ {"label": "RGB", "x": 0, "y": 1, "matrix": [0, 1]},
+ {"label": "Animation", "x": 0, "y": 2, "matrix": [0, 2]}
+ ]
+ }
+ },
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x9A25",
+ "vid": "0xFEED"
+ }
+}
diff --git a/keyboards/anavi/knobs3/rules.mk b/keyboards/anavi/knobs3/rules.mk
deleted file mode 100644
index dd68e9d3b0..0000000000
--- a/keyboards/anavi/knobs3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h
deleted file mode 100644
index fff04f05b3..0000000000
--- a/keyboards/ano/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 Sebastien Sauve-Hoover (@sauvehoo)
- *
- * 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/ano/keyboard.json b/keyboards/ano/keyboard.json
index c522f816ce..e676ce7270 100644
--- a/keyboards/ano/keyboard.json
+++ b/keyboards/ano/keyboard.json
@@ -28,7 +28,11 @@
]
},
"qmk": {
- "tap_keycode_delay": 10
+ "tap_keycode_delay": 10,
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
},
"processor": "STM32F303",
"bootloader": "stm32-dfu",
diff --git a/keyboards/anomalykb/a65i/config.h b/keyboards/anomalykb/a65i/config.h
deleted file mode 100644
index 947f85bbb2..0000000000
--- a/keyboards/anomalykb/a65i/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Lfgberg
-
-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/anomalykb/a65i/keyboard.json b/keyboards/anomalykb/a65i/keyboard.json
index 98015fcd72..8fadaadadb 100644
--- a/keyboards/anomalykb/a65i/keyboard.json
+++ b/keyboards/anomalykb/a65i/keyboard.json
@@ -15,6 +15,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D7", "D6", "D4", "B4", "B6", "E6", "F1", "B7", "C6", "C7", "D5", "D3", "D2", "F0", "D1", "D0"],
"rows": ["B3", "B2", "B1", "B0", "B5"]
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
deleted file mode 100644
index 66790ac3d3..0000000000
--- a/keyboards/aos/tkl/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 aholland909
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/aos/tkl/keyboard.json b/keyboards/aos/tkl/keyboard.json
index 730a262366..8cd47a44a5 100644
--- a/keyboards/aos/tkl/keyboard.json
+++ b/keyboards/aos/tkl/keyboard.json
@@ -37,6 +37,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"],
"rows": ["D3", "D2", "B7", "F1", "C7", "D5"]
diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json
deleted file mode 100644
index 14d0c01cb9..0000000000
--- a/keyboards/arabica37/rev1/info.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
- "keyboard_name": "Arabica3/7",
- "manufacturer": "CalciumNitride",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
- "rows": ["D4", "C6", "D7", "E6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "rgblight": {
- "led_count": 50,
- "split_count": [25, 25]
- },
- "ws2812": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0.25, "y": 0.75},
- {"matrix": [0, 1], "x": 1.25, "y": 0.75},
- {"matrix": [0, 2], "x": 2.25, "y": 0.25},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0.25},
- {"matrix": [0, 5], "x": 5.25, "y": 0.5},
-
- {"matrix": [4, 5], "x": 9, "y": 0.5},
- {"matrix": [4, 4], "x": 10, "y": 0.25},
- {"matrix": [4, 3], "x": 11, "y": 0},
- {"matrix": [4, 2], "x": 12, "y": 0.25},
- {"matrix": [4, 1], "x": 13, "y": 0.75},
- {"matrix": [4, 0], "x": 14, "y": 0.75},
-
- {"matrix": [1, 0], "x": 0.25, "y": 1.75},
- {"matrix": [1, 1], "x": 1.25, "y": 1.75},
- {"matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"matrix": [1, 5], "x": 5.25, "y": 1.5},
-
- {"matrix": [5, 5], "x": 9, "y": 1.5},
- {"matrix": [5, 4], "x": 10, "y": 1.25},
- {"matrix": [5, 3], "x": 11, "y": 1},
- {"matrix": [5, 2], "x": 12, "y": 1.25},
- {"matrix": [5, 1], "x": 13, "y": 1.75},
- {"matrix": [5, 0], "x": 14, "y": 1.75},
-
- {"matrix": [2, 0], "x": 0.25, "y": 2.75},
- {"matrix": [2, 1], "x": 1.25, "y": 2.75},
- {"matrix": [2, 2], "x": 2.25, "y": 2.25},
- {"matrix": [2, 3], "x": 3.25, "y": 2},
- {"matrix": [2, 4], "x": 4.25, "y": 2.25},
- {"matrix": [2, 5], "x": 5.25, "y": 2.5},
-
- {"matrix": [6, 5], "x": 9, "y": 2.5},
- {"matrix": [6, 4], "x": 10, "y": 2.25},
- {"matrix": [6, 3], "x": 11, "y": 2},
- {"matrix": [6, 2], "x": 12, "y": 2.25},
- {"matrix": [6, 1], "x": 13, "y": 2.75},
- {"matrix": [6, 0], "x": 14, "y": 2.75},
-
- {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 2.25},
- {"matrix": [3, 4], "x": 4.375, "y": 3.75, "w": 1.5},
- {"matrix": [3, 5], "x": 5.875, "y": 3.75, "w": 1.25},
-
- {"matrix": [7, 5], "x": 8.125, "y": 3.75, "w": 1.25},
- {"matrix": [7, 4], "x": 9.375, "y": 3.75, "w": 1.5},
- {"matrix": [7, 0], "x": 13, "y": 3.75, "w": 2.25},
-
- {"matrix": [3, 3], "x": 5.125, "y": 4.75, "w": 1.25},
-
- {"matrix": [7, 3], "x": 8.875, "y": 4.75, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/arabica37/rev1/keyboard.json b/keyboards/arabica37/rev1/keyboard.json
new file mode 100644
index 0000000000..710a377ab9
--- /dev/null
+++ b/keyboards/arabica37/rev1/keyboard.json
@@ -0,0 +1,94 @@
+{
+ "keyboard_name": "Arabica3/7",
+ "manufacturer": "CalciumNitride",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "rgblight": {
+ "led_count": 50,
+ "split_count": [25, 25]
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0.25, "y": 0.75},
+ {"matrix": [0, 1], "x": 1.25, "y": 0.75},
+ {"matrix": [0, 2], "x": 2.25, "y": 0.25},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0.25},
+ {"matrix": [0, 5], "x": 5.25, "y": 0.5},
+
+ {"matrix": [4, 5], "x": 9, "y": 0.5},
+ {"matrix": [4, 4], "x": 10, "y": 0.25},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 2], "x": 12, "y": 0.25},
+ {"matrix": [4, 1], "x": 13, "y": 0.75},
+ {"matrix": [4, 0], "x": 14, "y": 0.75},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1.75},
+ {"matrix": [1, 1], "x": 1.25, "y": 1.75},
+ {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.5},
+
+ {"matrix": [5, 5], "x": 9, "y": 1.5},
+ {"matrix": [5, 4], "x": 10, "y": 1.25},
+ {"matrix": [5, 3], "x": 11, "y": 1},
+ {"matrix": [5, 2], "x": 12, "y": 1.25},
+ {"matrix": [5, 1], "x": 13, "y": 1.75},
+ {"matrix": [5, 0], "x": 14, "y": 1.75},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2.75},
+ {"matrix": [2, 1], "x": 1.25, "y": 2.75},
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.25, "y": 2},
+ {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.25, "y": 2.5},
+
+ {"matrix": [6, 5], "x": 9, "y": 2.5},
+ {"matrix": [6, 4], "x": 10, "y": 2.25},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 2], "x": 12, "y": 2.25},
+ {"matrix": [6, 1], "x": 13, "y": 2.75},
+ {"matrix": [6, 0], "x": 14, "y": 2.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.375, "y": 3.75, "w": 1.5},
+ {"matrix": [3, 5], "x": 5.875, "y": 3.75, "w": 1.25},
+
+ {"matrix": [7, 5], "x": 8.125, "y": 3.75, "w": 1.25},
+ {"matrix": [7, 4], "x": 9.375, "y": 3.75, "w": 1.5},
+ {"matrix": [7, 0], "x": 13, "y": 3.75, "w": 2.25},
+
+ {"matrix": [3, 3], "x": 5.125, "y": 4.75, "w": 1.25},
+
+ {"matrix": [7, 3], "x": 8.875, "y": 4.75, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/arabica37/rev1/rules.mk b/keyboards/arabica37/rev1/rules.mk
deleted file mode 100644
index 822a7cf01c..0000000000
--- a/keyboards/arabica37/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json b/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
deleted file mode 100644
index eeeb33f236..0000000000
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
- {
- "manufacturer": "Argo Works",
- "keyboard_name": "Ishi 80 Mk 0",
- "maintainer": "jasonj2232",
- "development_board": "elite_c",
- "pin_compatible": "elite_c",
- "diode_direction": "COL2ROW",
- "url": "https://qmk.fm/keyboards/",
- "usb": {
- "device_version": "0.0.1",
- "pid": "0x4930",
- "vid": "0x4157"
- },
- "bootmagic": {
- "matrix": [1, 0]
- },
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true,
- "encoder": true
- },
- "matrix_pins": {
- "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"],
- "rows": ["B3", "B1", "B6", "B2", "F0", "F1", "B5", "B4", "E6"]
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [1, 0], "x": 0, "y": 0},
- {"matrix": [0, 0], "x": 1, "y": 0},
- {"matrix": [1, 1], "x": 2, "y": 0},
- {"matrix": [0, 1], "x": 3, "y": 0},
- {"matrix": [1, 2], "x": 5.25, "y": 0},
- {"matrix": [0, 2], "x": 6.25, "y": 0},
- {"matrix": [1, 3], "x": 7.25, "y": 0},
- {"matrix": [0, 3], "x": 8.25, "y": 0},
- {"matrix": [1, 4], "x": 9.25, "y": 0},
- {"matrix": [0, 4], "x": 10.25, "y": 0},
- {"matrix": [1, 5], "x": 11.25, "y": 0},
- {"matrix": [0, 5], "x": 12.25, "y": 0},
- {"matrix": [1, 6], "x": 13.25, "y": 0},
- {"matrix": [0, 6], "x": 14.25, "y": 0},
- {"matrix": [1, 7], "x": 15.25, "y": 0},
- {"matrix": [0, 7], "x": 16.25, "y": 0},
- {"matrix": [1, 8], "x": 17.25, "y": 0},
- {"matrix": [0, 8], "x": 18.25, "y": 0, "w": 2},
- {"matrix": [3, 0], "x": 0, "y": 1, "h": 2},
- {"matrix": [2, 0], "x": 1, "y": 1},
- {"matrix": [3, 1], "x": 2, "y": 1},
- {"matrix": [2, 1], "x": 3, "y": 1},
- {"matrix": [3, 2], "x": 5.25, "y": 1, "w": 1.5},
- {"matrix": [2, 2], "x": 6.75, "y": 1},
- {"matrix": [3, 3], "x": 7.75, "y": 1},
- {"matrix": [2, 3], "x": 8.75, "y": 1},
- {"matrix": [3, 4], "x": 9.75, "y": 1},
- {"matrix": [2, 4], "x": 10.75, "y": 1},
- {"matrix": [3, 5], "x": 11.75, "y": 1},
- {"matrix": [2, 5], "x": 12.75, "y": 1},
- {"matrix": [3, 6], "x": 13.75, "y": 1},
- {"matrix": [2, 6], "x": 14.75, "y": 1},
- {"matrix": [3, 7], "x": 15.75, "y": 1},
- {"matrix": [2, 7], "x": 16.75, "y": 1},
- {"matrix": [3, 8], "x": 17.75, "y": 1},
- {"matrix": [2, 8], "x": 18.75, "y": 1, "w": 1.5},
- {"matrix": [4, 0], "x": 1, "y": 2},
- {"matrix": [5, 1], "x": 2, "y": 2},
- {"matrix": [4, 1], "x": 3, "y": 2},
- {"matrix": [5, 2], "x": 5.25, "y": 2, "w": 1.75},
- {"matrix": [4, 2], "x": 7, "y": 2},
- {"matrix": [5, 3], "x": 8, "y": 2},
- {"matrix": [4, 3], "x": 9, "y": 2},
- {"matrix": [5, 4], "x": 10, "y": 2},
- {"matrix": [4, 4], "x": 11, "y": 2},
- {"matrix": [5, 5], "x": 12, "y": 2},
- {"matrix": [4, 5], "x": 13, "y": 2},
- {"matrix": [5, 6], "x": 14, "y": 2},
- {"matrix": [4, 6], "x": 15, "y": 2},
- {"matrix": [5, 7], "x": 16, "y": 2},
- {"matrix": [4, 7], "x": 17, "y": 2},
- {"matrix": [4, 8], "x": 18, "y": 2, "w": 2.25},
- {"matrix": [7, 0], "x": 0, "y": 3, "h": 2},
- {"matrix": [6, 0], "x": 1, "y": 3},
- {"matrix": [7, 1], "x": 2, "y": 3},
- {"matrix": [6, 1], "x": 3, "y": 3},
- {"matrix": [7, 2], "x": 5.25, "y": 3, "w": 2.25},
- {"matrix": [7, 3], "x": 7.5, "y": 3},
- {"matrix": [6, 3], "x": 8.5, "y": 3},
- {"matrix": [7, 4], "x": 9.5, "y": 3},
- {"matrix": [6, 4], "x": 10.5, "y": 3},
- {"matrix": [7, 5], "x": 11.5, "y": 3},
- {"matrix": [6, 5], "x": 12.5, "y": 3},
- {"matrix": [7, 6], "x": 13.5, "y": 3},
- {"matrix": [6, 6], "x": 14.5, "y": 3},
- {"matrix": [7, 7], "x": 15.5, "y": 3},
- {"matrix": [6, 7], "x": 16.5, "y": 3},
- {"matrix": [6, 8], "x": 17.5, "y": 3, "w": 2.75},
- {"matrix": [8, 0], "x": 1, "y": 4},
- {"matrix": [8, 1], "x": 2, "y": 4, "w": 2},
- {"matrix": [8, 2], "x": 5.25, "y": 4, "w": 1.25},
- {"matrix": [6, 2], "x": 6.5, "y": 4, "w": 1.25},
- {"matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25},
- {"matrix": [8, 4], "x": 9, "y": 4, "w": 6.25},
- {"matrix": [8, 5], "x": 15.25, "y": 4, "w": 1.25},
- {"matrix": [8, 6], "x": 16.5, "y": 4, "w": 1.25},
- {"matrix": [8, 7], "x": 17.75, "y": 4, "w": 1.25},
- {"matrix": [7, 8], "x": 19, "y": 4, "w": 1.25},
- {"matrix": [8, 8], "x": 21.5, "y": 4}
- ]
- }
- },
- "encoder": {
- "rotary": [
- {"pin_a": "B7", "pin_b": "D5"}
- ]
- }
-}
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json b/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json
new file mode 100644
index 0000000000..89b9b1994f
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json
@@ -0,0 +1,122 @@
+ {
+ "manufacturer": "Argo Works",
+ "keyboard_name": "Ishi 80 Mk 0",
+ "maintainer": "jasonj2232",
+ "development_board": "elite_c",
+ "pin_compatible": "elite_c",
+ "diode_direction": "COL2ROW",
+ "url": "https://qmk.fm/keyboards/",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x4930",
+ "vid": "0x4157"
+ },
+ "bootmagic": {
+ "matrix": [1, 0]
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "encoder": true,
+ "oled": true,
+ "wpm": true
+ },
+ "matrix_pins": {
+ "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"],
+ "rows": ["B3", "B1", "B6", "B2", "F0", "F1", "B5", "B4", "E6"]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [1, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [1, 2], "x": 5.25, "y": 0},
+ {"matrix": [0, 2], "x": 6.25, "y": 0},
+ {"matrix": [1, 3], "x": 7.25, "y": 0},
+ {"matrix": [0, 3], "x": 8.25, "y": 0},
+ {"matrix": [1, 4], "x": 9.25, "y": 0},
+ {"matrix": [0, 4], "x": 10.25, "y": 0},
+ {"matrix": [1, 5], "x": 11.25, "y": 0},
+ {"matrix": [0, 5], "x": 12.25, "y": 0},
+ {"matrix": [1, 6], "x": 13.25, "y": 0},
+ {"matrix": [0, 6], "x": 14.25, "y": 0},
+ {"matrix": [1, 7], "x": 15.25, "y": 0},
+ {"matrix": [0, 7], "x": 16.25, "y": 0},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+ {"matrix": [0, 8], "x": 18.25, "y": 0, "w": 2},
+ {"matrix": [3, 0], "x": 0, "y": 1, "h": 2},
+ {"matrix": [2, 0], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [3, 2], "x": 5.25, "y": 1, "w": 1.5},
+ {"matrix": [2, 2], "x": 6.75, "y": 1},
+ {"matrix": [3, 3], "x": 7.75, "y": 1},
+ {"matrix": [2, 3], "x": 8.75, "y": 1},
+ {"matrix": [3, 4], "x": 9.75, "y": 1},
+ {"matrix": [2, 4], "x": 10.75, "y": 1},
+ {"matrix": [3, 5], "x": 11.75, "y": 1},
+ {"matrix": [2, 5], "x": 12.75, "y": 1},
+ {"matrix": [3, 6], "x": 13.75, "y": 1},
+ {"matrix": [2, 6], "x": 14.75, "y": 1},
+ {"matrix": [3, 7], "x": 15.75, "y": 1},
+ {"matrix": [2, 7], "x": 16.75, "y": 1},
+ {"matrix": [3, 8], "x": 17.75, "y": 1},
+ {"matrix": [2, 8], "x": 18.75, "y": 1, "w": 1.5},
+ {"matrix": [4, 0], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [4, 1], "x": 3, "y": 2},
+ {"matrix": [5, 2], "x": 5.25, "y": 2, "w": 1.75},
+ {"matrix": [4, 2], "x": 7, "y": 2},
+ {"matrix": [5, 3], "x": 8, "y": 2},
+ {"matrix": [4, 3], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [4, 4], "x": 11, "y": 2},
+ {"matrix": [5, 5], "x": 12, "y": 2},
+ {"matrix": [4, 5], "x": 13, "y": 2},
+ {"matrix": [5, 6], "x": 14, "y": 2},
+ {"matrix": [4, 6], "x": 15, "y": 2},
+ {"matrix": [5, 7], "x": 16, "y": 2},
+ {"matrix": [4, 7], "x": 17, "y": 2},
+ {"matrix": [4, 8], "x": 18, "y": 2, "w": 2.25},
+ {"matrix": [7, 0], "x": 0, "y": 3, "h": 2},
+ {"matrix": [6, 0], "x": 1, "y": 3},
+ {"matrix": [7, 1], "x": 2, "y": 3},
+ {"matrix": [6, 1], "x": 3, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3, "w": 2.25},
+ {"matrix": [7, 3], "x": 7.5, "y": 3},
+ {"matrix": [6, 3], "x": 8.5, "y": 3},
+ {"matrix": [7, 4], "x": 9.5, "y": 3},
+ {"matrix": [6, 4], "x": 10.5, "y": 3},
+ {"matrix": [7, 5], "x": 11.5, "y": 3},
+ {"matrix": [6, 5], "x": 12.5, "y": 3},
+ {"matrix": [7, 6], "x": 13.5, "y": 3},
+ {"matrix": [6, 6], "x": 14.5, "y": 3},
+ {"matrix": [7, 7], "x": 15.5, "y": 3},
+ {"matrix": [6, 7], "x": 16.5, "y": 3},
+ {"matrix": [6, 8], "x": 17.5, "y": 3, "w": 2.75},
+ {"matrix": [8, 0], "x": 1, "y": 4},
+ {"matrix": [8, 1], "x": 2, "y": 4, "w": 2},
+ {"matrix": [8, 2], "x": 5.25, "y": 4, "w": 1.25},
+ {"matrix": [6, 2], "x": 6.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 4], "x": 9, "y": 4, "w": 6.25},
+ {"matrix": [8, 5], "x": 15.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 16.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 17.75, "y": 4, "w": 1.25},
+ {"matrix": [7, 8], "x": 19, "y": 4, "w": 1.25},
+ {"matrix": [8, 8], "x": 21.5, "y": 4}
+ ]
+ }
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B7", "pin_b": "D5"}
+ ]
+ }
+}
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
deleted file mode 100644
index 76e55c05f4..0000000000
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h
deleted file mode 100644
index 3cf449a32b..0000000000
--- a/keyboards/arisu/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Fate
-
-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/arisu/keyboard.json b/keyboards/arisu/keyboard.json
index af1cb819dc..43bb668b99 100644
--- a/keyboards/arisu/keyboard.json
+++ b/keyboards/arisu/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h
deleted file mode 100644
index 75e72d0e22..0000000000
--- a/keyboards/ash1800/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 angelbirth
-
-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/ash1800/keyboard.json b/keyboards/ash1800/keyboard.json
index 9e60de6b34..c2244a7ad7 100644
--- a/keyboards/ash1800/keyboard.json
+++ b/keyboards/ash1800/keyboard.json
@@ -21,6 +21,12 @@
"mousekey": false,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
"rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h
deleted file mode 100644
index 08dd2458c8..0000000000
--- a/keyboards/ash_xiix/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 sh_xguitar
-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
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ash_xiix/keyboard.json b/keyboards/ash_xiix/keyboard.json
index d1e32efec1..5cb21b488e 100644
--- a/keyboards/ash_xiix/keyboard.json
+++ b/keyboards/ash_xiix/keyboard.json
@@ -22,6 +22,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
"rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
diff --git a/keyboards/ask55/config.h b/keyboards/ask55/config.h
deleted file mode 100644
index f16fa8823e..0000000000
--- a/keyboards/ask55/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2022 Yiancar / Keyboard-Magpie
-
-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/ask55/keyboard.json b/keyboards/ask55/keyboard.json
index d47d79612d..66efb1749a 100644
--- a/keyboards/ask55/keyboard.json
+++ b/keyboards/ask55/keyboard.json
@@ -13,6 +13,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["E6", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
"rows": ["B0", "B1", "D1", "F6", "F5"]
diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h
index 70ad2757b9..ff79c3f7f8 100644
--- a/keyboards/at_at/660m/config.h
+++ b/keyboards/at_at/660m/config.h
@@ -23,12 +23,6 @@ along with this program. If not, see .
/* LSE clock */
#define STM32_LSECLK 32768
-/* 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/at_at/660m/info.json b/keyboards/at_at/660m/info.json
deleted file mode 100644
index 97f38080dc..0000000000
--- a/keyboards/at_at/660m/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
- "keyboard_name": "660M",
- "manufacturer": "AT-AT",
- "url": "",
- "maintainer": "adrientetar",
- "usb": {
- "vid": "0xA22A",
- "pid": "0x6600",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B9", "B8", "B7", "B6", "B5", "B3", "B4", "B0"],
- "rows": ["A3", "A4", "A5", "A0", "A1"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F072",
- "bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 15], "x": 15.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 15], "x": 15.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
- {"matrix": [3, 14], "x": 14.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.5, "y": 4},
- {"matrix": [4, 14], "x": 14.5, "y": 4},
- {"matrix": [4, 15], "x": 15.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/at_at/660m/keyboard.json b/keyboards/at_at/660m/keyboard.json
new file mode 100644
index 0000000000..a9c5af73f8
--- /dev/null
+++ b/keyboards/at_at/660m/keyboard.json
@@ -0,0 +1,111 @@
+{
+ "keyboard_name": "660M",
+ "manufacturer": "AT-AT",
+ "url": "",
+ "maintainer": "adrientetar",
+ "usb": {
+ "vid": "0xA22A",
+ "pid": "0x6600",
+ "device_version": "0.0.1",
+ "no_startup_check": true
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B9", "B8", "B7", "B6", "B5", "B3", "B4", "B0"],
+ "rows": ["A3", "A4", "A5", "A0", "A1"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 15], "x": 15.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 14.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4},
+ {"matrix": [4, 14], "x": 14.5, "y": 4},
+ {"matrix": [4, 15], "x": 15.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/at_at/660m/rules.mk b/keyboards/at_at/660m/rules.mk
deleted file mode 100644
index e984f8dc96..0000000000
--- a/keyboards/at_at/660m/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes
-# RGBLIGHT_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes # Workaround for issue 6369
-
-
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 374119935e..ab111a5ec5 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -16,10 +16,4 @@
#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
-
#define RGB_MATRIX_LED_COUNT 96
diff --git a/keyboards/atlantis/ak81_ve/keyboard.json b/keyboards/atlantis/ak81_ve/keyboard.json
index 6b61864644..a2d064295c 100644
--- a/keyboards/atlantis/ak81_ve/keyboard.json
+++ b/keyboards/atlantis/ak81_ve/keyboard.json
@@ -74,6 +74,12 @@
"nkro": true,
"rgb_matrix": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"],
"rows": ["F1", "F7", "F6", "F5", "F4", "D5"]
diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/info.json
deleted file mode 100644
index ac8f979d39..0000000000
--- a/keyboards/atlantis/ps17/info.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "manufacturer": "Atlantis",
- "keyboard_name": "PS17",
- "maintainer": "mjbogusz",
- "url": "https://qmk.fm/keyboards/",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "bootloader_instructions": "To reset the board into bootloader mode, tap the Reset switch mounted on the bottom of the PCB.",
- "usb": {
- "device_version": "1.0.0",
- "pid": "0x414B",
- "vid": "0x0015"
- },
- "features": {
- "bootmagic": false,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true,
- "encoder": true,
- "rgb_matrix": true
- },
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["F6", "F7", "D3", "D6"],
- "rows": ["F0", "B4", "B5", "B6", "C6", "C7", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"]
- },
- "ws2812": {
- "pin": "B7"
- },
- "encoder": {
- "rotary": [
- {"pin_a": "D2", "pin_b": "D1"}
- ]
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 1], "x": 0, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.5},
- {"matrix": [2, 1], "x": 1, "y": 2.5},
- {"matrix": [2, 2], "x": 2, "y": 2.5},
- {"matrix": [2, 3], "x": 3, "y": 2.5, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5},
- {"matrix": [3, 1], "x": 1, "y": 3.5},
- {"matrix": [3, 2], "x": 2, "y": 3.5},
-
- {"matrix": [4, 0], "x": 0, "y": 4.5},
- {"matrix": [4, 1], "x": 1, "y": 4.5},
- {"matrix": [4, 2], "x": 2, "y": 4.5},
- {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2},
-
- {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2},
- {"matrix": [5, 2], "x": 2, "y": 5.5}
- ]
- }
- },
- "rgb_matrix": {
- "animations": {
- "cycle_all": true,
- "cycle_pinwheel": true,
- "rainbow_beacon": true,
- "pixel_rain": true
- },
- "driver": "ws2812",
- "center_point": [126, 126],
- "layout": [
- {"flags": 4, "matrix": [1, 0], "x": 74, "y": 165},
- {"flags": 4, "matrix": [1, 1], "x": 108, "y": 165},
- {"flags": 4, "matrix": [1, 2], "x": 144, "y": 165},
- {"flags": 4, "matrix": [1, 3], "x": 179, "y": 165},
- {"flags": 4, "matrix": [2, 0], "x": 74, "y": 129},
- {"flags": 4, "matrix": [2, 1], "x": 109, "y": 129},
- {"flags": 4, "matrix": [2, 2], "x": 143, "y": 129},
- {"flags": 4, "matrix": [2, 3], "x": 188, "y": 121},
- {"flags": 4, "matrix": [3, 0], "x": 74, "y": 95},
- {"flags": 4, "matrix": [3, 1], "x": 109, "y": 95},
- {"flags": 4, "matrix": [3, 2], "x": 143, "y": 95},
- {"flags": 4, "matrix": [4, 0], "x": 73, "y": 60},
- {"flags": 4, "matrix": [4, 1], "x": 109, "y": 60},
- {"flags": 4, "matrix": [4, 2], "x": 144, "y": 60},
- {"flags": 4, "matrix": [4, 3], "x": 188, "y": 51},
- {"flags": 4, "matrix": [5, 0], "x": 91, "y": 25},
- {"flags": 4, "matrix": [5, 2], "x": 144, "y": 25},
-
- {"flags": 2, "x": 61, "y": 26},
- {"flags": 2, "x": 61, "y": 88},
- {"flags": 2, "x": 61, "y": 158},
- {"flags": 2, "x": 61, "y": 197},
- {"flags": 2, "x": 61, "y": 232},
- {"flags": 2, "x": 192, "y": 232},
- {"flags": 2, "x": 192, "y": 196},
- {"flags": 2, "x": 192, "y": 158},
- {"flags": 2, "x": 192, "y": 87},
- {"flags": 2, "x": 183, "y": 26},
- {"flags": 2, "x": 127, "y": 24}
- ],
- "sleep": true
- }
-}
diff --git a/keyboards/atlantis/ps17/keyboard.json b/keyboards/atlantis/ps17/keyboard.json
new file mode 100644
index 0000000000..ee7255c8fa
--- /dev/null
+++ b/keyboards/atlantis/ps17/keyboard.json
@@ -0,0 +1,111 @@
+{
+ "manufacturer": "Atlantis",
+ "keyboard_name": "PS17",
+ "maintainer": "mjbogusz",
+ "url": "https://qmk.fm/keyboards/",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "bootloader_instructions": "To reset the board into bootloader mode, tap the Reset switch mounted on the bottom of the PCB.",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x414B",
+ "vid": "0x0015"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "encoder": true,
+ "rgb_matrix": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["F6", "F7", "D3", "D6"],
+ "rows": ["F0", "B4", "B5", "B6", "C6", "C7", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"]
+ },
+ "ws2812": {
+ "pin": "B7"
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "D1"}
+ ]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 1], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2.5, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+ {"matrix": [4, 1], "x": 1, "y": 4.5},
+ {"matrix": [4, 2], "x": 2, "y": 4.5},
+ {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5.5}
+ ]
+ }
+ },
+ "rgb_matrix": {
+ "animations": {
+ "cycle_all": true,
+ "cycle_pinwheel": true,
+ "rainbow_beacon": true,
+ "pixel_rain": true
+ },
+ "driver": "ws2812",
+ "center_point": [126, 126],
+ "layout": [
+ {"flags": 4, "matrix": [1, 0], "x": 74, "y": 165},
+ {"flags": 4, "matrix": [1, 1], "x": 108, "y": 165},
+ {"flags": 4, "matrix": [1, 2], "x": 144, "y": 165},
+ {"flags": 4, "matrix": [1, 3], "x": 179, "y": 165},
+ {"flags": 4, "matrix": [2, 0], "x": 74, "y": 129},
+ {"flags": 4, "matrix": [2, 1], "x": 109, "y": 129},
+ {"flags": 4, "matrix": [2, 2], "x": 143, "y": 129},
+ {"flags": 4, "matrix": [2, 3], "x": 188, "y": 121},
+ {"flags": 4, "matrix": [3, 0], "x": 74, "y": 95},
+ {"flags": 4, "matrix": [3, 1], "x": 109, "y": 95},
+ {"flags": 4, "matrix": [3, 2], "x": 143, "y": 95},
+ {"flags": 4, "matrix": [4, 0], "x": 73, "y": 60},
+ {"flags": 4, "matrix": [4, 1], "x": 109, "y": 60},
+ {"flags": 4, "matrix": [4, 2], "x": 144, "y": 60},
+ {"flags": 4, "matrix": [4, 3], "x": 188, "y": 51},
+ {"flags": 4, "matrix": [5, 0], "x": 91, "y": 25},
+ {"flags": 4, "matrix": [5, 2], "x": 144, "y": 25},
+
+ {"flags": 2, "x": 61, "y": 26},
+ {"flags": 2, "x": 61, "y": 88},
+ {"flags": 2, "x": 61, "y": 158},
+ {"flags": 2, "x": 61, "y": 197},
+ {"flags": 2, "x": 61, "y": 232},
+ {"flags": 2, "x": 192, "y": 232},
+ {"flags": 2, "x": 192, "y": 196},
+ {"flags": 2, "x": 192, "y": 158},
+ {"flags": 2, "x": 192, "y": 87},
+ {"flags": 2, "x": 183, "y": 26},
+ {"flags": 2, "x": 127, "y": 24}
+ ],
+ "sleep": true
+ }
+}
diff --git a/keyboards/atlantis/ps17/rules.mk b/keyboards/atlantis/ps17/rules.mk
deleted file mode 100644
index 4da205a168..0000000000
--- a/keyboards/atlantis/ps17/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h
deleted file mode 100644
index d0851ac1fd..0000000000
--- a/keyboards/atlas_65/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 Joshua Nguyen
-
-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/atlas_65/keyboard.json b/keyboards/atlas_65/keyboard.json
index 896ecf6f20..4e8db96d3a 100644
--- a/keyboards/atlas_65/keyboard.json
+++ b/keyboards/atlas_65/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h
deleted file mode 100644
index b9449c4714..0000000000
--- a/keyboards/atomic/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/atomic/keyboard.json b/keyboards/atomic/keyboard.json
index cb4bddceae..5a269316cf 100644
--- a/keyboards/atomic/keyboard.json
+++ b/keyboards/atomic/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "D3", "D2", "D1"],
"rows": ["D0", "D5", "B5", "B6", "C6"]
diff --git a/keyboards/atreus/f103/info.json b/keyboards/atreus/f103/info.json
deleted file mode 100644
index 341ed4e8e6..0000000000
--- a/keyboards/atreus/f103/info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B10", "B1", "B0", "A7", "A6", "B5", "B4", "B3", "A15", "A10", "A9"],
- "rows": ["A5", "A4", "A3", "A2"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F103",
- "bootloader": "stm32duino"
-}
diff --git a/keyboards/atreus/f103/keyboard.json b/keyboards/atreus/f103/keyboard.json
new file mode 100644
index 0000000000..813ef97e37
--- /dev/null
+++ b/keyboards/atreus/f103/keyboard.json
@@ -0,0 +1,12 @@
+{
+ "matrix_pins": {
+ "cols": ["B10", "B1", "B0", "A7", "A6", "B5", "B4", "B3", "A15", "A10", "A9"],
+ "rows": ["A5", "A4", "A3", "A2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "features": {
+ "bootmagic": true
+ }
+}
diff --git a/keyboards/atreus/f103/rules.mk b/keyboards/atreus/f103/rules.mk
deleted file mode 100644
index 22634018d2..0000000000
--- a/keyboards/atreus/f103/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-BOOTMAGIC_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json
index b0d7d55443..19e9654f12 100644
--- a/keyboards/atreus/feather/info.json
+++ b/keyboards/atreus/feather/info.json
@@ -6,6 +6,10 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bluetooth": true,
+ "console": false
+ },
"bluetooth": {
"driver": "bluefruit_le"
}
diff --git a/keyboards/atreus/feather/rules.mk b/keyboards/atreus/feather/rules.mk
index c93cad9080..3437a35bdf 100644
--- a/keyboards/atreus/feather/rules.mk
+++ b/keyboards/atreus/feather/rules.mk
@@ -1,8 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# Build Options
-# change yes to no to disable
-#
-BLUETOOTH_ENABLE = yes
-CONSOLE_ENABLE = no
diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h
deleted file mode 100644
index 9b7700e013..0000000000
--- a/keyboards/atreus62/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/atreus62/keyboard.json b/keyboards/atreus62/keyboard.json
index 5263e799df..c24c02e71e 100644
--- a/keyboards/atreus62/keyboard.json
+++ b/keyboards/atreus62/keyboard.json
@@ -17,6 +17,12 @@
"nkro": false,
"unicode": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6"],
"rows": ["D2", "D3", "D1", "D0", "D4"]
diff --git a/keyboards/atreyu/info.json b/keyboards/atreyu/info.json
new file mode 100644
index 0000000000..26caa20330
--- /dev/null
+++ b/keyboards/atreyu/info.json
@@ -0,0 +1,8 @@
+{
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ }
+}
diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h
deleted file mode 100644
index d7c434426b..0000000000
--- a/keyboards/atreyu/rev1/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 Jesus Climent (@climent)
- *
- * 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/atreyu/rev1/keyboard.json b/keyboards/atreyu/rev1/keyboard.json
index 8a38baabf8..dc632a74a7 100644
--- a/keyboards/atreyu/rev1/keyboard.json
+++ b/keyboards/atreyu/rev1/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C6", "D4", "D0", "D1", "D2", "D3"],
"rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"]
diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h
deleted file mode 100644
index d7c434426b..0000000000
--- a/keyboards/atreyu/rev2/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 Jesus Climent (@climent)
- *
- * 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/atreyu/rev2/keyboard.json b/keyboards/atreyu/rev2/keyboard.json
index 6fcfd64d1f..19dc8761c4 100644
--- a/keyboards/atreyu/rev2/keyboard.json
+++ b/keyboards/atreyu/rev2/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0001",
"device_version": "0.0.2"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "C6", "D4", "D2", "D3"],
"rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"]
diff --git a/keyboards/atreyu/rules.mk b/keyboards/atreyu/rules.mk
index 23ebd8ba33..4daffe6b9d 100644
--- a/keyboards/atreyu/rules.mk
+++ b/keyboards/atreyu/rules.mk
@@ -1,16 +1 @@
DEFAULT_FOLDER = atreyu/rev1
-
-# 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
-
-ENCODER_ENABLE = no
diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h
deleted file mode 100644
index dc6abdcaf2..0000000000
--- a/keyboards/atset/at1/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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/atset/at1/keyboard.json b/keyboards/atset/at1/keyboard.json
index e8fa5f8b5f..4c4806c40b 100644
--- a/keyboards/atset/at1/keyboard.json
+++ b/keyboards/atset/at1/keyboard.json
@@ -15,6 +15,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B6"],
"rows": ["D2"]
diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h
deleted file mode 100644
index dc6abdcaf2..0000000000
--- a/keyboards/atset/at12/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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/atset/at12/keyboard.json b/keyboards/atset/at12/keyboard.json
index c15ff3f46e..8c7a3d4ea9 100644
--- a/keyboards/atset/at12/keyboard.json
+++ b/keyboards/atset/at12/keyboard.json
@@ -15,6 +15,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B6", "B5", "B4"],
"rows": ["D3", "D2", "D1", "D0"]
diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h
deleted file mode 100644
index dc6abdcaf2..0000000000
--- a/keyboards/atset/at16/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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/atset/at16/keyboard.json b/keyboards/atset/at16/keyboard.json
index 0db5ad692c..2c03c2295f 100644
--- a/keyboards/atset/at16/keyboard.json
+++ b/keyboards/atset/at16/keyboard.json
@@ -15,6 +15,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B6", "B5", "B4", "B2"],
"rows": ["D3", "D2", "D1", "D0"]
diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h
deleted file mode 100644
index dc6abdcaf2..0000000000
--- a/keyboards/atset/at3/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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/atset/at3/keyboard.json b/keyboards/atset/at3/keyboard.json
index 171faf984a..e6d1d97bf0 100644
--- a/keyboards/atset/at3/keyboard.json
+++ b/keyboards/atset/at3/keyboard.json
@@ -15,6 +15,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B6", "B5", "B4"],
"rows": ["D2"]
diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h
deleted file mode 100644
index dc6abdcaf2..0000000000
--- a/keyboards/atset/at6/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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/atset/at6/keyboard.json b/keyboards/atset/at6/keyboard.json
index c24611f8b7..8cf2d9e9e0 100644
--- a/keyboards/atset/at6/keyboard.json
+++ b/keyboards/atset/at6/keyboard.json
@@ -15,6 +15,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B6", "B5", "B4"],
"rows": ["D2", "D1"]
diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h
deleted file mode 100644
index dc6abdcaf2..0000000000
--- a/keyboards/atset/at9/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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/atset/at9/keyboard.json b/keyboards/atset/at9/keyboard.json
index 35bdf95550..c531397f3a 100644
--- a/keyboards/atset/at9/keyboard.json
+++ b/keyboards/atset/at9/keyboard.json
@@ -15,6 +15,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B6", "B5", "B4"],
"rows": ["D2", "D1", "D0"]
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
deleted file mode 100644
index 50001e978c..0000000000
--- a/keyboards/atxkb/1894/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-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/atxkb/1894/keyboard.json b/keyboards/atxkb/1894/keyboard.json
index 0ea4918bf3..5abaf88eb0 100644
--- a/keyboards/atxkb/1894/keyboard.json
+++ b/keyboards/atxkb/1894/keyboard.json
@@ -21,6 +21,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
"rows": ["B1", "B2", "B3", "F0", "F1"]
diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json
index 9311e0f808..1c0dd684cb 100644
--- a/keyboards/aurora65/info.json
+++ b/keyboards/aurora65/info.json
@@ -8,6 +8,13 @@
"pid": "0x4136",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/aurora65/rules.mk b/keyboards/aurora65/rules.mk
index cc9d7bb3f5..0ab54aaaf7 100644
--- a/keyboards/aurora65/rules.mk
+++ b/keyboards/aurora65/rules.mk
@@ -1,15 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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
diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json
deleted file mode 100644
index 7787ae2a95..0000000000
--- a/keyboards/avalanche/v1/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
- "keyboard_name": "Avalanche",
- "manufacturer": "vitvlkv",
- "url": "https://github.com/vlkv/avalanche",
- "maintainer": "vlkv",
- "usb": {
- "vid": "0xCEE2",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 1], "x": 1, "y": 0.75},
- {"matrix": [0, 2], "x": 2, "y": 0.75},
- {"matrix": [0, 3], "x": 3, "y": 0.25},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
- {"matrix": [0, 6], "x": 6, "y": 0.35},
-
- {"matrix": [5, 6], "x": 10, "y": 0.35},
- {"matrix": [5, 5], "x": 11, "y": 0.25},
- {"matrix": [5, 4], "x": 12, "y": 0},
- {"matrix": [5, 3], "x": 13, "y": 0.25},
- {"matrix": [5, 2], "x": 14, "y": 0.75},
- {"matrix": [5, 1], "x": 15, "y": 0.75},
-
- {"matrix": [1, 1], "x": 1, "y": 1.75},
- {"matrix": [1, 2], "x": 2, "y": 1.75},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.35},
-
- {"matrix": [6, 6], "x": 10, "y": 1.35},
- {"matrix": [6, 5], "x": 11, "y": 1.25},
- {"matrix": [6, 4], "x": 12, "y": 1},
- {"matrix": [6, 3], "x": 13, "y": 1.25},
- {"matrix": [6, 2], "x": 14, "y": 1.75},
- {"matrix": [6, 1], "x": 15, "y": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2.85},
- {"matrix": [2, 1], "x": 1, "y": 2.75},
- {"matrix": [2, 2], "x": 2, "y": 2.75},
- {"matrix": [2, 3], "x": 3, "y": 2.25},
- {"matrix": [2, 4], "x": 4, "y": 2},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
- {"matrix": [2, 6], "x": 6, "y": 2.35},
- {"matrix": [2, 7], "x": 7, "y": 2.6},
-
- {"matrix": [7, 7], "x": 9, "y": 2.6},
- {"matrix": [7, 6], "x": 10, "y": 2.35},
- {"matrix": [7, 5], "x": 11, "y": 2.25},
- {"matrix": [7, 4], "x": 12, "y": 2},
- {"matrix": [7, 3], "x": 13, "y": 2.25},
- {"matrix": [7, 2], "x": 14, "y": 2.75},
- {"matrix": [7, 1], "x": 15, "y": 2.75},
- {"matrix": [7, 0], "x": 16, "y": 2.85},
-
- {"matrix": [3, 1], "x": 1, "y": 3.75},
- {"matrix": [3, 2], "x": 2, "y": 3.75},
- {"matrix": [3, 3], "x": 3, "y": 3.25},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3.25},
- {"matrix": [3, 6], "x": 6, "y": 3.35},
- {"matrix": [3, 7], "x": 7, "y": 3.7},
-
- {"matrix": [8, 7], "x": 9, "y": 3.7},
- {"matrix": [8, 6], "x": 10, "y": 3.35},
- {"matrix": [8, 5], "x": 11, "y": 3.25},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 3], "x": 13, "y": 3.25},
- {"matrix": [8, 2], "x": 14, "y": 3.75},
- {"matrix": [8, 1], "x": 15, "y": 3.75},
-
- {"matrix": [4, 4], "x": 3.5, "y": 4.45, "w": 1.25},
- {"matrix": [4, 5], "x": 4.75, "y": 4.4, "w": 1.25},
- {"matrix": [4, 6], "x": 6, "y": 4.45},
- {"matrix": [4, 7], "x": 7, "y": 4.8},
-
- {"matrix": [9, 7], "x": 9, "y": 4.8},
- {"matrix": [9, 6], "x": 10, "y": 4.45},
- {"matrix": [9, 5], "x": 11, "y": 4.4, "w": 1.25},
- {"matrix": [9, 4], "x": 12.25, "y": 4.45, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/avalanche/v1/keyboard.json b/keyboards/avalanche/v1/keyboard.json
new file mode 100644
index 0000000000..97acaf0d9f
--- /dev/null
+++ b/keyboards/avalanche/v1/keyboard.json
@@ -0,0 +1,105 @@
+{
+ "keyboard_name": "Avalanche",
+ "manufacturer": "vitvlkv",
+ "url": "https://github.com/vlkv/avalanche",
+ "maintainer": "vlkv",
+ "usb": {
+ "vid": "0xCEE2",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 1], "x": 1, "y": 0.75},
+ {"matrix": [0, 2], "x": 2, "y": 0.75},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.35},
+
+ {"matrix": [5, 6], "x": 10, "y": 0.35},
+ {"matrix": [5, 5], "x": 11, "y": 0.25},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0.25},
+ {"matrix": [5, 2], "x": 14, "y": 0.75},
+ {"matrix": [5, 1], "x": 15, "y": 0.75},
+
+ {"matrix": [1, 1], "x": 1, "y": 1.75},
+ {"matrix": [1, 2], "x": 2, "y": 1.75},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.35},
+
+ {"matrix": [6, 6], "x": 10, "y": 1.35},
+ {"matrix": [6, 5], "x": 11, "y": 1.25},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1.25},
+ {"matrix": [6, 2], "x": 14, "y": 1.75},
+ {"matrix": [6, 1], "x": 15, "y": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.85},
+ {"matrix": [2, 1], "x": 1, "y": 2.75},
+ {"matrix": [2, 2], "x": 2, "y": 2.75},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.35},
+ {"matrix": [2, 7], "x": 7, "y": 2.6},
+
+ {"matrix": [7, 7], "x": 9, "y": 2.6},
+ {"matrix": [7, 6], "x": 10, "y": 2.35},
+ {"matrix": [7, 5], "x": 11, "y": 2.25},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2.25},
+ {"matrix": [7, 2], "x": 14, "y": 2.75},
+ {"matrix": [7, 1], "x": 15, "y": 2.75},
+ {"matrix": [7, 0], "x": 16, "y": 2.85},
+
+ {"matrix": [3, 1], "x": 1, "y": 3.75},
+ {"matrix": [3, 2], "x": 2, "y": 3.75},
+ {"matrix": [3, 3], "x": 3, "y": 3.25},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 3.35},
+ {"matrix": [3, 7], "x": 7, "y": 3.7},
+
+ {"matrix": [8, 7], "x": 9, "y": 3.7},
+ {"matrix": [8, 6], "x": 10, "y": 3.35},
+ {"matrix": [8, 5], "x": 11, "y": 3.25},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3.25},
+ {"matrix": [8, 2], "x": 14, "y": 3.75},
+ {"matrix": [8, 1], "x": 15, "y": 3.75},
+
+ {"matrix": [4, 4], "x": 3.5, "y": 4.45, "w": 1.25},
+ {"matrix": [4, 5], "x": 4.75, "y": 4.4, "w": 1.25},
+ {"matrix": [4, 6], "x": 6, "y": 4.45},
+ {"matrix": [4, 7], "x": 7, "y": 4.8},
+
+ {"matrix": [9, 7], "x": 9, "y": 4.8},
+ {"matrix": [9, 6], "x": 10, "y": 4.45},
+ {"matrix": [9, 5], "x": 11, "y": 4.4, "w": 1.25},
+ {"matrix": [9, 4], "x": 12.25, "y": 4.45, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/avalanche/v1/rules.mk b/keyboards/avalanche/v1/rules.mk
deleted file mode 100644
index ef90e04bc1..0000000000
--- a/keyboards/avalanche/v1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
deleted file mode 100644
index 62c284a845..0000000000
--- a/keyboards/avalanche/v2/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
- "keyboard_name": "Avalanche",
- "manufacturer": "vitvlkv",
- "url": "https://github.com/vlkv/avalanche",
- "maintainer": "vlkv",
- "usb": {
- "vid": "0xCEE2",
- "pid": "0x0002",
- "device_version": "0.0.2"
- },
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
- ]
- },
- "rgblight": {
- "led_count": 12,
- "split_count": [6, 6]
- },
- "ws2812": {
- "pin": "D3"
- },
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label": "L00", "matrix": [0, 0], "x": 1, "y": 0.75},
- {"label": "L01", "matrix": [0, 1], "x": 2, "y": 0.75},
- {"label": "L02", "matrix": [0, 2], "x": 3, "y": 0.25},
- {"label": "L03", "matrix": [0, 3], "x": 4, "y": 0},
- {"label": "L04", "matrix": [0, 4], "x": 5, "y": 0.25},
- {"label": "L05", "matrix": [0, 5], "x": 6, "y": 0.35},
-
- {"label": "R05", "matrix": [5, 5], "x": 10, "y": 0.35},
- {"label": "R04", "matrix": [5, 4], "x": 11, "y": 0.25},
- {"label": "R03", "matrix": [5, 3], "x": 12, "y": 0},
- {"label": "R02", "matrix": [5, 2], "x": 13, "y": 0.25},
- {"label": "R01", "matrix": [5, 1], "x": 14, "y": 0.75},
- {"label": "R00", "matrix": [5, 0], "x": 15, "y": 0.75},
-
- {"label": "L10", "matrix": [1, 0], "x": 1, "y": 1.75},
- {"label": "L11", "matrix": [1, 1], "x": 2, "y": 1.75},
- {"label": "L12", "matrix": [1, 2], "x": 3, "y": 1.25},
- {"label": "L13", "matrix": [1, 3], "x": 4, "y": 1},
- {"label": "L14", "matrix": [1, 4], "x": 5, "y": 1.25},
- {"label": "L15", "matrix": [1, 5], "x": 6, "y": 1.35},
-
- {"label": "R15", "matrix": [6, 5], "x": 10, "y": 1.35},
- {"label": "R14", "matrix": [6, 4], "x": 11, "y": 1.25},
- {"label": "R13", "matrix": [6, 3], "x": 12, "y": 1},
- {"label": "R12", "matrix": [6, 2], "x": 13, "y": 1.25},
- {"label": "R11", "matrix": [6, 1], "x": 14, "y": 1.75},
- {"label": "R10", "matrix": [6, 0], "x": 15, "y": 1.75},
-
- {"label": "L40", "matrix": [4, 0], "x": 0, "y": 2.85},
- {"label": "L20", "matrix": [2, 0], "x": 1, "y": 2.75},
- {"label": "L21", "matrix": [2, 1], "x": 2, "y": 2.75},
- {"label": "L22", "matrix": [2, 2], "x": 3, "y": 2.25},
- {"label": "L23", "matrix": [2, 3], "x": 4, "y": 2},
- {"label": "L24", "matrix": [2, 4], "x": 5, "y": 2.25},
- {"label": "L25", "matrix": [2, 5], "x": 6, "y": 2.35},
- {"label": "L26", "matrix": [2, 6], "x": 7, "y": 2.6},
-
- {"label": "R26", "matrix": [7, 6], "x": 9, "y": 2.6},
- {"label": "R25", "matrix": [7, 5], "x": 10, "y": 2.35},
- {"label": "R24", "matrix": [7, 4], "x": 11, "y": 2.25},
- {"label": "R23", "matrix": [7, 3], "x": 12, "y": 2},
- {"label": "R22", "matrix": [7, 2], "x": 13, "y": 2.25},
- {"label": "R21", "matrix": [7, 1], "x": 14, "y": 2.75},
- {"label": "R20", "matrix": [7, 0], "x": 15, "y": 2.75},
- {"label": "R40", "matrix": [9, 0], "x": 16, "y": 2.85},
-
- {"label": "L30", "matrix": [3, 0], "x": 1, "y": 3.75},
- {"label": "L31", "matrix": [3, 1], "x": 2, "y": 3.75},
- {"label": "L32", "matrix": [3, 2], "x": 3, "y": 3.25},
- {"label": "L33", "matrix": [3, 3], "x": 4, "y": 3},
- {"label": "L34", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "L35", "matrix": [3, 5], "x": 6, "y": 3.35},
- {"label": "L36", "matrix": [3, 6], "x": 7, "y": 3.7},
-
- {"label": "R36", "matrix": [8, 6], "x": 9, "y": 3.7},
- {"label": "R35", "matrix": [8, 5], "x": 10, "y": 3.35},
- {"label": "R34", "matrix": [8, 4], "x": 11, "y": 3.25},
- {"label": "R33", "matrix": [8, 3], "x": 12, "y": 3},
- {"label": "R32", "matrix": [8, 2], "x": 13, "y": 3.25},
- {"label": "R31", "matrix": [8, 1], "x": 14, "y": 3.75},
- {"label": "R30", "matrix": [8, 0], "x": 15, "y": 3.75},
-
- {"label": "L42", "matrix": [4, 2], "x": 3, "y": 4.55},
- {"label": "L43", "matrix": [4, 3], "x": 4, "y": 4.45},
- {"label": "L44", "matrix": [4, 4], "x": 5, "y": 4.4},
- {"label": "L45", "matrix": [4, 5], "x": 6, "y": 4.45},
- {"label": "L46", "matrix": [4, 6], "x": 7, "y": 4.8},
-
- {"label": "R46", "matrix": [9, 6], "x": 9, "y": 4.8},
- {"label": "R45", "matrix": [9, 5], "x": 10, "y": 4.45},
- {"label": "R44", "matrix": [9, 4], "x": 11, "y": 4.4},
- {"label": "R43", "matrix": [9, 3], "x": 12, "y": 4.45},
- {"label": "R42", "matrix": [9, 2], "x": 13, "y": 4.55}
- ]
- }
- }
-}
diff --git a/keyboards/avalanche/v2/keyboard.json b/keyboards/avalanche/v2/keyboard.json
new file mode 100644
index 0000000000..219e5bb6c6
--- /dev/null
+++ b/keyboards/avalanche/v2/keyboard.json
@@ -0,0 +1,121 @@
+{
+ "keyboard_name": "Avalanche",
+ "manufacturer": "vitvlkv",
+ "url": "https://github.com/vlkv/avalanche",
+ "maintainer": "vlkv",
+ "usb": {
+ "vid": "0xCEE2",
+ "pid": "0x0002",
+ "device_version": "0.0.2"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "encoder": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
+ ]
+ },
+ "rgblight": {
+ "led_count": 12,
+ "split_count": [6, 6]
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "L00", "matrix": [0, 0], "x": 1, "y": 0.75},
+ {"label": "L01", "matrix": [0, 1], "x": 2, "y": 0.75},
+ {"label": "L02", "matrix": [0, 2], "x": 3, "y": 0.25},
+ {"label": "L03", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "L04", "matrix": [0, 4], "x": 5, "y": 0.25},
+ {"label": "L05", "matrix": [0, 5], "x": 6, "y": 0.35},
+
+ {"label": "R05", "matrix": [5, 5], "x": 10, "y": 0.35},
+ {"label": "R04", "matrix": [5, 4], "x": 11, "y": 0.25},
+ {"label": "R03", "matrix": [5, 3], "x": 12, "y": 0},
+ {"label": "R02", "matrix": [5, 2], "x": 13, "y": 0.25},
+ {"label": "R01", "matrix": [5, 1], "x": 14, "y": 0.75},
+ {"label": "R00", "matrix": [5, 0], "x": 15, "y": 0.75},
+
+ {"label": "L10", "matrix": [1, 0], "x": 1, "y": 1.75},
+ {"label": "L11", "matrix": [1, 1], "x": 2, "y": 1.75},
+ {"label": "L12", "matrix": [1, 2], "x": 3, "y": 1.25},
+ {"label": "L13", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "L14", "matrix": [1, 4], "x": 5, "y": 1.25},
+ {"label": "L15", "matrix": [1, 5], "x": 6, "y": 1.35},
+
+ {"label": "R15", "matrix": [6, 5], "x": 10, "y": 1.35},
+ {"label": "R14", "matrix": [6, 4], "x": 11, "y": 1.25},
+ {"label": "R13", "matrix": [6, 3], "x": 12, "y": 1},
+ {"label": "R12", "matrix": [6, 2], "x": 13, "y": 1.25},
+ {"label": "R11", "matrix": [6, 1], "x": 14, "y": 1.75},
+ {"label": "R10", "matrix": [6, 0], "x": 15, "y": 1.75},
+
+ {"label": "L40", "matrix": [4, 0], "x": 0, "y": 2.85},
+ {"label": "L20", "matrix": [2, 0], "x": 1, "y": 2.75},
+ {"label": "L21", "matrix": [2, 1], "x": 2, "y": 2.75},
+ {"label": "L22", "matrix": [2, 2], "x": 3, "y": 2.25},
+ {"label": "L23", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "L24", "matrix": [2, 4], "x": 5, "y": 2.25},
+ {"label": "L25", "matrix": [2, 5], "x": 6, "y": 2.35},
+ {"label": "L26", "matrix": [2, 6], "x": 7, "y": 2.6},
+
+ {"label": "R26", "matrix": [7, 6], "x": 9, "y": 2.6},
+ {"label": "R25", "matrix": [7, 5], "x": 10, "y": 2.35},
+ {"label": "R24", "matrix": [7, 4], "x": 11, "y": 2.25},
+ {"label": "R23", "matrix": [7, 3], "x": 12, "y": 2},
+ {"label": "R22", "matrix": [7, 2], "x": 13, "y": 2.25},
+ {"label": "R21", "matrix": [7, 1], "x": 14, "y": 2.75},
+ {"label": "R20", "matrix": [7, 0], "x": 15, "y": 2.75},
+ {"label": "R40", "matrix": [9, 0], "x": 16, "y": 2.85},
+
+ {"label": "L30", "matrix": [3, 0], "x": 1, "y": 3.75},
+ {"label": "L31", "matrix": [3, 1], "x": 2, "y": 3.75},
+ {"label": "L32", "matrix": [3, 2], "x": 3, "y": 3.25},
+ {"label": "L33", "matrix": [3, 3], "x": 4, "y": 3},
+ {"label": "L34", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "L35", "matrix": [3, 5], "x": 6, "y": 3.35},
+ {"label": "L36", "matrix": [3, 6], "x": 7, "y": 3.7},
+
+ {"label": "R36", "matrix": [8, 6], "x": 9, "y": 3.7},
+ {"label": "R35", "matrix": [8, 5], "x": 10, "y": 3.35},
+ {"label": "R34", "matrix": [8, 4], "x": 11, "y": 3.25},
+ {"label": "R33", "matrix": [8, 3], "x": 12, "y": 3},
+ {"label": "R32", "matrix": [8, 2], "x": 13, "y": 3.25},
+ {"label": "R31", "matrix": [8, 1], "x": 14, "y": 3.75},
+ {"label": "R30", "matrix": [8, 0], "x": 15, "y": 3.75},
+
+ {"label": "L42", "matrix": [4, 2], "x": 3, "y": 4.55},
+ {"label": "L43", "matrix": [4, 3], "x": 4, "y": 4.45},
+ {"label": "L44", "matrix": [4, 4], "x": 5, "y": 4.4},
+ {"label": "L45", "matrix": [4, 5], "x": 6, "y": 4.45},
+ {"label": "L46", "matrix": [4, 6], "x": 7, "y": 4.8},
+
+ {"label": "R46", "matrix": [9, 6], "x": 9, "y": 4.8},
+ {"label": "R45", "matrix": [9, 5], "x": 10, "y": 4.45},
+ {"label": "R44", "matrix": [9, 4], "x": 11, "y": 4.4},
+ {"label": "R43", "matrix": [9, 3], "x": 12, "y": 4.45},
+ {"label": "R42", "matrix": [9, 2], "x": 13, "y": 4.55}
+ ]
+ }
+ }
+}
diff --git a/keyboards/avalanche/v2/rules.mk b/keyboards/avalanche/v2/rules.mk
deleted file mode 100644
index 8e241b2dfd..0000000000
--- a/keyboards/avalanche/v2/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 = 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
-ENCODER_ENABLE = yes
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
deleted file mode 100644
index 8cf8187df7..0000000000
--- a/keyboards/avalanche/v3/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
- "keyboard_name": "Avalanche",
- "manufacturer": "vitvlkv",
- "url": "https://github.com/vlkv/avalanche",
- "maintainer": "vlkv",
- "usb": {
- "vid": "0xCEE2",
- "pid": "0x0003",
- "device_version": "0.0.3"
- },
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
- ]
- },
- "split": {
- "soft_serial_pin": "D2"
- },
- "rgblight": {
- "led_count": 12,
- "split_count": [7, 7]
- },
- "ws2812": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 1, "y": 0.75},
- {"matrix": [0, 1], "x": 2, "y": 0.75},
- {"matrix": [0, 2], "x": 3, "y": 0.25},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0.25},
- {"matrix": [0, 5], "x": 6, "y": 0.35},
-
- {"matrix": [5, 5], "x": 12, "y": 0.35},
- {"matrix": [5, 4], "x": 13, "y": 0.25},
- {"matrix": [5, 3], "x": 14, "y": 0},
- {"matrix": [5, 2], "x": 15, "y": 0.25},
- {"matrix": [5, 1], "x": 16, "y": 0.75},
- {"matrix": [5, 0], "x": 17, "y": 0.75},
-
- {"matrix": [1, 0], "x": 1, "y": 1.75},
- {"matrix": [1, 1], "x": 2, "y": 1.75},
- {"matrix": [1, 2], "x": 3, "y": 1.25},
- {"matrix": [1, 3], "x": 4, "y": 1},
- {"matrix": [1, 4], "x": 5, "y": 1.25},
- {"matrix": [1, 5], "x": 6, "y": 1.35},
-
- {"matrix": [6, 5], "x": 12, "y": 1.35},
- {"matrix": [6, 4], "x": 13, "y": 1.25},
- {"matrix": [6, 3], "x": 14, "y": 1},
- {"matrix": [6, 2], "x": 15, "y": 1.25},
- {"matrix": [6, 1], "x": 16, "y": 1.75},
- {"matrix": [6, 0], "x": 17, "y": 1.75},
-
- {"matrix": [4, 0], "x": 0, "y": 2.85},
- {"matrix": [2, 0], "x": 1, "y": 2.75},
- {"matrix": [2, 1], "x": 2, "y": 2.75},
- {"matrix": [2, 2], "x": 3, "y": 2.25},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2.25},
- {"matrix": [2, 5], "x": 6, "y": 2.35},
-
- {"matrix": [7, 5], "x": 12, "y": 2.35},
- {"matrix": [7, 4], "x": 13, "y": 2.25},
- {"matrix": [7, 3], "x": 14, "y": 2},
- {"matrix": [7, 2], "x": 15, "y": 2.25},
- {"matrix": [7, 1], "x": 16, "y": 2.75},
- {"matrix": [7, 0], "x": 17, "y": 2.75},
- {"matrix": [9, 0], "x": 18, "y": 2.85},
-
- {"matrix": [3, 0], "x": 1, "y": 3.75},
- {"matrix": [3, 1], "x": 2, "y": 3.75},
- {"matrix": [3, 2], "x": 3, "y": 3.25},
- {"matrix": [3, 3], "x": 4, "y": 3},
- {"matrix": [3, 4], "x": 5, "y": 3.25},
- {"matrix": [3, 5], "x": 6, "y": 3.35},
- {"matrix": [3, 6], "x": 7, "y": 3.7},
- {"matrix": [2, 6], "x": 8, "y": 4.05},
-
- {"matrix": [7, 6], "x": 10, "y": 4.05},
- {"matrix": [8, 6], "x": 11, "y": 3.7},
- {"matrix": [8, 5], "x": 12, "y": 3.35},
- {"matrix": [8, 4], "x": 13, "y": 3.25},
- {"matrix": [8, 3], "x": 14, "y": 3},
- {"matrix": [8, 2], "x": 15, "y": 3.25},
- {"matrix": [8, 1], "x": 16, "y": 3.75},
- {"matrix": [8, 0], "x": 17, "y": 3.75},
-
- {"matrix": [4, 2], "x": 3.4, "y": 4.55},
- {"matrix": [4, 3], "x": 4.6, "y": 4.45},
- {"matrix": [4, 4], "x": 5.8, "y": 4.4},
- {"matrix": [4, 5], "x": 7, "y": 4.7},
- {"matrix": [4, 6], "x": 8, "y": 5.05},
-
- {"matrix": [9, 6], "x": 10, "y": 5.05},
- {"matrix": [9, 5], "x": 11, "y": 4.7},
- {"matrix": [9, 4], "x": 12.2, "y": 4.4},
- {"matrix": [9, 3], "x": 13.4, "y": 4.45},
- {"matrix": [9, 2], "x": 14.6, "y": 4.55}
- ]
- }
- }
-}
diff --git a/keyboards/avalanche/v3/keyboard.json b/keyboards/avalanche/v3/keyboard.json
new file mode 100644
index 0000000000..6104dbd793
--- /dev/null
+++ b/keyboards/avalanche/v3/keyboard.json
@@ -0,0 +1,120 @@
+{
+ "keyboard_name": "Avalanche",
+ "manufacturer": "vitvlkv",
+ "url": "https://github.com/vlkv/avalanche",
+ "maintainer": "vlkv",
+ "usb": {
+ "vid": "0xCEE2",
+ "pid": "0x0003",
+ "device_version": "0.0.3"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "encoder": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "rgblight": {
+ "led_count": 12,
+ "split_count": [7, 7]
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1, "y": 0.75},
+ {"matrix": [0, 1], "x": 2, "y": 0.75},
+ {"matrix": [0, 2], "x": 3, "y": 0.25},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0.25},
+ {"matrix": [0, 5], "x": 6, "y": 0.35},
+
+ {"matrix": [5, 5], "x": 12, "y": 0.35},
+ {"matrix": [5, 4], "x": 13, "y": 0.25},
+ {"matrix": [5, 3], "x": 14, "y": 0},
+ {"matrix": [5, 2], "x": 15, "y": 0.25},
+ {"matrix": [5, 1], "x": 16, "y": 0.75},
+ {"matrix": [5, 0], "x": 17, "y": 0.75},
+
+ {"matrix": [1, 0], "x": 1, "y": 1.75},
+ {"matrix": [1, 1], "x": 2, "y": 1.75},
+ {"matrix": [1, 2], "x": 3, "y": 1.25},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1.25},
+ {"matrix": [1, 5], "x": 6, "y": 1.35},
+
+ {"matrix": [6, 5], "x": 12, "y": 1.35},
+ {"matrix": [6, 4], "x": 13, "y": 1.25},
+ {"matrix": [6, 3], "x": 14, "y": 1},
+ {"matrix": [6, 2], "x": 15, "y": 1.25},
+ {"matrix": [6, 1], "x": 16, "y": 1.75},
+ {"matrix": [6, 0], "x": 17, "y": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.85},
+ {"matrix": [2, 0], "x": 1, "y": 2.75},
+ {"matrix": [2, 1], "x": 2, "y": 2.75},
+ {"matrix": [2, 2], "x": 3, "y": 2.25},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2.25},
+ {"matrix": [2, 5], "x": 6, "y": 2.35},
+
+ {"matrix": [7, 5], "x": 12, "y": 2.35},
+ {"matrix": [7, 4], "x": 13, "y": 2.25},
+ {"matrix": [7, 3], "x": 14, "y": 2},
+ {"matrix": [7, 2], "x": 15, "y": 2.25},
+ {"matrix": [7, 1], "x": 16, "y": 2.75},
+ {"matrix": [7, 0], "x": 17, "y": 2.75},
+ {"matrix": [9, 0], "x": 18, "y": 2.85},
+
+ {"matrix": [3, 0], "x": 1, "y": 3.75},
+ {"matrix": [3, 1], "x": 2, "y": 3.75},
+ {"matrix": [3, 2], "x": 3, "y": 3.25},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3.25},
+ {"matrix": [3, 5], "x": 6, "y": 3.35},
+ {"matrix": [3, 6], "x": 7, "y": 3.7},
+ {"matrix": [2, 6], "x": 8, "y": 4.05},
+
+ {"matrix": [7, 6], "x": 10, "y": 4.05},
+ {"matrix": [8, 6], "x": 11, "y": 3.7},
+ {"matrix": [8, 5], "x": 12, "y": 3.35},
+ {"matrix": [8, 4], "x": 13, "y": 3.25},
+ {"matrix": [8, 3], "x": 14, "y": 3},
+ {"matrix": [8, 2], "x": 15, "y": 3.25},
+ {"matrix": [8, 1], "x": 16, "y": 3.75},
+ {"matrix": [8, 0], "x": 17, "y": 3.75},
+
+ {"matrix": [4, 2], "x": 3.4, "y": 4.55},
+ {"matrix": [4, 3], "x": 4.6, "y": 4.45},
+ {"matrix": [4, 4], "x": 5.8, "y": 4.4},
+ {"matrix": [4, 5], "x": 7, "y": 4.7},
+ {"matrix": [4, 6], "x": 8, "y": 5.05},
+
+ {"matrix": [9, 6], "x": 10, "y": 5.05},
+ {"matrix": [9, 5], "x": 11, "y": 4.7},
+ {"matrix": [9, 4], "x": 12.2, "y": 4.4},
+ {"matrix": [9, 3], "x": 13.4, "y": 4.45},
+ {"matrix": [9, 2], "x": 14.6, "y": 4.55}
+ ]
+ }
+ }
+}
diff --git a/keyboards/avalanche/v3/rules.mk b/keyboards/avalanche/v3/rules.mk
deleted file mode 100644
index 5a35722be4..0000000000
--- a/keyboards/avalanche/v3/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 = 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
-ENCODER_ENABLE = yes
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
deleted file mode 100644
index 7bb047466b..0000000000
--- a/keyboards/avalanche/v4/info.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
- "keyboard_name": "Avalanche",
- "manufacturer": "vitvlkv",
- "url": "https://github.com/vlkv/avalanche",
- "maintainer": "vlkv",
- "usb": {
- "vid": "0xCEE2",
- "pid": "0x0004",
- "device_version": "0.0.4"
- },
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
- ]
- },
- "split": {
- "soft_serial_pin": "D2"
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgblight": {
- "hue_steps": 10,
- "led_count": 64,
- "max_brightness": 100,
- "led_map": [28, 30, 31, 29, 24, 25, 26, 27, 22, 21, 20, 19, 23, 18, 14, 15, 16, 17, 12, 11, 10, 9, 13, 5, 6, 7, 8, 4, 3, 2, 1, 0, 34, 32, 33, 35, 37, 38, 39, 40, 45, 44, 43, 42, 36, 41, 47, 48, 49, 50, 54, 53, 52, 51, 46, 55, 56, 57, 58, 62, 61, 60, 59, 63],
- "split_count": [32, 32],
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "rgb_test": true,
- "alternating": true
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 1, "y": 0.75},
- {"matrix": [0, 1], "x": 2, "y": 0.75},
- {"matrix": [0, 2], "x": 3, "y": 0.25},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0.25},
- {"matrix": [0, 5], "x": 6, "y": 0.35},
-
- {"matrix": [5, 5], "x": 12, "y": 0.35},
- {"matrix": [5, 4], "x": 13, "y": 0.25},
- {"matrix": [5, 3], "x": 14, "y": 0},
- {"matrix": [5, 2], "x": 15, "y": 0.25},
- {"matrix": [5, 1], "x": 16, "y": 0.75},
- {"matrix": [5, 0], "x": 17, "y": 0.75},
-
- {"matrix": [1, 0], "x": 1, "y": 1.75},
- {"matrix": [1, 1], "x": 2, "y": 1.75},
- {"matrix": [1, 2], "x": 3, "y": 1.25},
- {"matrix": [1, 3], "x": 4, "y": 1},
- {"matrix": [1, 4], "x": 5, "y": 1.25},
- {"matrix": [1, 5], "x": 6, "y": 1.35},
-
- {"matrix": [6, 5], "x": 12, "y": 1.35},
- {"matrix": [6, 4], "x": 13, "y": 1.25},
- {"matrix": [6, 3], "x": 14, "y": 1},
- {"matrix": [6, 2], "x": 15, "y": 1.25},
- {"matrix": [6, 1], "x": 16, "y": 1.75},
- {"matrix": [6, 0], "x": 17, "y": 1.75},
-
- {"matrix": [4, 0], "x": 0, "y": 2.85},
- {"matrix": [2, 0], "x": 1, "y": 2.75},
- {"matrix": [2, 1], "x": 2, "y": 2.75},
- {"matrix": [2, 2], "x": 3, "y": 2.25},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2.25},
- {"matrix": [2, 5], "x": 6, "y": 2.35},
-
- {"matrix": [7, 5], "x": 12, "y": 2.35},
- {"matrix": [7, 4], "x": 13, "y": 2.25},
- {"matrix": [7, 3], "x": 14, "y": 2},
- {"matrix": [7, 2], "x": 15, "y": 2.25},
- {"matrix": [7, 1], "x": 16, "y": 2.75},
- {"matrix": [7, 0], "x": 17, "y": 2.75},
- {"matrix": [9, 0], "x": 18, "y": 2.85},
-
- {"matrix": [3, 0], "x": 1, "y": 3.75},
- {"matrix": [3, 1], "x": 2, "y": 3.75},
- {"matrix": [3, 2], "x": 3, "y": 3.25},
- {"matrix": [3, 3], "x": 4, "y": 3},
- {"matrix": [3, 4], "x": 5, "y": 3.25},
- {"matrix": [3, 5], "x": 6, "y": 3.35},
- {"matrix": [3, 6], "x": 7, "y": 3.7},
- {"matrix": [2, 6], "x": 8, "y": 4.05},
-
- {"matrix": [7, 6], "x": 10, "y": 4.05},
- {"matrix": [8, 6], "x": 11, "y": 3.7},
- {"matrix": [8, 5], "x": 12, "y": 3.35},
- {"matrix": [8, 4], "x": 13, "y": 3.25},
- {"matrix": [8, 3], "x": 14, "y": 3},
- {"matrix": [8, 2], "x": 15, "y": 3.25},
- {"matrix": [8, 1], "x": 16, "y": 3.75},
- {"matrix": [8, 0], "x": 17, "y": 3.75},
-
- {"matrix": [4, 2], "x": 3.4, "y": 4.55},
- {"matrix": [4, 3], "x": 4.6, "y": 4.45},
- {"matrix": [4, 4], "x": 5.8, "y": 4.4},
- {"matrix": [4, 5], "x": 7, "y": 4.7},
- {"matrix": [4, 6], "x": 8, "y": 5.05},
-
- {"matrix": [9, 6], "x": 10, "y": 5.05},
- {"matrix": [9, 5], "x": 11, "y": 4.7},
- {"matrix": [9, 4], "x": 12.2, "y": 4.4},
- {"matrix": [9, 3], "x": 13.4, "y": 4.45},
- {"matrix": [9, 2], "x": 14.6, "y": 4.55}
- ]
- }
- }
-}
diff --git a/keyboards/avalanche/v4/keyboard.json b/keyboards/avalanche/v4/keyboard.json
new file mode 100644
index 0000000000..2a4909ba36
--- /dev/null
+++ b/keyboards/avalanche/v4/keyboard.json
@@ -0,0 +1,135 @@
+{
+ "keyboard_name": "Avalanche",
+ "manufacturer": "vitvlkv",
+ "url": "https://github.com/vlkv/avalanche",
+ "maintainer": "vlkv",
+ "usb": {
+ "vid": "0xCEE2",
+ "pid": "0x0004",
+ "device_version": "0.0.4"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "encoder": true,
+ "oled": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 64,
+ "max_brightness": 100,
+ "led_map": [28, 30, 31, 29, 24, 25, 26, 27, 22, 21, 20, 19, 23, 18, 14, 15, 16, 17, 12, 11, 10, 9, 13, 5, 6, 7, 8, 4, 3, 2, 1, 0, 34, 32, 33, 35, 37, 38, 39, 40, 45, 44, 43, 42, 36, 41, 47, 48, 49, 50, 54, 53, 52, 51, 46, 55, 56, 57, 58, 62, 61, 60, 59, 63],
+ "split_count": [32, 32],
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1, "y": 0.75},
+ {"matrix": [0, 1], "x": 2, "y": 0.75},
+ {"matrix": [0, 2], "x": 3, "y": 0.25},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0.25},
+ {"matrix": [0, 5], "x": 6, "y": 0.35},
+
+ {"matrix": [5, 5], "x": 12, "y": 0.35},
+ {"matrix": [5, 4], "x": 13, "y": 0.25},
+ {"matrix": [5, 3], "x": 14, "y": 0},
+ {"matrix": [5, 2], "x": 15, "y": 0.25},
+ {"matrix": [5, 1], "x": 16, "y": 0.75},
+ {"matrix": [5, 0], "x": 17, "y": 0.75},
+
+ {"matrix": [1, 0], "x": 1, "y": 1.75},
+ {"matrix": [1, 1], "x": 2, "y": 1.75},
+ {"matrix": [1, 2], "x": 3, "y": 1.25},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1.25},
+ {"matrix": [1, 5], "x": 6, "y": 1.35},
+
+ {"matrix": [6, 5], "x": 12, "y": 1.35},
+ {"matrix": [6, 4], "x": 13, "y": 1.25},
+ {"matrix": [6, 3], "x": 14, "y": 1},
+ {"matrix": [6, 2], "x": 15, "y": 1.25},
+ {"matrix": [6, 1], "x": 16, "y": 1.75},
+ {"matrix": [6, 0], "x": 17, "y": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.85},
+ {"matrix": [2, 0], "x": 1, "y": 2.75},
+ {"matrix": [2, 1], "x": 2, "y": 2.75},
+ {"matrix": [2, 2], "x": 3, "y": 2.25},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2.25},
+ {"matrix": [2, 5], "x": 6, "y": 2.35},
+
+ {"matrix": [7, 5], "x": 12, "y": 2.35},
+ {"matrix": [7, 4], "x": 13, "y": 2.25},
+ {"matrix": [7, 3], "x": 14, "y": 2},
+ {"matrix": [7, 2], "x": 15, "y": 2.25},
+ {"matrix": [7, 1], "x": 16, "y": 2.75},
+ {"matrix": [7, 0], "x": 17, "y": 2.75},
+ {"matrix": [9, 0], "x": 18, "y": 2.85},
+
+ {"matrix": [3, 0], "x": 1, "y": 3.75},
+ {"matrix": [3, 1], "x": 2, "y": 3.75},
+ {"matrix": [3, 2], "x": 3, "y": 3.25},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3.25},
+ {"matrix": [3, 5], "x": 6, "y": 3.35},
+ {"matrix": [3, 6], "x": 7, "y": 3.7},
+ {"matrix": [2, 6], "x": 8, "y": 4.05},
+
+ {"matrix": [7, 6], "x": 10, "y": 4.05},
+ {"matrix": [8, 6], "x": 11, "y": 3.7},
+ {"matrix": [8, 5], "x": 12, "y": 3.35},
+ {"matrix": [8, 4], "x": 13, "y": 3.25},
+ {"matrix": [8, 3], "x": 14, "y": 3},
+ {"matrix": [8, 2], "x": 15, "y": 3.25},
+ {"matrix": [8, 1], "x": 16, "y": 3.75},
+ {"matrix": [8, 0], "x": 17, "y": 3.75},
+
+ {"matrix": [4, 2], "x": 3.4, "y": 4.55},
+ {"matrix": [4, 3], "x": 4.6, "y": 4.45},
+ {"matrix": [4, 4], "x": 5.8, "y": 4.4},
+ {"matrix": [4, 5], "x": 7, "y": 4.7},
+ {"matrix": [4, 6], "x": 8, "y": 5.05},
+
+ {"matrix": [9, 6], "x": 10, "y": 5.05},
+ {"matrix": [9, 5], "x": 11, "y": 4.7},
+ {"matrix": [9, 4], "x": 12.2, "y": 4.4},
+ {"matrix": [9, 3], "x": 13.4, "y": 4.45},
+ {"matrix": [9, 2], "x": 14.6, "y": 4.55}
+ ]
+ }
+ }
+}
diff --git a/keyboards/avalanche/v4/rules.mk b/keyboards/avalanche/v4/rules.mk
deleted file mode 100644
index 513c25d04d..0000000000
--- a/keyboards/avalanche/v4/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
deleted file mode 100644
index 35ca2e0fc3..0000000000
--- a/keyboards/aves60/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2021 Evelien Dekkers (@evyd13)
-// 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
-
-/*
- * 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/aves60/keyboard.json b/keyboards/aves60/keyboard.json
index fce12cd9f7..6d58d43b6a 100644
--- a/keyboards/aves60/keyboard.json
+++ b/keyboards/aves60/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B2", "B3", "D0", "D1", "D2", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
"rows": ["F6", "F7", "F5", "F1", "F4"]
diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h
deleted file mode 100644
index 95af0f8e73..0000000000
--- a/keyboards/aves65/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2019 I/O Keyboards
-
-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/aves65/keyboard.json b/keyboards/aves65/keyboard.json
index fba7dcaf38..3ad686f83a 100644
--- a/keyboards/aves65/keyboard.json
+++ b/keyboards/aves65/keyboard.json
@@ -17,6 +17,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
"rows": ["D4", "D6", "D7", "B4", "E6"]
diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json
index 14a3c8213e..c90c967788 100644
--- a/keyboards/axolstudio/helpo/info.json
+++ b/keyboards/axolstudio/helpo/info.json
@@ -8,6 +8,11 @@
"pid": "0xC89F",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
+ },
"matrix_pins": {
"cols": ["A1", "B4", "B3", "B2", "B1"],
"rows": ["A2", "A3", "A4", "A5"]
diff --git a/keyboards/axolstudio/helpo/rules.mk b/keyboards/axolstudio/helpo/rules.mk
index 1e9f925544..c2ee0bc86f 100644
--- a/keyboards/axolstudio/helpo/rules.mk
+++ b/keyboards/axolstudio/helpo/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 16000000
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/aya/info.json b/keyboards/aya/info.json
deleted file mode 100644
index 6b65aa5521..0000000000
--- a/keyboards/aya/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
- "keyboard_name": "Aya",
- "manufacturer": "DanNixon",
- "url": "https://github.com/DanNixon/aya",
- "maintainer": "dannixon",
- "usb": {
- "vid": "0x1209",
- "pid": "0x2925",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 6], "x": 0, "y": 0},
- {"matrix": [0, 5], "x": 1, "y": 0},
- {"matrix": [0, 4], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0},
- {"matrix": [0, 1], "x": 5, "y": 0},
- {"matrix": [0, 0], "x": 6, "y": 0},
- {"matrix": [5, 0], "x": 12, "y": 0},
- {"matrix": [5, 1], "x": 13, "y": 0},
- {"matrix": [5, 2], "x": 14, "y": 0},
- {"matrix": [5, 3], "x": 15, "y": 0},
- {"matrix": [5, 4], "x": 16, "y": 0},
- {"matrix": [5, 5], "x": 17, "y": 0},
- {"matrix": [5, 6], "x": 18, "y": 0},
-
- {"matrix": [1, 6], "x": 0, "y": 1},
- {"matrix": [1, 5], "x": 1, "y": 1},
- {"matrix": [1, 4], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 2], "x": 4, "y": 1},
- {"matrix": [1, 1], "x": 5, "y": 1},
- {"matrix": [1, 0], "x": 6, "y": 1},
- {"matrix": [6, 0], "x": 12, "y": 1},
- {"matrix": [6, 1], "x": 13, "y": 1},
- {"matrix": [6, 2], "x": 14, "y": 1},
- {"matrix": [6, 3], "x": 15, "y": 1},
- {"matrix": [6, 4], "x": 16, "y": 1},
- {"matrix": [6, 5], "x": 17, "y": 1},
- {"matrix": [6, 6], "x": 18, "y": 1},
-
- {"matrix": [2, 6], "x": 0, "y": 2},
- {"matrix": [2, 5], "x": 1, "y": 2},
- {"matrix": [2, 4], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 2], "x": 4, "y": 2},
- {"matrix": [2, 1], "x": 5, "y": 2},
- {"matrix": [2, 0], "x": 6, "y": 2},
- {"matrix": [4, 0], "x": 7, "y": 2},
- {"matrix": [9, 0], "x": 11, "y": 2},
- {"matrix": [7, 0], "x": 12, "y": 2},
- {"matrix": [7, 1], "x": 13, "y": 2},
- {"matrix": [7, 2], "x": 14, "y": 2},
- {"matrix": [7, 3], "x": 15, "y": 2},
- {"matrix": [7, 4], "x": 16, "y": 2},
- {"matrix": [7, 5], "x": 17, "y": 2},
- {"matrix": [7, 6], "x": 18, "y": 2},
-
- {"matrix": [3, 6], "x": 0, "y": 3},
- {"matrix": [3, 5], "x": 1, "y": 3},
- {"matrix": [3, 4], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 2], "x": 4, "y": 3},
- {"matrix": [3, 1], "x": 5, "y": 3},
- {"matrix": [3, 0], "x": 6, "y": 3},
- {"matrix": [4, 3], "x": 7, "y": 3},
- {"matrix": [4, 4], "x": 8, "y": 3},
- {"matrix": [9, 4], "x": 10, "y": 3},
- {"matrix": [9, 3], "x": 11, "y": 3},
- {"matrix": [8, 0], "x": 12, "y": 3},
- {"matrix": [8, 1], "x": 13, "y": 3},
- {"matrix": [8, 2], "x": 14, "y": 3},
- {"matrix": [8, 3], "x": 15, "y": 3},
- {"matrix": [8, 4], "x": 16, "y": 3},
- {"matrix": [8, 5], "x": 17, "y": 3},
- {"matrix": [8, 6], "x": 18, "y": 3},
-
- {"matrix": [4, 2], "x": 5, "y": 4},
- {"matrix": [4, 1], "x": 6, "y": 4},
- {"matrix": [4, 5], "x": 7, "y": 4},
- {"matrix": [4, 6], "x": 8, "y": 4},
- {"matrix": [9, 6], "x": 10, "y": 4},
- {"matrix": [9, 5], "x": 11, "y": 4},
- {"matrix": [9, 1], "x": 12, "y": 4},
- {"matrix": [9, 2], "x": 13, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/aya/keyboard.json b/keyboards/aya/keyboard.json
new file mode 100644
index 0000000000..547f495ddd
--- /dev/null
+++ b/keyboards/aya/keyboard.json
@@ -0,0 +1,107 @@
+{
+ "keyboard_name": "Aya",
+ "manufacturer": "DanNixon",
+ "url": "https://github.com/DanNixon/aya",
+ "maintainer": "dannixon",
+ "usb": {
+ "vid": "0x1209",
+ "pid": "0x2925",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true
+ },
+ "split": {
+ "enabled": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 6], "x": 0, "y": 0},
+ {"matrix": [0, 5], "x": 1, "y": 0},
+ {"matrix": [0, 4], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 0], "x": 6, "y": 0},
+ {"matrix": [5, 0], "x": 12, "y": 0},
+ {"matrix": [5, 1], "x": 13, "y": 0},
+ {"matrix": [5, 2], "x": 14, "y": 0},
+ {"matrix": [5, 3], "x": 15, "y": 0},
+ {"matrix": [5, 4], "x": 16, "y": 0},
+ {"matrix": [5, 5], "x": 17, "y": 0},
+ {"matrix": [5, 6], "x": 18, "y": 0},
+
+ {"matrix": [1, 6], "x": 0, "y": 1},
+ {"matrix": [1, 5], "x": 1, "y": 1},
+ {"matrix": [1, 4], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 1], "x": 5, "y": 1},
+ {"matrix": [1, 0], "x": 6, "y": 1},
+ {"matrix": [6, 0], "x": 12, "y": 1},
+ {"matrix": [6, 1], "x": 13, "y": 1},
+ {"matrix": [6, 2], "x": 14, "y": 1},
+ {"matrix": [6, 3], "x": 15, "y": 1},
+ {"matrix": [6, 4], "x": 16, "y": 1},
+ {"matrix": [6, 5], "x": 17, "y": 1},
+ {"matrix": [6, 6], "x": 18, "y": 1},
+
+ {"matrix": [2, 6], "x": 0, "y": 2},
+ {"matrix": [2, 5], "x": 1, "y": 2},
+ {"matrix": [2, 4], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [2, 1], "x": 5, "y": 2},
+ {"matrix": [2, 0], "x": 6, "y": 2},
+ {"matrix": [4, 0], "x": 7, "y": 2},
+ {"matrix": [9, 0], "x": 11, "y": 2},
+ {"matrix": [7, 0], "x": 12, "y": 2},
+ {"matrix": [7, 1], "x": 13, "y": 2},
+ {"matrix": [7, 2], "x": 14, "y": 2},
+ {"matrix": [7, 3], "x": 15, "y": 2},
+ {"matrix": [7, 4], "x": 16, "y": 2},
+ {"matrix": [7, 5], "x": 17, "y": 2},
+ {"matrix": [7, 6], "x": 18, "y": 2},
+
+ {"matrix": [3, 6], "x": 0, "y": 3},
+ {"matrix": [3, 5], "x": 1, "y": 3},
+ {"matrix": [3, 4], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 1], "x": 5, "y": 3},
+ {"matrix": [3, 0], "x": 6, "y": 3},
+ {"matrix": [4, 3], "x": 7, "y": 3},
+ {"matrix": [4, 4], "x": 8, "y": 3},
+ {"matrix": [9, 4], "x": 10, "y": 3},
+ {"matrix": [9, 3], "x": 11, "y": 3},
+ {"matrix": [8, 0], "x": 12, "y": 3},
+ {"matrix": [8, 1], "x": 13, "y": 3},
+ {"matrix": [8, 2], "x": 14, "y": 3},
+ {"matrix": [8, 3], "x": 15, "y": 3},
+ {"matrix": [8, 4], "x": 16, "y": 3},
+ {"matrix": [8, 5], "x": 17, "y": 3},
+ {"matrix": [8, 6], "x": 18, "y": 3},
+
+ {"matrix": [4, 2], "x": 5, "y": 4},
+ {"matrix": [4, 1], "x": 6, "y": 4},
+ {"matrix": [4, 5], "x": 7, "y": 4},
+ {"matrix": [4, 6], "x": 8, "y": 4},
+ {"matrix": [9, 6], "x": 10, "y": 4},
+ {"matrix": [9, 5], "x": 11, "y": 4},
+ {"matrix": [9, 1], "x": 12, "y": 4},
+ {"matrix": [9, 2], "x": 13, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/aya/rules.mk b/keyboards/aya/rules.mk
deleted file mode 100644
index b893863bb5..0000000000
--- a/keyboards/aya/rules.mk
+++ /dev/null
@@ -1,13 +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 = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
--
cgit v1.2.3