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

3 files changed, 57 insertions, 89 deletions

diff --git a/keyboards/ein_60/ein_60.c b/keyboards/ein_60/ein_60.c
index d15ad0cd52..60955eb8a3 100644
--- a/keyboards/ein_60/ein_60.c
+++ b/keyboards/ein_60/ein_60.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "ein_60.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/ein_60/ein_60.h b/keyboards/ein_60/ein_60.h
deleted file mode 100644
index 91bfe3acfd..0000000000
--- a/keyboards/ein_60/ein_60.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 klackygears
- *
- * 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( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,  \
-    K10, K11, K12, K13, K14, K15,      K17, K18, K19, K1A, K1B, K1C,  \
-    K20, K21, K22, K23, K24, K25,      K27, K28, K29, K2A, K2B, K2C,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C  \
-) { \
-    { K00, K01, K02, K03, K04, K05,   K06,   K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15,  KC_NO,  K17, K18, K19, K1A, K1B, K1C }, \
-    { K20, K21, K22, K23, K24, K25,  KC_NO,  K27, K28, K29, K2A, K2B, K2C }, \
-    { K30, K31, K32, K33, K34, K35,   K36,   K37, K38, K39, K3A, K3B, K3C } \
-}
diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json
index 0740a9273e..8da88c7987 100644
--- a/keyboards/ein_60/info.json
+++ b/keyboards/ein_60/info.json
@@ -30,59 +30,65 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Tab", "x":0, "y":1},
-                {"label":"Q", "x":1, "y":0.75},
-                {"label":"W", "x":2, "y":0.25},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0.25},
-                {"label":"T", "x":5, "y":0.5},
-                {"label":"Mute", "x":6.5, "y":0.5},
-                {"label":"Y", "x":8, "y":0.5},
-                {"label":"U", "x":9, "y":0.25},
-                {"label":"I", "x":10, "y":0},
-                {"label":"O", "x":11, "y":0.25},
-                {"label":"P", "x":12, "y":0.75},
-                {"label":"Backspace", "x":13, "y":1},
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
 
-                {"label":"Fn", "x":0, "y":2},
-                {"label":"A", "x":1, "y":1.75},
-                {"label":"S", "x":2, "y":1.25},
-                {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1.25},
-                {"label":"G", "x":5, "y":1.5},
-                {"label":"H", "x":8, "y":1.5},
-                {"label":"J", "x":9, "y":1.25},
-                {"label":"K", "x":10, "y":1},
-                {"label":"L", "x":11, "y":1.25},
-                {"label":";:", "x":12, "y":1.75},
-                {"label":"Enter", "x":13, "y":2},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.5},
 
-                {"label":"Shift", "x":0, "y":3},
-                {"label":"Z", "x":1, "y":2.75},
-                {"label":"X", "x":2, "y":2.25},
-                {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2.25},
-                {"label":"B", "x":5, "y":2.5},
-                {"label":"N", "x":8, "y":2.5},
-                {"label":"M", "x":9, "y":2.25},
-                {"label":",<", "x":10, "y":2},
-                {"label":".>", "x":11, "y":2.25},
-                {"label":"/?", "x":12, "y":2.75},
-                {"label":"'\"", "x":13, "y":3},
+                {"matrix": [0, 7], "x": 8, "y": 0.5},
+                {"matrix": [0, 8], "x": 9, "y": 0.25},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0.25},
+                {"matrix": [0, 11], "x": 12, "y": 0.75},
+                {"matrix": [0, 12], "x": 13, "y": 1},
 
-                {"label":"Ctrl", "x":0, "y":4},
-                {"label":"`~", "x":1, "y":3.75},
-                {"label":"GUI", "x":2, "y":3.25},
-                {"label":"Alt", "x":3, "y":3},
-                {"label":"Lower", "x":4, "y":3.25},
-                {"label":"Space", "x":5, "y":3.5},
-                {"label":"Space", "x":6.25, "y":3.5, "w":1.5},
-                {"label":"Space", "x":8, "y":3.5},
-                {"label":"Raise", "x":9, "y":3.25},
-                {"label":"\u2190", "x":10, "y":3},
-                {"label":"\u2193", "x":11, "y":3.25},
-                {"label":"\u2191", "x":12, "y":3.75},
-                {"label":"\u2192", "x":13, "y":4}
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 8], "x": 9, "y": 1.25},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1.25},
+                {"matrix": [1, 11], "x": 12, "y": 1.75},
+                {"matrix": [1, 12], "x": 13, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 8, "y": 2.5},
+                {"matrix": [2, 8], "x": 9, "y": 2.25},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2.25},
+                {"matrix": [2, 11], "x": 12, "y": 2.75},
+                {"matrix": [2, 12], "x": 13, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 3.75},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+                {"matrix": [3, 5], "x": 5, "y": 3.5},
+
+                {"matrix": [3, 6], "x": 6.25, "y": 3.5, "w": 1.5},
+
+                {"matrix": [3, 7], "x": 8, "y": 3.5},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.75},
+                {"matrix": [3, 12], "x": 13, "y": 4}
             ]
         }
     }