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

2 files changed, 114 insertions, 531 deletions

diff --git a/keyboards/takashicompany/heavy_left/heavy_left.h b/keyboards/takashicompany/heavy_left/heavy_left.h
deleted file mode 100644
index a54f88b303..0000000000
--- a/keyboards/takashicompany/heavy_left/heavy_left.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 takashicompany
- *
- * 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 is 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( \
-    l06, l07, l08, l09, l00, l01, l02, l03, l04, l05, r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, \
-    l16, l17, l18, l19, l10, l11, l12, l13, l14, l15, r10, r11, r12, r13, r14, r15, r16, r17, r18, \
-    l26, l27, l28, l29, l20, l21, l22, l23, l24, l25, r20, r21, r22, r23, r24, r25, r26, r27,      \
-    l36, l37, l38, l39, l30, l31, l32, l33, l34, l35, r30, r31, r32, r33, r34, r35, r36, r37, r38, \
-    l46, l47, l48, l49, l40, l41, l42, l43, l44, l45, r40, r41, r42, r43, r44, r45, r46, r47, r48  \
-) { \
-    { l00, l01, l02, l03, l04, l05, l06, l07, l08, l09   }, \
-    { l10, l11, l12, l13, l14, l15, l16, l17, l18, l19   }, \
-    { l20, l21, l22, l23, l24, l25, l26, l27, l28, l29   }, \
-    { l30, l31, l32, l33, l34, l35, l36, l37, l38, l39   }, \
-    { l40, l41, l42, l43, l44, l45, l46, l47, l48, l49   }, \
-    { r00, r01, r02, r03, r04, r05, r06, r07, r09, KC_NO }, \
-    { r10, r11, r12, r13, r14, r15, r16, r08, r18, KC_NO }, \
-    { r20, r21, r22, r23, r24, r25, r26, r17, r27, KC_NO }, \
-    { r30, r31, r32, r33, r34, r35, r36, r37, r38, KC_NO }, \
-    { r40, r41, r42, r43, r44, r45, r46, r47, r48, KC_NO }  \
-}
diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json
index 95ecb65e1b..a48fceb8d1 100644
--- a/keyboards/takashicompany/heavy_left/info.json
+++ b/keyboards/takashicompany/heavy_left/info.json
@@ -24,491 +24,120 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label": "24",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "25",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "26",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "27",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 4.25,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 5.25,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 6.25,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 7.25,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 8.25,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 9.25,
-                    "y": 0
-                },
-                {
-                    "label": "44",
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "label": "45",
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "label": "46",
-                    "x": 12.75,
-                    "y": 0
-                },
-                {
-                    "label": "47",
-                    "x": 13.75,
-                    "y": 0
-                },
-                {
-                    "label": "48",
-                    "x": 14.75,
-                    "y": 0
-                },
-                {
-                    "label": "49",
-                    "x": 15.75,
-                    "y": 0
-                },
-                {
-                    "label": "50",
-                    "x": 16.75,
-                    "y": 0
-                },
-                {
-                    "label": "51",
-                    "x": 17.75,
-                    "y": 0
-                },
-                {
-                    "label": "52",
-                    "x": 18.75,
-                    "y": 0
-                },
-                {
-                    "label": "82",
-                    "x": 20,
-                    "y": 0
-                },
-                {
-                    "label": "28",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "29",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "30",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "31",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "201",
-                    "x": 4.25,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "7",
-                    "x": 5.75,
-                    "y": 1
-                },
-                {
-                    "label": "8",
-                    "x": 6.75,
-                    "y": 1
-                },
-                {
-                    "label": "9",
-                    "x": 7.75,
-                    "y": 1
-                },
-                {
-                    "label": "10",
-                    "x": 8.75,
-                    "y": 1
-                },
-                {
-                    "label": "11",
-                    "x": 9.75,
-                    "y": 1
-                },
-                {
-                    "label": "53",
-                    "x": 11.25,
-                    "y": 1
-                },
-                {
-                    "label": "54",
-                    "x": 12.25,
-                    "y": 1
-                },
-                {
-                    "label": "55",
-                    "x": 13.25,
-                    "y": 1
-                },
-                {
-                    "label": "56",
-                    "x": 14.25,
-                    "y": 1
-                },
-                {
-                    "label": "57",
-                    "x": 15.25,
-                    "y": 1
-                },
-                {
-                    "label": "58",
-                    "x": 16.25,
-                    "y": 1
-                },
-                {
-                    "label": "59",
-                    "x": 17.25,
-                    "y": 1
-                },
-                {
-                    "label": "901",
-                    "x": 18.5,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "label": "83",
-                    "x": 20,
-                    "y": 1
-                },
-                {
-                    "label": "32",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "33",
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "label": "34",
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "label": "35",
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "label": "301",
-                    "x": 4.25,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "12",
-                    "x": 6,
-                    "y": 2
-                },
-                {
-                    "label": "13",
-                    "x": 7,
-                    "y": 2
-                },
-                {
-                    "label": "14",
-                    "x": 8,
-                    "y": 2
-                },
-                {
-                    "label": "15",
-                    "x": 9,
-                    "y": 2
-                },
-                {
-                    "label": "16",
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "label": "60",
-                    "x": 11.5,
-                    "y": 2
-                },
-                {
-                    "label": "61",
-                    "x": 12.5,
-                    "y": 2
-                },
-                {
-                    "label": "62",
-                    "x": 13.5,
-                    "y": 2
-                },
-                {
-                    "label": "63",
-                    "x": 14.5,
-                    "y": 2
-                },
-                {
-                    "label": "64",
-                    "x": 15.5,
-                    "y": 2
-                },
-                {
-                    "label": "65",
-                    "x": 16.5,
-                    "y": 2
-                },
-                {
-                    "label": "66",
-                    "x": 17.5,
-                    "y": 2
-                },
-                {
-                    "label": "84",
-                    "x": 20,
-                    "y": 2
-                },
-                {
-                    "label": "36",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "37",
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "label": "38",
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "label": "39",
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "label": "601",
-                    "x": 4.25,
-                    "y": 3,
-                    "w": 2.25
-                },
-                {
-                    "label": "17",
-                    "x": 6.5,
-                    "y": 3
-                },
-                {
-                    "label": "18",
-                    "x": 7.5,
-                    "y": 3
-                },
-                {
-                    "label": "19",
-                    "x": 8.5,
-                    "y": 3
-                },
-                {
-                    "label": "20",
-                    "x": 9.5,
-                    "y": 3
-                },
-                {
-                    "label": "21",
-                    "x": 10.5,
-                    "y": 3
-                },
-                {
-                    "label": "67",
-                    "x": 11.75,
-                    "y": 3
-                },
-                {
-                    "label": "68",
-                    "x": 12.75,
-                    "y": 3
-                },
-                {
-                    "label": "69",
-                    "x": 13.75,
-                    "y": 3
-                },
-                {
-                    "label": "70",
-                    "x": 14.75,
-                    "y": 3
-                },
-                {
-                    "label": "71",
-                    "x": 15.75,
-                    "y": 3
-                },
-                {
-                    "label": "72",
-                    "x": 16.75,
-                    "y": 3
-                },
-                {
-                    "label": "73",
-                    "x": 17.75,
-                    "y": 3
-                },
-                {
-                    "label": "74",
-                    "x": 18.75,
-                    "y": 3
-                },
-                {
-                    "label": "85",
-                    "x": 20,
-                    "y": 3
-                },
-                {
-                    "label": "40",
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "41",
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "label": "42",
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "label": "43",
-                    "x": 3,
-                    "y": 4
-                },
-                {
-                    "label": "101",
-                    "x": 4.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "22",
-                    "x": 5.5,
-                    "y": 4
-                },
-                {
-                    "label": "102",
-                    "x": 6.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "23",
-                    "x": 7.75,
-                    "y": 4
-                },
-                {
-                    "label": "103",
-                    "x": 8.75,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "104",
-                    "x": 10,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "75",
-                    "x": 11.5,
-                    "y": 4
-                },
-                {
-                    "label": "105",
-                    "x": 12.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "76",
-                    "x": 13.75,
-                    "y": 4
-                },
-                {
-                    "label": "77",
-                    "x": 14.75,
-                    "y": 4
-                },
-                {
-                    "label": "78",
-                    "x": 15.75,
-                    "y": 4
-                },
-                {
-                    "label": "79",
-                    "x": 16.75,
-                    "y": 4
-                },
-                {
-                    "label": "80",
-                    "x": 17.75,
-                    "y": 4
-                },
-                {
-                    "label": "81",
-                    "x": 18.75,
-                    "y": 4
-                },
-                {
-                    "label": "86",
-                    "x": 20,
-                    "y": 4
-                }
+                {"matrix": [0, 6], "x": 0, "y": 0},
+                {"matrix": [0, 7], "x": 1, "y": 0},
+                {"matrix": [0, 8], "x": 2, "y": 0},
+                {"matrix": [0, 9], "x": 3, "y": 0},
+
+                {"matrix": [0, 0], "x": 4.25, "y": 0},
+                {"matrix": [0, 1], "x": 5.25, "y": 0},
+                {"matrix": [0, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [0, 5], "x": 9.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.75, "y": 0},
+                {"matrix": [5, 1], "x": 11.75, "y": 0},
+                {"matrix": [5, 2], "x": 12.75, "y": 0},
+                {"matrix": [5, 3], "x": 13.75, "y": 0},
+                {"matrix": [5, 4], "x": 14.75, "y": 0},
+                {"matrix": [5, 5], "x": 15.75, "y": 0},
+                {"matrix": [5, 6], "x": 16.75, "y": 0},
+                {"matrix": [5, 7], "x": 17.75, "y": 0},
+                {"matrix": [6, 7], "x": 18.75, "y": 0},
+
+                {"matrix": [5, 8], "x": 20, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 7], "x": 1, "y": 1},
+                {"matrix": [1, 8], "x": 2, "y": 1},
+                {"matrix": [1, 9], "x": 3, "y": 1},
+
+                {"matrix": [1, 0], "x": 4.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 5.75, "y": 1},
+                {"matrix": [1, 2], "x": 6.75, "y": 1},
+                {"matrix": [1, 3], "x": 7.75, "y": 1},
+                {"matrix": [1, 4], "x": 8.75, "y": 1},
+                {"matrix": [1, 5], "x": 9.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 11.25, "y": 1},
+                {"matrix": [6, 1], "x": 12.25, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 3], "x": 14.25, "y": 1},
+                {"matrix": [6, 4], "x": 15.25, "y": 1},
+                {"matrix": [6, 5], "x": 16.25, "y": 1},
+                {"matrix": [6, 6], "x": 17.25, "y": 1},
+                {"matrix": [7, 7], "x": 18.5, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 8], "x": 20, "y": 1},
+
+                {"matrix": [2, 6], "x": 0, "y": 2},
+                {"matrix": [2, 7], "x": 1, "y": 2},
+                {"matrix": [2, 8], "x": 2, "y": 2},
+                {"matrix": [2, 9], "x": 3, "y": 2},
+
+                {"matrix": [2, 0], "x": 4.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 6, "y": 2},
+                {"matrix": [2, 2], "x": 7, "y": 2},
+                {"matrix": [2, 3], "x": 8, "y": 2},
+                {"matrix": [2, 4], "x": 9, "y": 2},
+                {"matrix": [2, 5], "x": 10, "y": 2},
+
+                {"matrix": [7, 0], "x": 11.5, "y": 2},
+                {"matrix": [7, 1], "x": 12.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2},
+                {"matrix": [7, 3], "x": 14.5, "y": 2},
+                {"matrix": [7, 4], "x": 15.5, "y": 2},
+                {"matrix": [7, 5], "x": 16.5, "y": 2},
+                {"matrix": [7, 6], "x": 17.5, "y": 2},
+
+                {"matrix": [7, 8], "x": 20, "y": 2},
+
+                {"matrix": [3, 6], "x": 0, "y": 3},
+                {"matrix": [3, 7], "x": 1, "y": 3},
+                {"matrix": [3, 8], "x": 2, "y": 3},
+                {"matrix": [3, 9], "x": 3, "y": 3},
+
+                {"matrix": [3, 0], "x": 4.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 6.5, "y": 3},
+                {"matrix": [3, 2], "x": 7.5, "y": 3},
+                {"matrix": [3, 3], "x": 8.5, "y": 3},
+                {"matrix": [3, 4], "x": 9.5, "y": 3},
+                {"matrix": [3, 5], "x": 10.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 11.75, "y": 3},
+                {"matrix": [8, 1], "x": 12.75, "y": 3},
+                {"matrix": [8, 2], "x": 13.75, "y": 3},
+                {"matrix": [8, 3], "x": 14.75, "y": 3},
+                {"matrix": [8, 4], "x": 15.75, "y": 3},
+                {"matrix": [8, 5], "x": 16.75, "y": 3},
+                {"matrix": [8, 6], "x": 17.75, "y": 3},
+                {"matrix": [8, 7], "x": 18.75, "y": 3},
+
+                {"matrix": [8, 8], "x": 20, "y": 3},
+
+                {"matrix": [4, 6], "x": 0, "y": 4},
+                {"matrix": [4, 7], "x": 1, "y": 4},
+                {"matrix": [4, 8], "x": 2, "y": 4},
+                {"matrix": [4, 9], "x": 3, "y": 4},
+
+                {"matrix": [4, 0], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 5.5, "y": 4},
+                {"matrix": [4, 2], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 7.75, "y": 4},
+                {"matrix": [4, 4], "x": 8.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 11.5, "y": 4},
+                {"matrix": [9, 1], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13.75, "y": 4},
+                {"matrix": [9, 3], "x": 14.75, "y": 4},
+                {"matrix": [9, 4], "x": 15.75, "y": 4},
+                {"matrix": [9, 5], "x": 16.75, "y": 4},
+                {"matrix": [9, 6], "x": 17.75, "y": 4},
+                {"matrix": [9, 7], "x": 18.75, "y": 4},
+
+                {"matrix": [9, 8], "x": 20, "y": 4}
             ]
         }
     }