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

2 files changed, 53 insertions, 86 deletions

diff --git a/keyboards/akb/eb46/eb46.h b/keyboards/akb/eb46/eb46.h
deleted file mode 100644
index 8dd5290b8d..0000000000
--- a/keyboards/akb/eb46/eb46.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 Elliot Powell
- *
- * 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 xxx KC_NO
-
-#define LAYOUT(\
-  k000, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b,\
-	k100, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,     \
-	k200, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,     \
-	k300, k30, k31, k32, k33,           k36,      k38, k39, k3a     \
-) \
-{ \
-  {k000, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b},\
-	{k100, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, xxx},\
-	{k200, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, xxx},\
-	{k300, k30, k31, k32, k33, xxx, xxx, k36, xxx, k38, k39, k3a, xxx} \
-}
diff --git a/keyboards/akb/eb46/info.json b/keyboards/akb/eb46/info.json
index d5c4312cc6..fafd42cd90 100644
--- a/keyboards/akb/eb46/info.json
+++ b/keyboards/akb/eb46/info.json
@@ -17,52 +17,59 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "Esc", "x": 1.25, "y": 0 },
-                { "label": "Q", "x": 2.25, "y": 0 },
-                { "label": "W", "x": 3.25, "y": 0 },
-                { "label": "E", "x": 4.25, "y": 0 },
-                { "label": "R", "x": 5.25, "y": 0 },
-                { "label": "T", "x": 6.25, "y": 0 },
-                { "label": "Y", "x": 7.25, "y": 0 },
-                { "label": "U", "x": 8.25, "y": 0 },
-                { "label": "I", "x": 9.25, "y": 0 },
-                { "label": "O", "x": 10.25, "y": 0 },
-                { "label": "P", "x": 11.25, "y": 0 },
-                { "label": "BackSpace", "x": 12.25, "y": 0 },
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "Tab", "x": 1.25, "y": 1, "w": 1.25 },
-                { "label": "A", "x": 2.5, "y": 1 },
-                { "label": "S", "x": 3.5, "y": 1 },
-                { "label": "D", "x": 4.5, "y": 1 },
-                { "label": "F", "x": 5.5, "y": 1 },
-                { "label": "G", "x": 6.5, "y": 1 },
-                { "label": "H", "x": 7.5, "y": 1 },
-                { "label": "J", "x": 8.5, "y": 1 },
-                { "label": "K", "x": 9.5, "y": 1 },
-                { "label": "L", "x": 10.5, "y": 1 },
-                { "label": "Enter", "x": 11.5, "y": 1, "w": 1.75 },
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "Shift", "x": 1.25, "y": 2, "w": 1.75 },
-                { "label": "Z", "x": 3, "y": 2 },
-                { "label": "X", "x": 4, "y": 2 },
-                { "label": "C", "x": 5, "y": 2 },
-                { "label": "V", "x": 6, "y": 2 },
-                { "label": "B", "x": 7, "y": 2 },
-                { "label": "N", "x": 8, "y": 2 },
-                { "label": "M", "x": 9, "y": 2 },
-                { "label": "<", "x": 10, "y": 2 },
-                { "label": ">", "x": 11, "y": 2 },
-                { "label": "RShift", "x": 12, "y": 2, "w": 1.25 },
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "Ctrl", "x": 1.25, "y": 3, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 3 },
-                { "label": "Alt", "x": 3.5, "y": 3, "w": 1.25 },
-                { "label": "FN0", "x": 4.75, "y": 3, "w": 2.25 },
-                { "label": "Space", "x": 7, "y": 3, "w": 2.75 },
-                { "label": "Menu", "x": 9.75, "y": 3 },
-                { "label": "RAlt", "x": 10.75, "y": 3, "w": 1.25 },
-                { "label": "Super", "x": 12.25, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"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, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 7, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 12.25, "y": 3}
             ]
         }
     }