Move remaining `LAYOUT_all`s to data driven (#20463)

2 files changed, 140 insertions, 189 deletions

diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json
index 78c020d65b..4841a369d6 100644
--- a/keyboards/lazydesigners/the40/info.json
+++ b/keyboards/lazydesigners/the40/info.json
@@ -25,145 +25,155 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K000 (D0,F4)", "x":0, "y":0},
-                {"label":"K001 (D0,F6)", "x":1, "y":0},
-                {"label":"K002 (D0,F7)", "x":2, "y":0},
-                {"label":"K003 (D0,B5)", "x":3, "y":0},
-                {"label":"K004 (D0,B4)", "x":4, "y":0},
-                {"label":"K005 (D0,D7)", "x":5, "y":0},
-                {"label":"K006 (D0,D6)", "x":6, "y":0},
-                {"label":"K007 (D0,D4)", "x":7, "y":0},
-                {"label":"K008 (D0,D5)", "x":8, "y":0},
-                {"label":"K009 (D0,D3)", "x":9, "y":0},
-                {"label":"K010 (D0,D2)", "x":10, "y":0},
-                {"label":"K011 (D0,B0)", "x":11, "y":0},
-                {"label":"K100 (D1,F4)", "x":0, "y":1, "w":1.25},
-                {"label":"K101 (D1,F6)", "x":1.25, "y":1},
-                {"label":"K102 (D1,F7)", "x":2.25, "y":1},
-                {"label":"K103 (D1,B5)", "x":3.25, "y":1},
-                {"label":"K104 (D1,B4)", "x":4.25, "y":1},
-                {"label":"K105 (D1,D7)", "x":5.25, "y":1},
-                {"label":"K106 (D1,D6)", "x":6.25, "y":1},
-                {"label":"K107 (D1,D4)", "x":7.25, "y":1},
-                {"label":"K108 (D1,D5)", "x":8.25, "y":1},
-                {"label":"K109 (D1,D3)", "x":9.25, "y":1},
-                {"label":"K110 (D1,D2)", "x":10.25, "y":1, "w":1.75},
-                {"label":"K200 (B6,F4)", "x":0, "y":2, "w":1.75},
-                {"label":"K201 (B6,F6)", "x":1.75, "y":2},
-                {"label":"K202 (B6,F7)", "x":2.75, "y":2},
-                {"label":"K203 (B6,B5)", "x":3.75, "y":2},
-                {"label":"K204 (B6,B4)", "x":4.75, "y":2},
-                {"label":"K205 (B6,D7)", "x":5.75, "y":2},
-                {"label":"K206 (B6,D6)", "x":6.75, "y":2},
-                {"label":"K207 (B6,D4)", "x":7.75, "y":2},
-                {"label":"K208 (B6,D5)", "x":8.75, "y":2},
-                {"label":"K209 (B6,D3)", "x":9.75, "y":2},
-                {"label":"K210 (B6,D2)", "x":10.75, "y":2, "w":1.25},
-                {"label":"K300 (F5,F4)", "x":0, "y":3, "w":1.25},
-                {"label":"K301 (F5,F6)", "x":1.25, "y":3},
-                {"label":"K302 (F5,F7)", "x":2.25, "y":3, "w":1.25},
-                {"label":"K304 (F5,B4)", "x":3.5, "y":3, "w":2.25},
-                {"label":"K306 (F5,D6)", "x":5.75, "y":3, "w":2.75},
-                {"label":"K308 (F5,D5)", "x":8.5, "y":3, "w":1.25},
-                {"label":"K309 (F5,D3)", "x":9.75, "y":3},
-                {"label":"K310 (F5,D2)", "x":10.75, "y":3, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"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},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_ortho": {
             "layout": [
-                {"label":"K000 (D0,F4)", "x":0, "y":0},
-                {"label":"K001 (D0,F6)", "x":1, "y":0},
-                {"label":"K002 (D0,F7)", "x":2, "y":0},
-                {"label":"K003 (D0,B5)", "x":3, "y":0},
-                {"label":"K004 (D0,B4)", "x":4, "y":0},
-                {"label":"K005 (D0,D7)", "x":5, "y":0},
-                {"label":"K006 (D0,D6)", "x":6, "y":0},
-                {"label":"K007 (D0,D4)", "x":7, "y":0},
-                {"label":"K008 (D0,D5)", "x":8, "y":0},
-                {"label":"K009 (D0,D3)", "x":9, "y":0},
-                {"label":"K010 (D0,D2)", "x":10, "y":0},
-                {"label":"K011 (D0,B0)", "x":11, "y":0},
-                {"label":"K100 (D1,F4)", "x":0, "y":1},
-                {"label":"K101 (D1,F6)", "x":1, "y":1},
-                {"label":"K102 (D1,F7)", "x":2, "y":1},
-                {"label":"K103 (D1,B5)", "x":3, "y":1},
-                {"label":"K104 (D1,B4)", "x":4, "y":1},
-                {"label":"K105 (D1,D7)", "x":5, "y":1},
-                {"label":"K106 (D1,D6)", "x":6, "y":1},
-                {"label":"K107 (D1,D4)", "x":7, "y":1},
-                {"label":"K108 (D1,D5)", "x":8, "y":1},
-                {"label":"K109 (D1,D3)", "x":9, "y":1},
-                {"label":"K110 (D1,D2)", "x":10, "y":1},
-                {"label":"K111 (D1,B0)", "x":11, "y":1},
-                {"label":"K200 (B6,F4)", "x":0, "y":2},
-                {"label":"K201 (B6,F6)", "x":1, "y":2},
-                {"label":"K202 (B6,F7)", "x":2, "y":2},
-                {"label":"K203 (B6,B5)", "x":3, "y":2},
-                {"label":"K204 (B6,B4)", "x":4, "y":2},
-                {"label":"K205 (B6,D7)", "x":5, "y":2},
-                {"label":"K206 (B6,D6)", "x":6, "y":2},
-                {"label":"K207 (B6,D4)", "x":7, "y":2},
-                {"label":"K208 (B6,D5)", "x":8, "y":2},
-                {"label":"K209 (B6,D3)", "x":9, "y":2},
-                {"label":"K210 (B6,D2)", "x":10, "y":2},
-                {"label":"K211 (B6,B0)", "x":11, "y":2},
-                {"label":"K300 (F5,F4)", "x":0, "y":3},
-                {"label":"K301 (F5,F6)", "x":1, "y":3},
-                {"label":"K302 (F5,F7)", "x":2, "y":3},
-                {"label":"K303 (F5,B5)", "x":3, "y":3},
-                {"label":"K304 (F5,B4)", "x":4, "y":3},
-                {"label":"K305 (F5,D7)", "x":5, "y":3},
-                {"label":"K306 (F5,D6)", "x":6, "y":3},
-                {"label":"K307 (F5,D4)", "x":7, "y":3},
-                {"label":"K308 (F5,D5)", "x":8, "y":3},
-                {"label":"K309 (F5,D3)", "x":9, "y":3},
-                {"label":"K310 (F5,D2)", "x":10, "y":3},
-                {"label":"K311 (F5,B0)", "x":11, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"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},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"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": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"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": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_wkl": {
             "layout": [
-                {"label":"K000 (D0,F4)", "x":0, "y":0},
-                {"label":"K001 (D0,F6)", "x":1, "y":0},
-                {"label":"K002 (D0,F7)", "x":2, "y":0},
-                {"label":"K003 (D0,B5)", "x":3, "y":0},
-                {"label":"K004 (D0,B4)", "x":4, "y":0},
-                {"label":"K005 (D0,D7)", "x":5, "y":0},
-                {"label":"K006 (D0,D6)", "x":6, "y":0},
-                {"label":"K007 (D0,D4)", "x":7, "y":0},
-                {"label":"K008 (D0,D5)", "x":8, "y":0},
-                {"label":"K009 (D0,D3)", "x":9, "y":0},
-                {"label":"K010 (D0,D2)", "x":10, "y":0},
-                {"label":"K011 (D0,B0)", "x":11, "y":0},
-                {"label":"K100 (D1,F4)", "x":0, "y":1, "w":1.25},
-                {"label":"K101 (D1,F6)", "x":1.25, "y":1},
-                {"label":"K102 (D1,F7)", "x":2.25, "y":1},
-                {"label":"K103 (D1,B5)", "x":3.25, "y":1},
-                {"label":"K104 (D1,B4)", "x":4.25, "y":1},
-                {"label":"K105 (D1,D7)", "x":5.25, "y":1},
-                {"label":"K106 (D1,D6)", "x":6.25, "y":1},
-                {"label":"K107 (D1,D4)", "x":7.25, "y":1},
-                {"label":"K108 (D1,D5)", "x":8.25, "y":1},
-                {"label":"K109 (D1,D3)", "x":9.25, "y":1},
-                {"label":"K110 (D1,D2)", "x":10.25, "y":1, "w":1.75},
-                {"label":"K200 (B6,F4)", "x":0, "y":2, "w":1.75},
-                {"label":"K201 (B6,F6)", "x":1.75, "y":2},
-                {"label":"K202 (B6,F7)", "x":2.75, "y":2},
-                {"label":"K203 (B6,B5)", "x":3.75, "y":2},
-                {"label":"K204 (B6,B4)", "x":4.75, "y":2},
-                {"label":"K205 (B6,D7)", "x":5.75, "y":2},
-                {"label":"K206 (B6,D6)", "x":6.75, "y":2},
-                {"label":"K207 (B6,D4)", "x":7.75, "y":2},
-                {"label":"K208 (B6,D5)", "x":8.75, "y":2},
-                {"label":"K209 (B6,D3)", "x":9.75, "y":2},
-                {"label":"K210 (B6,D2)", "x":10.75, "y":2, "w":1.25},
-                {"label":"K300 (F5,F4)", "x":0, "y":3, "w":1.25},
-                {"label":"K302 (F5,F7)", "x":2.25, "y":3, "w":1.25},
-                {"label":"K304 (F5,B4)", "x":3.5, "y":3, "w":2.25},
-                {"label":"K306 (F5,D6)", "x":5.75, "y":3, "w":2.75},
-                {"label":"K308 (F5,D5)", "x":8.5, "y":3, "w":1.25},
-                {"label":"K310 (F5,D2)", "x":10.75, "y":3, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"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},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25}
             ]
         }
     }
+
 }
diff --git a/keyboards/lazydesigners/the40/the40.h b/keyboards/lazydesigners/the40/the40.h
deleted file mode 100644
index 26cc68dd5c..0000000000
--- a/keyboards/lazydesigners/the40/the40.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- Copyright 2020 LAZYDESIGNERS
-
- 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"
-
-#define LAYOUT_all( \
-    K000,    K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011,  \
-    K100,    K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,          \
-    K200,    K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,          \
-    K300,    K301,   K302,           K304,           K306,           K308,   K309,   K310           \
-) \
-{ \
-  { K000,   K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011  }, \
-  { K100,   K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,   KC_NO }, \
-  { K200,   K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,   KC_NO }, \
-  { K300,   K301,   K302,   KC_NO,  K304,   KC_NO,  K306,   KC_NO,  K308,   K309,   K310,   KC_NO }, \
-}
-
-#define LAYOUT_ortho( \
-    K000,    K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011,  \
-    K100,    K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,   K111,  \
-    K200,    K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,   K211,  \
-    K300,    K301,   K302,   K303,   K304,   K305,   K306,   K307,   K308,   K309,   K310,   K311   \
-) \
-{ \
-  { K000,   K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011  }, \
-  { K100,   K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,   K111  }, \
-  { K200,   K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,   K211  }, \
-  { K300,   K301,   K302,   K303,   K304,   K305,   K306,   K307,   K308,   K309,   K310,   K311  }, \
-}
-
-#define LAYOUT_wkl( \
-    K000,    K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011,  \
-    K100,    K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,          \
-    K200,    K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,          \
-    K300,            K302,           K304,           K306,           K308,           K310           \
-) \
-{ \
-  { K000,   K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011  }, \
-  { K100,   K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,   KC_NO }, \
-  { K200,   K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,   KC_NO }, \
-  { K300,   KC_NO,  K302,   KC_NO,  K304,   KC_NO,  K306,   KC_NO,  K308,   KC_NO,  K310,   KC_NO }, \
-}