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

2 files changed, 61 insertions, 103 deletions

diff --git a/keyboards/slz40/info.json b/keyboards/slz40/info.json
index 25d250e848..952f6c74f0 100644
--- a/keyboards/slz40/info.json
+++ b/keyboards/slz40/info.json
@@ -18,69 +18,68 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "1", "x": 0.5, "y": 0},
-                {"label": "2", "x": 1.5, "y": 0},
-                {"label": "3", "x": 2.5, "y": 0},
-                {"label": "4", "x": 3.5, "y": 0},
-                {"label": "5", "x": 4.5, "y": 0},
-                {"label": "6", "x": 5.5, "y": 0},
-                {"label": "7", "x": 6.5, "y": 0},
-                {"label": "8", "x": 7.5, "y": 0},
-                {"label": "9", "x": 8.5, "y": 0},
-                {"label": "0", "x": 9.5, "y": 0},
-                {"label": "-", "x": 10.5, "y": 0},
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
 
-                {"label": "esc", "x": 0, "y": 1},
-                {"label": "q", "x": 1, "y": 1},
-                {"label": "w", "x": 2, "y": 1},
-                {"label": "e", "x": 3, "y": 1},
-                {"label": "r", "x": 4, "y": 1},
-                {"label": "t", "x": 5, "y": 1},
-                {"label": "y", "x": 6, "y": 1},
-                {"label": "u", "x": 7, "y": 1},
-                {"label": "i", "x": 8, "y": 1},
-                {"label": "o", "x": 9, "y": 1},
-                {"label": "p", "x": 10, "y": 1},
-                {"label": "/", "x": 11, "y": 1},
-                {"label": "bs", "x": 12, "y": 1},
-                
-                {"label": "tab", "x": 0, "y": 2, "w": 1.25},
-                {"label": "a", "x": 1.25, "y": 2},
-                {"label": "s", "x": 2.25, "y": 2},
-                {"label": "d", "x": 3.25, "y": 2}, 
-                {"label": "f", "x": 4.25, "y": 2},
-                {"label": "g", "x": 5.25, "y": 2},
-                {"label": "h", "x": 6.25, "y": 2},
-                {"label": "j", "x": 7.25, "y": 2},
-                {"label": "k", "x": 8.25, "y": 2}, 
-                {"label": "l", "x": 9.25, "y": 2},
-                {"label": ";", "x": 10.25, "y": 2},
-                {"label": "enter", "x": 11.25, "y": 2, "w": 1.75},
-                
-                {"label": "lshift", "x": 0, "y": 3, "w": 1.75},
-                {"label": "z", "x": 1.75, "y": 3}, 
-                {"label": "x", "x": 2.75, "y": 3},
-                {"label": "c", "x": 3.75, "y": 3},
-                {"label": "v", "x": 4.75, "y": 3}, 
-                {"label": "b", "x": 5.75, "y": 3},
-                {"label": "n", "x": 6.75, "y": 3},
-                {"label": "m", "x": 7.75, "y": 3}, 
-                {"label": ",", "x": 8.75, "y": 3},
-                {"label": ".", "x": 9.75, "y": 3},
-                {"label": "up", "x": 10.75, "y": 3}, 
-                {"label": "rshift", "x": 11.75, "y": 3, "w": 1.25},
-                
-                {"label": "ctrl", "x": 0, "y": 4, "w": 1.25},
-                {"label": "qui", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "alt", "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "del", "x": 3.75, "y": 4, "w": 1.25},
-                {"label": "enter", "x": 5, "y": 4, "w": 1.75},
-                {"label": "space", "x": 6.75, "y": 4, "w": 1.75},
-                {"label": "'", "x": 8.5, "y": 4, "w": 1.5},
-                {"label": "left", "x": 10, "y": 4},
-                {"label": "down", "x": 11, "y": 4},
-                {"label": "right", "x": 12, "y": 4}
-                
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"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},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [0, 11], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.75},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.75},
+                {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4}
             ]
         }
     }
diff --git a/keyboards/slz40/slz40.h b/keyboards/slz40/slz40.h
deleted file mode 100644
index 88e7178c62..0000000000
--- a/keyboards/slz40/slz40.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 SithLord
- *
- * 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,	\
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k0b, k1b,    \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,	\
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,	\
-	k40, k41, k42, k43, k44,      k46,      k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03,  k04, k05,   k06,  k07,  k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13,  k14, k15,   k16,  k17,  k18, k19, k1a, k1b },  \
-	{ k20, k21, k22, k23,  k24, k25,   k26,  k27,  k28, k29, k2a, k2b },  \
-	{ k30, k31, k32, k33,  k34, k35,   k36,  k37,  k38, k39, k3a, k3b },  \
-	{ k40, k41, k42, k43,  k44, KC_NO, k46, KC_NO, k48, k49, k4a, k4b }  \
-}