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

2 files changed, 41 insertions, 83 deletions

diff --git a/keyboards/edinburgh41/edinburgh41.h b/keyboards/edinburgh41/edinburgh41.h
deleted file mode 100644
index 64cf9ff910..0000000000
--- a/keyboards/edinburgh41/edinburgh41.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2022 schwarzer-geiger
- *
- * 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 LAYOUT( \
-    K00, K01, K02, K03, K04, K05,      K30, K31, K32, K33, K34, K35, \
-    K10, K11, K12, K13, K14, K15,      K40, K41, K42, K43, K44, K45, \
-    K20, K21, K22, K23, K24, K25,      K50, K51, K52, K53, K54, K55, \
-                        K60, K61, K62, K63, K64 \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05 }, \
-    { K10, K11, K12, K13, K14, K15 }, \
-    { K20, K21, K22, K23, K24, K25 }, \
-    { K30, K31, K32, K33, K34, K35 }, \
-    { K40, K41, K42, K43, K44, K45 }, \
-    { K50, K51, K52, K53, K54, K55 }, \
-    { K60, K61, K62, K63, K64, KC_NO } \
-}
diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json
index 3c75c899fb..14e4950c4a 100644
--- a/keyboards/edinburgh41/info.json
+++ b/keyboards/edinburgh41/info.json
@@ -21,53 +21,53 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0.54},
-                {"label":"K01", "x":1, "y":0.36},
-                {"label":"K02", "x":2, "y":0.18},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0.18},
-                {"label":"K05", "x":5, "y":0.36},
+                {"matrix": [0, 0], "x": 0, "y": 0.54},
+                {"matrix": [0, 1], "x": 1, "y": 0.36},
+                {"matrix": [0, 2], "x": 2, "y": 0.18},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.18},
+                {"matrix": [0, 5], "x": 5, "y": 0.36},
 
-                {"label":"K30", "x":7, "y":0.36},
-                {"label":"K31", "x":8, "y":0.18},
-                {"label":"K32", "x":9, "y":0},
-                {"label":"K33", "x":10, "y":0.18},
-                {"label":"K34", "x":11, "y":0.36},
-                {"label":"K35", "x":12, "y":0.54},
+                {"matrix": [3, 0], "x": 7, "y": 0.36},
+                {"matrix": [3, 1], "x": 8, "y": 0.18},
+                {"matrix": [3, 2], "x": 9, "y": 0},
+                {"matrix": [3, 3], "x": 10, "y": 0.18},
+                {"matrix": [3, 4], "x": 11, "y": 0.36},
+                {"matrix": [3, 5], "x": 12, "y": 0.54},
 
-                {"label":"K10", "x":0, "y":1.54},
-                {"label":"K11", "x":1, "y":1.36},
-                {"label":"K12", "x":2, "y":1.18},
-                {"label":"K13", "x":3, "y":1},
-                {"label":"K14", "x":4, "y":1.18},
-                {"label":"K15", "x":5, "y":1.36},
+                {"matrix": [1, 0], "x": 0, "y": 1.54},
+                {"matrix": [1, 1], "x": 1, "y": 1.36},
+                {"matrix": [1, 2], "x": 2, "y": 1.18},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.18},
+                {"matrix": [1, 5], "x": 5, "y": 1.36},
 
-                {"label":"K40", "x":7, "y":1.36},
-                {"label":"K41", "x":8, "y":1.18},
-                {"label":"K42", "x":9, "y":1},
-                {"label":"K43", "x":10, "y":1.18},
-                {"label":"K44", "x":11, "y":1.36},
-                {"label":"K45", "x":12, "y":1.54},
+                {"matrix": [4, 0], "x": 7, "y": 1.36},
+                {"matrix": [4, 1], "x": 8, "y": 1.18},
+                {"matrix": [4, 2], "x": 9, "y": 1},
+                {"matrix": [4, 3], "x": 10, "y": 1.18},
+                {"matrix": [4, 4], "x": 11, "y": 1.36},
+                {"matrix": [4, 5], "x": 12, "y": 1.54},
 
-                {"label":"K20", "x":0, "y":2.54},
-                {"label":"K21", "x":1, "y":2.36},
-                {"label":"K22", "x":2, "y":2.18},
-                {"label":"K23", "x":3, "y":2},
-                {"label":"K24", "x":4, "y":2.18},
-                {"label":"K25", "x":5, "y":2.36},
+                {"matrix": [2, 0], "x": 0, "y": 2.54},
+                {"matrix": [2, 1], "x": 1, "y": 2.36},
+                {"matrix": [2, 2], "x": 2, "y": 2.18},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.18},
+                {"matrix": [2, 5], "x": 5, "y": 2.36},
 
-                {"label":"K50", "x":7, "y":2.36},
-                {"label":"K51", "x":8, "y":2.18},
-                {"label":"K52", "x":9, "y":2},
-                {"label":"K53", "x":10, "y":2.18},
-                {"label":"K54", "x":11, "y":2.36},
-                {"label":"K55", "x":12, "y":2.54},
+                {"matrix": [5, 0], "x": 7, "y": 2.36},
+                {"matrix": [5, 1], "x": 8, "y": 2.18},
+                {"matrix": [5, 2], "x": 9, "y": 2},
+                {"matrix": [5, 3], "x": 10, "y": 2.18},
+                {"matrix": [5, 4], "x": 11, "y": 2.36},
+                {"matrix": [5, 5], "x": 12, "y": 2.54},
 
-                {"label":"K60", "x":2.875, "y":3.54, "w":1.25},
-                {"label":"K61", "x":4.125, "y":3.54, "w":1.25},
-                {"label":"K62", "x":5.375, "y":3.54, "w":2.25},
-                {"label":"K63", "x":7.625, "y":3.54, "w":1.25},
-                {"label":"K64", "x":8.875, "y":3.54, "w":1.25}
+                {"matrix": [6, 0], "x": 2.875, "y": 3.54, "w": 1.25},
+                {"matrix": [6, 1], "x": 4.125, "y": 3.54, "w": 1.25},
+                {"matrix": [6, 2], "x": 5.375, "y": 3.54, "w": 2.25},
+                {"matrix": [6, 3], "x": 7.625, "y": 3.54, "w": 1.25},
+                {"matrix": [6, 4], "x": 8.875, "y": 3.54, "w": 1.25}
             ]
         }
     }