Move single `LAYOUT`s to data driven (#20365)

2 files changed, 80 insertions, 113 deletions

diff --git a/keyboards/quantrik/kyuu/info.json b/keyboards/quantrik/kyuu/info.json
index ea8b3da4fa..e741eeb04a 100644
--- a/keyboards/quantrik/kyuu/info.json
+++ b/keyboards/quantrik/kyuu/info.json
@@ -16,76 +16,84 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-      "LAYOUT": {
-        "layout": [
-          {"label":"K00 (B6,F1)", "x":0, "y":0},
-          {"label":"K01 (B6,F4)", "x":1, "y":0},
-          {"label":"K02 (B6,F5)", "x":2, "y":0},
-          {"label":"K03 (B6,F6)", "x":3, "y":0},
-          {"label":"K04 (B6,F7)", "x":4, "y":0},
-          {"label":"K05 (B6,C7)", "x":5, "y":0},
-          {"label":"K06 (B6,C6)", "x":6, "y":0},
-          {"label":"K07 (B6,F0)", "x":7, "y":0},
-          {"label":"K08 (B6,B7)", "x":8, "y":0},
-          {"label":"K09 (B6,D0)", "x":9, "y":0},
-          {"label":"K0A (B6,D5)", "x":10, "y":0},
-          {"label":"K0B (B6,D3)", "x":11, "y":0},
-          {"label":"K0C (B6,D2)", "x":12, "y":0},
-          {"label":"K0D (B6,D1)", "x":13, "y":0},
-          {"label":"K0E (B6,B3)", "x":14, "y":0},
-          {"label":"K2E (B4,B3)", "x":15, "y":0},
-          {"label":"K10 (B5,F1)", "x":0, "y":1, "w":1.5},
-          {"label":"K11 (B5,F4)", "x":1.5, "y":1},
-          {"label":"K12 (B5,F5)", "x":2.5, "y":1},
-          {"label":"K13 (B5,F6)", "x":3.5, "y":1},
-          {"label":"K14 (B5,F7)", "x":4.5, "y":1},
-          {"label":"K15 (B5,C7)", "x":5.5, "y":1},
-          {"label":"K16 (B5,C6)", "x":6.5, "y":1},
-          {"label":"K17 (B5,F0)", "x":7.5, "y":1},
-          {"label":"K18 (B5,B7)", "x":8.5, "y":1},
-          {"label":"K19 (B5,D0)", "x":9.5, "y":1},
-          {"label":"K1A (B5,D5)", "x":10.5, "y":1},
-          {"label":"K1B (B5,D3)", "x":11.5, "y":1},
-          {"label":"K1C (B5,D2)", "x":12.5, "y":1},
-          {"label":"K1D (B5,D1)", "x":13.5, "y":1, "w":1.5},
-          {"label":"K1E (B5,B3)", "x":15, "y":1},
-          {"label":"K20 (B4,F1)", "x":0, "y":2, "w":1.75},
-          {"label":"K21 (B4,F4)", "x":1.75, "y":2},
-          {"label":"K22 (B4,F5)", "x":2.75, "y":2},
-          {"label":"K23 (B4,F6)", "x":3.75, "y":2},
-          {"label":"K24 (B4,F7)", "x":4.75, "y":2},
-          {"label":"K25 (B4,C7)", "x":5.75, "y":2},
-          {"label":"K26 (B4,C6)", "x":6.75, "y":2},
-          {"label":"K27 (B4,F0)", "x":7.75, "y":2},
-          {"label":"K28 (B4,B7)", "x":8.75, "y":2},
-          {"label":"K29 (B4,D0)", "x":9.75, "y":2},
-          {"label":"K2A (B4,D5)", "x":10.75, "y":2},
-          {"label":"K2B (B4,D3)", "x":11.75, "y":2},
-          {"label":"K2C (B4,D2)", "x":12.75, "y":2, "w":2.25},
-          {"label":"K2D (B4,D1)", "x":15, "y":2},
-          {"label":"K30 (D7,F1)", "x":0, "y":3, "w":2.25},
-          {"label":"K31 (D7,F4)", "x":2.25, "y":3},
-          {"label":"K32 (D7,F5)", "x":3.25, "y":3},
-          {"label":"K33 (D7,F6)", "x":4.25, "y":3},
-          {"label":"K34 (D7,F7)", "x":5.25, "y":3},
-          {"label":"K35 (D7,C7)", "x":6.25, "y":3},
-          {"label":"K36 (D7,C6)", "x":7.25, "y":3},
-          {"label":"K37 (D7,F0)", "x":8.25, "y":3},
-          {"label":"K38 (D7,B7)", "x":9.25, "y":3},
-          {"label":"K39 (D7,D0)", "x":10.25, "y":3},
-          {"label":"K3A (D7,D5)", "x":11.25, "y":3},
-          {"label":"K3B (D7,D3)", "x":12.25, "y":3, "w":1.75},
-          {"label":"K3C (D7,D2)", "x":14, "y":3},
-          {"label":"K3D (D7,D1)", "x":15, "y":3},
-          {"label":"K40 (D6,F1)", "x":0, "y":4, "w":1.5},
-          {"label":"K41 (D6,F4)", "x":1.5, "y":4},
-          {"label":"K42 (D6,F5)", "x":2.5, "y":4, "w":1.5},
-          {"label":"K46 (D6,C6)", "x":4, "y":4, "w":7},
-          {"label":"K4A (D6,D5)", "x":11, "y":4, "w":1.5},
-          {"label":"K4B (D6,D3)", "x":13, "y":4},
-          {"label":"K4C (D6,D2)", "x":14, "y":4},
-          {"label":"K4D (D6,D1)", "x":15, "y":4}
-        ]
-      }
+        "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},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [2, 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, 13], "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, 11], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        }
     }
-  }
+}
diff --git a/keyboards/quantrik/kyuu/kyuu.h b/keyboards/quantrik/kyuu/kyuu.h
deleted file mode 100644
index 25d9d86dd5..0000000000
--- a/keyboards/quantrik/kyuu/kyuu.h
+++ /dev/null
@@ -1,41 +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 <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k2E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,           \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,           \
-    k40, k41, k42, k46, k4A, k4B, k4C, k4D                                          \
-) \
-{ \
-    { k00, k01, k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C, k0D, k0E },   \
-    { k10, k11, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C, k1D, k1E },   \
-    { k20, k21, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C, k2D, k2E },   \
-    { k30, k31, k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, k3C, k3D, KC_NO }, \
-    { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, k4C, k4D, KC_NO }, \
-}