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

3 files changed, 39 insertions, 75 deletions

diff --git a/keyboards/takashicompany/endzone34/endzone34.c b/keyboards/takashicompany/endzone34/endzone34.c
index f96c6b3f35..403c4b7bb9 100644
--- a/keyboards/takashicompany/endzone34/endzone34.c
+++ b/keyboards/takashicompany/endzone34/endzone34.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "endzone34.h"
+#include "quantum.h"
 
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
     return OLED_ROTATION_270;
diff --git a/keyboards/takashicompany/endzone34/endzone34.h b/keyboards/takashicompany/endzone34/endzone34.h
deleted file mode 100644
index f3e5c88b63..0000000000
--- a/keyboards/takashicompany/endzone34/endzone34.h
+++ /dev/null
@@ -1,39 +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( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \
-                   k31, k32, k33, k34 \
-) { \
-    { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10 }, \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k20 }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k30 }, \
-    { KC_NO, KC_NO, KC_NO, k31, k32, k33, k34, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json
index e9c9437902..8eb5b4dd57 100644
--- a/keyboards/takashicompany/endzone34/info.json
+++ b/keyboards/takashicompany/endzone34/info.json
@@ -18,46 +18,49 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
-    "layouts": {
+   "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Q", "x":0, "y":0.5},
-                {"label":"W", "x":1, "y":0},
-                {"label":"E", "x":2, "y":0},
-                {"label":"R", "x":3, "y":0},
-                {"label":"T", "x":4, "y":0},
-                {"label":"Y", "x":7, "y":0},
-                {"label":"U", "x":8, "y":0},
-                {"label":"I", "x":9, "y":0},
-                {"label":"O", "x":10, "y":0},
-                {"label":"P", "x":11, "y":0.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"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},
 
-                {"label":"A", "x":0, "y":1.5},
-                {"label":"S", "x":1, "y":1},
-                {"label":"D", "x":2, "y":1},
-                {"label":"F", "x":3, "y":1},
-                {"label":"G", "x":4, "y":1},
-                {"label":"H", "x":7, "y":1},
-                {"label":"J", "x":8, "y":1},
-                {"label":"K", "x":9, "y":1},
-                {"label":"L", "x":10, "y":1},
-                {"label":"Enter", "x":11, "y":1.5},
+                {"matrix": [0, 5], "x": 7, "y": 0},
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0.5},
 
-                {"label":"Z", "x":0, "y":2.5},
-                {"label":"X", "x":1, "y":2},
-                {"label":"C", "x":2, "y":2},
-                {"label":"V", "x":3, "y":2},
-                {"label":"B", "x":4, "y":2},
-                {"label":"N", "x":7, "y":2},
-                {"label":"M", "x":8, "y":2},
-                {"label":", ", "x":9, "y":2},
-                {"label":".", "x":10, "y":2},
-                {"label":"Back Space", "x":11, "y":2.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"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},
 
-                {"label":"&dArr;", "x":4, "y":3},
-                {"label":"Tab", "x":5, "y":3},
-                {"label":"Space", "x":6, "y":3},
-                {"label":"&uArr;", "x":7, "y":3}
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"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": 7, "y": 2},
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2.5},
+
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3}
             ]
         }
     }