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

2 files changed, 100 insertions, 136 deletions

diff --git a/keyboards/dtisaac/dtisaac01/dtisaac01.h b/keyboards/dtisaac/dtisaac01/dtisaac01.h
deleted file mode 100644
index e017c65700..0000000000
--- a/keyboards/dtisaac/dtisaac01/dtisaac01.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 DTIsaac
- *
- * 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( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K058, K061, K062, K063, K064, K065, K066, \
-	K010, K011, K012, K013, K014, K015, K016, K017, K018, K068, K060, K071, K072, K073, K074, K075, K076, \
-	K020, K021, K022, K023, K024, K025, K026, K027, K028, K078, K070, K081, K082, K083, K084, K085, K086, \
-	K030, K031, K032, K033, K034, K035, K036, K037, K038, K088, K080, K091,       K093, \
-	K040,       K042, K043, K044, K045, K046, K047, K048, K098, K090, K101,       K103,       K105, \
-	K050, K051, K052,                   K056,       			K100, K111, K112, K113, K114, K115, K116 \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \
-	{ K040,  KC_NO, K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \
-	{ K050,  K051,  K052,  KC_NO, KC_NO, KC_NO, K056,  KC_NO, K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, K068 }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, K078 }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
-	{ K090,  K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, KC_NO, K098 }, \
-	{ K100,  K101,  KC_NO, K103,  KC_NO, K105,  KC_NO, KC_NO, KC_NO }, \
-	{ KC_NO, K111,  K112,  K113,  K114,  K115,  K116,  KC_NO, KC_NO }  \
-}
diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json
index 1d762fd1db..8894e261be 100644
--- a/keyboards/dtisaac/dtisaac01/info.json
+++ b/keyboards/dtisaac/dtisaac01/info.json
@@ -27,93 +27,106 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K000", "x":0, "y":0}, 
-                {"label":"K001", "x":2, "y":0}, 
-                {"label":"K002", "x":3, "y":0}, 
-                {"label":"K003", "x":4, "y":0}, 
-                {"label":"K004", "x":5, "y":0}, 
-                {"label":"K005", "x":6.5, "y":0}, 
-                {"label":"K006", "x":7.5, "y":0}, 
-                {"label":"K007", "x":8.5, "y":0}, 
-                {"label":"K008", "x":9.5, "y":0}, 
-                {"label":"K058", "x":11, "y":0}, 
-                {"label":"K061", "x":12, "y":0}, 
-                {"label":"K062", "x":13, "y":0},
-				{"label":"K063", "x":14, "y":0},
-				{"label":"K064", "x":15.25, "y":0},
-				{"label":"K065", "x":16.25, "y":0},
-				{"label":"K066", "x":17.25, "y":0},
-				{"label":"K010", "x":0, "y":1.5},
-				{"label":"K011", "x":1, "y":1.5},
-				{"label":"K012", "x":2, "y":1.5},
-				{"label":"K013", "x":3, "y":1.5},
-				{"label":"K014", "x":4, "y":1.5},
-				{"label":"K015", "x":5, "y":1.5},
-				{"label":"K016", "x":6, "y":1.5},
-				{"label":"K017", "x":7, "y":1.5},
-				{"label":"K018", "x":8, "y":1.5},
-				{"label":"K068", "x":9, "y":1.5},
-				{"label":"K060", "x":10, "y":1.5},
-				{"label":"K071", "x":11, "y":1.5},
-				{"label":"K072", "x":12, "y":1.5},
-				{"label":"K073", "x":13, "y":1.5, "w":2},
-				{"label":"K074", "x":15.25, "y":1.5},
-				{"label":"K075", "x":16.25, "y":1.5},
-				{"label":"K076", "x":17.25, "y":1.5},
-				{"label":"K020", "x":0, "y":2.5, "w":1.5},
-				{"label":"K021", "x":1.5, "y":2.5},
-				{"label":"K022", "x":2.5, "y":2.5},
-				{"label":"K023", "x":3.5, "y":2.5},
-				{"label":"K024", "x":4.5, "y":2.5},
-				{"label":"K025", "x":5.5, "y":2.5},
-				{"label":"K026", "x":6.5, "y":2.5},
-				{"label":"K027", "x":7.5, "y":2.5},
-				{"label":"K028", "x":8.5, "y":2.5},
-				{"label":"K078", "x":9.5, "y":2.5},
-				{"label":"K070", "x":10.5, "y":2.5},
-				{"label":"K081", "x":11.5, "y":2.5},
-				{"label":"K082", "x":12.5, "y":2.5},
-				{"label":"K083", "x":13.5, "y":2.5, "w":1.5},
-				{"label":"K084", "x":15.25, "y":2.5},
-				{"label":"K085", "x":16.25, "y":2.5},
-				{"label":"K086", "x":17.25, "y":2.5},
-                {"label":"K030", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"K031", "x":1.75, "y":3.5}, 
-                {"label":"K032", "x":2.75, "y":3.5}, 
-                {"label":"K033", "x":3.75, "y":3.5}, 
-                {"label":"K034", "x":4.75, "y":3.5}, 
-                {"label":"K035", "x":5.75, "y":3.5}, 
-                {"label":"K036", "x":6.75, "y":3.5}, 
-                {"label":"K037", "x":7.75, "y":3.5}, 
-                {"label":"K038", "x":8.75, "y":3.5}, 
-                {"label":"K088", "x":9.75, "y":3.5}, 
-				{"label":"K080", "x":10.75, "y":3.5},
-				{"label":"K091", "x":11.75, "y":3.5},
-                {"label":"K093", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K040", "x":0, "y":4.5, "w":2.25}, 
-                {"label":"K042", "x":2.25, "y":4.5}, 
-                {"label":"K043", "x":3.25, "y":4.5}, 
-                {"label":"K044", "x":4.25, "y":4.5}, 
-                {"label":"K045", "x":5.25, "y":4.5},
-                {"label":"K046", "x":6.25, "y":4.5},
-                {"label":"K047", "x":7.25, "y":4.5}, 
-                {"label":"K048", "x":8.25, "y":4.5},
-                {"label":"K098", "x":9.25, "y":4.5}, 
-                {"label":"K090", "x":10.25, "y":4.5}, 
-				{"label":"K101", "x":11.25, "y":4.5},
-                {"label":"K103", "x":12.25, "y":4.5, "w":2.75}, 
-				{"label":"K105", "x":16.25, "y":4.5},
-                {"label":"K050", "x":0, "y":5.5, "w":1.25}, 
-                {"label":"K051", "x":1.25, "y":5.5, "w":1.25}, 
-                {"label":"K052", "x":2.5, "y":5.5, "w":1.25}, 
-                {"label":"K056", "x":3.75, "y":5.5, "w":6.25}, 
-				{"label":"K100", "x":10, "y":5.5, "w":1.25}, 
-                {"label":"K111", "x":11.25, "y":5.5, "w":1.25}, 
-                {"label":"K112", "x":12.5, "y":5.5, "w":1.25}, 
-                {"label":"K113", "x":13.75, "y":5.5, "w":1.25},
-				{"label":"K114", "x":15.25, "y":5.5}, 
-				{"label":"K115", "x":16.25, "y":5.5}, 
-				{"label":"K116", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [5, 8], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [6, 8], "x": 9, "y": 1.5},
+                {"matrix": [6, 0], "x": 10, "y": 1.5},
+                {"matrix": [7, 1], "x": 11, "y": 1.5},
+                {"matrix": [7, 2], "x": 12, "y": 1.5},
+                {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [7, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [7, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [7, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 9.5, "y": 2.5},
+                {"matrix": [7, 0], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [8, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [8, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [8, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [8, 8], "x": 9.75, "y": 3.5},
+                {"matrix": [8, 0], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [9, 0], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 1], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 3], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [10, 5], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [10, 0], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 2], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 3], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [11, 6], "x": 17.25, "y": 5.5}
             ]
         }
     }