Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 115 insertions, 152 deletions

diff --git a/keyboards/lazydesigners/dimpleplus/dimpleplus.h b/keyboards/lazydesigners/dimpleplus/dimpleplus.h
deleted file mode 100644
index 93199dc6e0..0000000000
--- a/keyboards/lazydesigners/dimpleplus/dimpleplus.h
+++ /dev/null
@@ -1,47 +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( \
-      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,         \
-      K400,         K402,  K403,  K404,         K406,         K407,  K408,  K409          \
-) { \
-    { 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,  KC_NO },  \
-    { K400,  KC_NO, K402,  K403,  K404,  KC_NO, K406,  K407,  K408,  K409,  KC_NO, KC_NO }   \
-}
-
-#define LAYOUT_7u( \
-      K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,         \
-      K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  \
-      K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,         K211,  \
-      K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,         \
-      K400,         K402,         K404,                       K408,  K409                 \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010           },  \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,   K111   },  \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO,  K211   },  \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310           },  \
-    { K400,  KC_NO, K402,  KC_NO, K404,  KC_NO, KC_NO, KC_NO, K408,  K409,  KC_NO,  KC_NO  }   \
-}
diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json
index cf05ed2c9b..0d47a51f95 100644
--- a/keyboards/lazydesigners/dimpleplus/info.json
+++ b/keyboards/lazydesigners/dimpleplus/info.json
@@ -24,115 +24,125 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K000 (B3,F1)", "x":0, "y":0},
-                {"label":"K001 (B3,D5)", "x":1.5, "y":0},
-                {"label":"K002 (B3,F6)", "x":2.5, "y":0},
-                {"label":"K003 (B3,F7)", "x":3.5, "y":0},
-                {"label":"K004 (B3,C7)", "x":4.5, "y":0},
-                {"label":"K005 (B3,C6)", "x":5.5, "y":0},
-                {"label":"K006 (B3,B6)", "x":6.5, "y":0},
-                {"label":"K007 (B3,B5)", "x":7.5, "y":0},
-                {"label":"K008 (B3,B4)", "x":8.5, "y":0},
-                {"label":"K009 (B3,D7)", "x":9.5, "y":0},
-                {"label":"K010 (B3,D6)", "x":10.5, "y":0},
-                {"label":"K011 (B3,D4)", "x":11.5, "y":0},
-                {"label":"K100 (F0,F1)", "x":0, "y":1.25},
-                {"label":"K101 (F0,D5)", "x":1, "y":1.25},
-                {"label":"K102 (F0,F6)", "x":2, "y":1.25},
-                {"label":"K103 (F0,F7)", "x":3, "y":1.25},
-                {"label":"K104 (F0,C7)", "x":4, "y":1.25},
-                {"label":"K105 (F0,C6)", "x":5, "y":1.25},
-                {"label":"K106 (F0,B6)", "x":6, "y":1.25},
-                {"label":"K107 (F0,B5)", "x":7, "y":1.25},
-                {"label":"K108 (F0,B4)", "x":8, "y":1.25},
-                {"label":"K109 (F0,D7)", "x":9, "y":1.25},
-                {"label":"K110 (F0,D6)", "x":10, "y":1.25},
-                {"label":"K111 (F0,D4)", "x":11, "y":1.25, "w":1.5},
-                {"label":"K200 (E6,F1)", "x":0, "y":2.25, "w":1.25},
-                {"label":"K201 (E6,D5)", "x":1.25, "y":2.25},
-                {"label":"K202 (E6,F6)", "x":2.25, "y":2.25},
-                {"label":"K203 (E6,F7)", "x":3.25, "y":2.25},
-                {"label":"K204 (E6,C7)", "x":4.25, "y":2.25},
-                {"label":"K205 (E6,C6)", "x":5.25, "y":2.25},
-                {"label":"K206 (E6,B6)", "x":6.25, "y":2.25},
-                {"label":"K207 (E6,B5)", "x":7.25, "y":2.25},
-                {"label":"K208 (E6,B4)", "x":8.25, "y":2.25},
-                {"label":"K209 (E6,D7)", "x":9.25, "y":2.25},
-                {"label":"K210 (E6,D6)", "x":10.25, "y":2.25},
-                {"label":"K211 (E6,D4)", "x":11.25, "y":2.25, "w":1.25},
-                {"label":"K300 (F4,F1)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K301 (F4,D5)", "x":1.75, "y":3.25},
-                {"label":"K302 (F4,F6)", "x":2.75, "y":3.25},
-                {"label":"K303 (F4,F7)", "x":3.75, "y":3.25},
-                {"label":"K304 (F4,C7)", "x":4.75, "y":3.25},
-                {"label":"K305 (F4,C6)", "x":5.75, "y":3.25},
-                {"label":"K306 (F4,B6)", "x":6.75, "y":3.25},
-                {"label":"K307 (F4,B5)", "x":7.75, "y":3.25},
-                {"label":"K308 (F4,B4)", "x":8.75, "y":3.25},
-                {"label":"K309 (F4,D7)", "x":9.75, "y":3.25},
-                {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75},
-                {"label":"K400 (F5,F1)", "x":0.75, "y":4.25},
-                {"label":"K402 (F5,F6)", "x":1.75, "y":4.25},
-                {"label":"K403 (F5,F7)", "x":2.75, "y":4.25},
-                {"label":"K404 (F5,C7)", "x":3.75, "y":4.25, "w":2.25},
-                {"label":"K406 (F5,B6)", "x":6, "y":4.25, "w":2.75},
-                {"label":"K407 (F5,B5)", "x":8.75, "y":4.25},
-                {"label":"K408 (F5,B4)", "x":9.75, "y":4.25},
-                {"label":"K409 (F5,D7)", "x":10.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0, "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},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.25, "y": 2.25, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25, "w": 1.75},
+
+                {"matrix": [4, 0], "x": 0.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 1.75, "y": 4.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 4.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.75, "y": 4.25}
             ]
         },
         "LAYOUT_7u": {
             "layout": [
-                {"label":"K000 (B3,F1)", "x":0, "y":0},
-                {"label":"K001 (B3,D5)", "x":1.5, "y":0},
-                {"label":"K002 (B3,F6)", "x":2.5, "y":0},
-                {"label":"K003 (B3,F7)", "x":3.5, "y":0},
-                {"label":"K004 (B3,C7)", "x":4.5, "y":0},
-                {"label":"K005 (B3,C6)", "x":5.5, "y":0},
-                {"label":"K006 (B3,B6)", "x":6.5, "y":0},
-                {"label":"K007 (B3,B5)", "x":7.5, "y":0},
-                {"label":"K008 (B3,B4)", "x":8.5, "y":0},
-                {"label":"K009 (B3,D7)", "x":9.5, "y":0},
-                {"label":"K010 (B3,D6)", "x":10.5, "y":0, "w":2},
-                {"label":"K100 (F0,F1)", "x":0, "y":1.25},
-                {"label":"K101 (F0,D5)", "x":1, "y":1.25},
-                {"label":"K102 (F0,F6)", "x":2, "y":1.25},
-                {"label":"K103 (F0,F7)", "x":3, "y":1.25},
-                {"label":"K104 (F0,C7)", "x":4, "y":1.25},
-                {"label":"K105 (F0,C6)", "x":5, "y":1.25},
-                {"label":"K106 (F0,B6)", "x":6, "y":1.25},
-                {"label":"K107 (F0,B5)", "x":7, "y":1.25},
-                {"label":"K108 (F0,B4)", "x":8, "y":1.25},
-                {"label":"K109 (F0,D7)", "x":9, "y":1.25},
-                {"label":"K110 (F0,D6)", "x":10, "y":1.25},
-                {"label":"K111 (F0,D4)", "x":11, "y":1.25, "w":1.5},
-                {"label":"K200 (E6,F1)", "x":0, "y":2.25, "w":1.25},
-                {"label":"K201 (E6,D5)", "x":1.25, "y":2.25},
-                {"label":"K202 (E6,F6)", "x":2.25, "y":2.25},
-                {"label":"K203 (E6,F7)", "x":3.25, "y":2.25},
-                {"label":"K204 (E6,C7)", "x":4.25, "y":2.25},
-                {"label":"K205 (E6,C6)", "x":5.25, "y":2.25},
-                {"label":"K206 (E6,B6)", "x":6.25, "y":2.25},
-                {"label":"K207 (E6,B5)", "x":7.25, "y":2.25},
-                {"label":"K208 (E6,B4)", "x":8.25, "y":2.25},
-                {"label":"K209 (E6,D7)", "x":9.25, "y":2.25},
-                {"label":"K211 (E6,D4)", "x":10.25, "y":2.25, "w":2.25},
-                {"label":"K300 (F4,F1)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K301 (F4,D5)", "x":1.75, "y":3.25},
-                {"label":"K302 (F4,F6)", "x":2.75, "y":3.25},
-                {"label":"K303 (F4,F7)", "x":3.75, "y":3.25},
-                {"label":"K304 (F4,C7)", "x":4.75, "y":3.25},
-                {"label":"K305 (F4,C6)", "x":5.75, "y":3.25},
-                {"label":"K306 (F4,B6)", "x":6.75, "y":3.25},
-                {"label":"K307 (F4,B5)", "x":7.75, "y":3.25},
-                {"label":"K308 (F4,B4)", "x":8.75, "y":3.25},
-                {"label":"K309 (F4,D7)", "x":9.75, "y":3.25},
-                {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75},
-                {"label":"K400 (F5,F1)", "x":0.75, "y":4.25},
-                {"label":"K402 (F5,F6)", "x":1.75, "y":4.25},
-                {"label":"K404 (F5,C7)", "x":2.75, "y":4.25, "w":7},
-                {"label":"K408 (F5,B4)", "x":9.75, "y":4.25},
-                {"label":"K409 (F5,D7)", "x":10.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0, "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, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 10.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25, "w": 1.75},
+
+                {"matrix": [4, 0], "x": 0.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 1.75, "y": 4.25},
+                {"matrix": [4, 4], "x": 2.75, "y": 4.25, "w": 7},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.75, "y": 4.25}
             ]
         }
     }