Move remaining `LAYOUT`s to data driven (#20422)

3 files changed, 184 insertions, 94 deletions

diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index ac7c0dae98..2d71fc0eb3 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -20,5 +20,187 @@
     },
     "processor": "MK66FX1M0",
     "bootloader": "halfkay",
-    "debounce": 20
+    "debounce": 20,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 2.25, "y": 1},
+                {"matrix": [3, 0], "x": 3.25, "y": 1},
+                {"matrix": [4, 0], "x": 4.25, "y": 1},
+                {"matrix": [5, 0], "x": 5.25, "y": 1},
+                {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2},
+                {"matrix": [3, 1], "x": 3.25, "y": 2},
+                {"matrix": [4, 1], "x": 4.25, "y": 2},
+                {"matrix": [5, 1], "x": 5.25, "y": 2},
+                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [4, 2], "x": 4.25, "y": 3},
+                {"matrix": [5, 2], "x": 5.25, "y": 3},
+                {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [2, 3], "x": 2.25, "y": 4},
+                {"matrix": [3, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [5, 3], "x": 5.25, "y": 4},
+                {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+                {"matrix": [2, 4], "x": 2.25, "y": 5},
+                {"matrix": [3, 4], "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "x": 4.25, "y": 5},
+                {"matrix": [5, 6], "x": 5.25, "y": 6},
+                {"matrix": [5, 5], "x": 6.25, "y": 6},
+                {"matrix": [3, 5], "x": 6.25, "y": 7},
+                {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 8},
+                {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [6, 0], "x": 9.25, "y": 1},
+                {"matrix": [7, 0], "x": 10.25, "y": 1},
+                {"matrix": [8, 0], "x": 11.25, "y": 1},
+                {"matrix": [9, 0], "x": 12.25, "y": 1},
+                {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+                {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+                {"matrix": [6, 1], "x": 9.25, "y": 2},
+                {"matrix": [7, 1], "x": 10.25, "y": 2},
+                {"matrix": [8, 1], "x": 11.25, "y": 2},
+                {"matrix": [9, 1], "x": 12.25, "y": 2},
+                {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+                {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+                {"matrix": [6, 2], "x": 9.25, "y": 3},
+                {"matrix": [7, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 2], "x": 11.25, "y": 3},
+                {"matrix": [9, 2], "x": 12.25, "y": 3},
+                {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+                {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+                {"matrix": [6, 3], "x": 9.25, "y": 4},
+                {"matrix": [7, 3], "x": 10.25, "y": 4},
+                {"matrix": [8, 3], "x": 11.25, "y": 4},
+                {"matrix": [9, 3], "x": 12.25, "y": 4},
+                {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+                {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+                {"matrix": [6, 4], "x": 10.25, "y": 5},
+                {"matrix": [8, 4], "x": 11.25, "y": 5},
+                {"matrix": [9, 4], "x": 12.25, "y": 5},
+                {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+                {"matrix": [9, 6], "x": 8.25, "y": 6},
+                {"matrix": [8, 5], "x": 9.25, "y": 6},
+                {"matrix": [8, 6], "x": 8.25, "y": 7},
+                {"matrix": [6, 6], "x": 8.25, "y": 8},
+                {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+                {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+            ]
+        },
+        "LAYOUT_pretty": {
+            "layout": [
+                {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 2.25, "y": 1},
+                {"matrix": [3, 0], "x": 3.25, "y": 1},
+                {"matrix": [4, 0], "x": 4.25, "y": 1},
+                {"matrix": [5, 0], "x": 5.25, "y": 1},
+                {"matrix": [6, 0], "x": 9.25, "y": 1},
+                {"matrix": [7, 0], "x": 10.25, "y": 1},
+                {"matrix": [8, 0], "x": 11.25, "y": 1},
+                {"matrix": [9, 0], "x": 12.25, "y": 1},
+                {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+                {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+                {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2},
+                {"matrix": [3, 1], "x": 3.25, "y": 2},
+                {"matrix": [4, 1], "x": 4.25, "y": 2},
+                {"matrix": [5, 1], "x": 5.25, "y": 2},
+                {"matrix": [6, 1], "x": 9.25, "y": 2},
+                {"matrix": [7, 1], "x": 10.25, "y": 2},
+                {"matrix": [8, 1], "x": 11.25, "y": 2},
+                {"matrix": [9, 1], "x": 12.25, "y": 2},
+                {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+                {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [4, 2], "x": 4.25, "y": 3},
+                {"matrix": [5, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 2], "x": 9.25, "y": 3},
+                {"matrix": [7, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 2], "x": 11.25, "y": 3},
+                {"matrix": [9, 2], "x": 12.25, "y": 3},
+                {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+                {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+                {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [2, 3], "x": 2.25, "y": 4},
+                {"matrix": [3, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [5, 3], "x": 5.25, "y": 4},
+                {"matrix": [6, 3], "x": 9.25, "y": 4},
+                {"matrix": [7, 3], "x": 10.25, "y": 4},
+                {"matrix": [8, 3], "x": 11.25, "y": 4},
+                {"matrix": [9, 3], "x": 12.25, "y": 4},
+                {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+                {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+                {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+                {"matrix": [2, 4], "x": 2.25, "y": 5},
+                {"matrix": [3, 4], "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "x": 4.25, "y": 5},
+                {"matrix": [6, 4], "x": 10.25, "y": 5},
+                {"matrix": [8, 4], "x": 11.25, "y": 5},
+                {"matrix": [9, 4], "x": 12.25, "y": 5},
+                {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 6], "x": 5.25, "y": 6},
+                {"matrix": [5, 5], "x": 6.25, "y": 6},
+                {"matrix": [9, 6], "x": 8.25, "y": 6},
+                {"matrix": [8, 5], "x": 9.25, "y": 6},
+                {"matrix": [3, 5], "x": 6.25, "y": 7},
+                {"matrix": [8, 6], "x": 8.25, "y": 7},
+                {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 8},
+                {"matrix": [6, 6], "x": 8.25, "y": 8},
+                {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+                {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+            ]
+        }
+    }
 }
diff --git a/keyboards/kinesis/kint36/kint36.c b/keyboards/kinesis/kint36/kint36.c
index cc32a60262..b3ae9b570c 100644
--- a/keyboards/kinesis/kint36/kint36.c
+++ b/keyboards/kinesis/kint36/kint36.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kint36.h"
+#include "quantum.h"
 
 #define LED_POWER C5
 
diff --git a/keyboards/kinesis/kint36/kint36.h b/keyboards/kinesis/kint36/kint36.h
deleted file mode 100644
index d427a1c2d6..0000000000
--- a/keyboards/kinesis/kint36/kint36.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2020 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments as on the physical keyboard
-// The second converts the arguments into the 2-D scanned array
-
-#define LAYOUT(                                   \
-    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,  \
-    k00, k10, k20, k30, k40, k50,                 \
-    k01, k11, k21, k31, k41, k51,                 \
-    k02, k12, k22, k32, k42, k52,                 \
-    k03, k13, k23, k33, k43, k53,                 \
-         k14, k24, k34, k54,                      \
-                             k56, k55,            \
-                                  k35,            \
-                        k36, k46, k25,            \
-                                                  \
-    kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5,  \
-                   k60, k70, k80, k90, kA0, kB0,  \
-                   k61, k71, k81, k91, kA1, kB1,  \
-                   k62, k72, k82, k92, kA2, kB2,  \
-                   k63, k73, k83, k93, kA3, kB3,  \
-                        k64, k84, k94, kA4,       \
-              k96, k85,                           \
-              k86,                                \
-              k66, k75, k65                       \
-) {                                              \
-    { k00,  k01,  k02,  k03,  ___,  ___,  ___ }, \
-    { k10,  k11,  k12,  k13,  k14,  ___,  ___ }, \
-    { k20,  k21,  k22,  k23,  k24,  k25,  ___ }, \
-    { k30,  k31,  k32,  k33,  k34,  k35,  k36 }, \
-    { k40,  k41,  k42,  k43,  ___,  ___,  k46 }, \
-    { k50,  k51,  k52,  k53,  k54,  k55,  k56 }, \
-    { k60,  k61,  k62,  k63,  k64,  k65,  k66 }, \
-    { k70,  k71,  k72,  k73,  ___,  k75,  ___ }, \
-    { k80,  k81,  k82,  k83,  k84,  k85,  k86 }, \
-    { k90,  k91,  k92,  k93,  k94,  ___,  k96 }, \
-    { kA0,  kA1,  kA2,  kA3,  kA4,  ___,  ___ }, \
-    { kB0,  kB1,  kB2,  kB3,  ___,  ___,  ___ }, \
-    { kC0,  kC1,  kC2,  kC3,  kC4,  kC5,  ___ }, \
-    { kD0,  kD1,  kD2,  kD3,  kD4,  kD5,  ___ }, \
-    { kE0,  kE1,  kE2,  kE3,  kE4,  kE5,  ___ }, \
-}
-
-/*  ---------------- LEFT HAND -----------------   ---------------- RIGHT HAND ---------------- */
-#define LAYOUT_pretty(                                                                           \
-    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,   kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5,  \
-    k00, k10, k20, k30, k40, k50,                            k60, k70, k80, k90, kA0, kB0,       \
-    k01, k11, k21, k31, k41, k51,                            k61, k71, k81, k91, kA1, kB1,       \
-    k02, k12, k22, k32, k42, k52,                            k62, k72, k82, k92, kA2, kB2,       \
-    k03, k13, k23, k33, k43, k53,                            k63, k73, k83, k93, kA3, kB3,       \
-         k14, k24, k34, k54,                                      k64, k84, k94, kA4,            \
-                             k56, k55,                  k96, k85,                                \
-                                  k35,                  k86,                                     \
-                        k36, k46, k25,                  k66, k75, k65                            \
-) {                                              \
-    { k00,  k01,  k02,  k03,  ___,  ___,  ___ }, \
-    { k10,  k11,  k12,  k13,  k14,  ___,  ___ }, \
-    { k20,  k21,  k22,  k23,  k24,  k25,  ___ }, \
-    { k30,  k31,  k32,  k33,  k34,  k35,  k36 }, \
-    { k40,  k41,  k42,  k43,  ___,  ___,  k46 }, \
-    { k50,  k51,  k52,  k53,  k54,  k55,  k56 }, \
-    { k60,  k61,  k62,  k63,  k64,  k65,  k66 }, \
-    { k70,  k71,  k72,  k73,  ___,  k75,  ___ }, \
-    { k80,  k81,  k82,  k83,  k84,  k85,  k86 }, \
-    { k90,  k91,  k92,  k93,  k94,  ___,  k96 }, \
-    { kA0,  kA1,  kA2,  kA3,  kA4,  ___,  ___ }, \
-    { kB0,  kB1,  kB2,  kB3,  ___,  ___,  ___ }, \
-    { kC0,  kC1,  kC2,  kC3,  kC4,  kC5,  ___ }, \
-    { kD0,  kD1,  kD2,  kD3,  kD4,  kD5,  ___ }, \
-    { kE0,  kE1,  kE2,  kE3,  kE4,  kE5,  ___ }  \
-}