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

2 files changed, 51 insertions, 95 deletions

diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/info.json
index 164e770172..53db2db4ca 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/info.json
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/info.json
@@ -18,58 +18,62 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
-    "layouts": {
+   "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"L00", "x":0, "y":0.875},
-                {"label":"L01", "x":1, "y":0.625},
-                {"label":"L02", "x":2, "y":0.375},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0.125},
-                {"label":"R00", "x":9, "y":0.125},
-                {"label":"R01", "x":10, "y":0},
-                {"label":"R02", "x":11, "y":0},
-                {"label":"R03", "x":12, "y":0.375},
-                {"label":"R04", "x":13, "y":0.625},
-                {"label":"R05", "x":14, "y":0.875},
+                {"matrix": [0, 0], "x": 0, "y": 0.875},
+                {"matrix": [0, 1], "x": 1, "y": 0.625},
+                {"matrix": [0, 2], "x": 2, "y": 0.375},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.125},
 
-                {"label":"L10", "x":0, "y":1.875},
-                {"label":"L11", "x":1, "y":1.625},
-                {"label":"L12", "x":2, "y":1.375},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1.125},
-                {"label":"E01", "x":6, "y":1.625},
-                {"label":"E03", "x":8, "y":1.625},
-                {"label":"R10", "x":9, "y":1.125},
-                {"label":"R11", "x":10, "y":1},
-                {"label":"R12", "x":11, "y":1},
-                {"label":"R13", "x":12, "y":1.375},
-                {"label":"R14", "x":13, "y":1.625},
-                {"label":"R15", "x":14, "y":1.875},
+                {"matrix": [6, 5], "x": 9, "y": 0.125},
+                {"matrix": [6, 4], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0.375},
+                {"matrix": [6, 1], "x": 13, "y": 0.625},
+                {"matrix": [6, 0], "x": 14, "y": 0.875},
 
-                {"label":"L20", "x":0, "y":2.875},
-                {"label":"L21", "x":1, "y":2.625},
-                {"label":"L22", "x":2, "y":2.375},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2.125},
-                {"label":"E02", "x":6, "y":2.625},
-                {"label":"E04", "x":8, "y":2.625},
-                {"label":"R20", "x":9, "y":2.125},
-                {"label":"R21", "x":10, "y":2},
-                {"label":"R22", "x":11, "y":2},
-                {"label":"R23", "x":12, "y":2.375},
-                {"label":"R24", "x":13, "y":2.625},
-                {"label":"R25", "x":14, "y":2.875},
+                {"matrix": [1, 0], "x": 0, "y": 1.875},
+                {"matrix": [1, 1], "x": 1, "y": 1.625},
+                {"matrix": [1, 2], "x": 2, "y": 1.375},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.125},
+                {"matrix": [5, 7], "x": 6, "y": 1.625},
 
-                {"label":"L30", "x":4, "y":3},
-                {"label":"L31", "x":5, "y":3.125},
-                {"label":"L32", "x":6, "y":3.375},
-                {"label":"R30", "x":8, "y":3.375},
-                {"label":"R31", "x":9, "y":3.125},
-                {"label":"R32", "x":10, "y":3}
+                {"matrix": [11, 7], "x": 8, "y": 1.625},
+                {"matrix": [7, 5], "x": 9, "y": 1.125},
+                {"matrix": [7, 4], "x": 10, "y": 1},
+                {"matrix": [7, 3], "x": 11, "y": 1},
+                {"matrix": [7, 2], "x": 12, "y": 1.375},
+                {"matrix": [7, 1], "x": 13, "y": 1.625},
+                {"matrix": [7, 0], "x": 14, "y": 1.875},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.875},
+                {"matrix": [2, 1], "x": 1, "y": 2.625},
+                {"matrix": [2, 2], "x": 2, "y": 2.375},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.125},
+                {"matrix": [4, 6], "x": 6, "y": 2.625},
+
+                {"matrix": [10, 6], "x": 8, "y": 2.625},
+                {"matrix": [8, 5], "x": 9, "y": 2.125},
+                {"matrix": [8, 4], "x": 10, "y": 2},
+                {"matrix": [8, 3], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2.375},
+                {"matrix": [8, 1], "x": 13, "y": 2.625},
+                {"matrix": [8, 0], "x": 14, "y": 2.875},
+
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3.125},
+                {"matrix": [3, 5], "x": 6, "y": 3.375},
+
+                {"matrix": [9, 5], "x": 8, "y": 3.375},
+                {"matrix": [9, 4], "x": 9, "y": 3.125},
+                {"matrix": [9, 3], "x": 10, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h
deleted file mode 100644
index 2ad58047f1..0000000000
--- a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * 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( \
-    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, E01, E03, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, E02, E04, R20, R21, R22, R23, R24, R25, \
-                        L30, L31, L32, R30, R31, R32 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \
-        { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \
-        { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \
-        { KC_NO, KC_NO, KC_NO, L30, L31, L32, KC_NO, KC_NO }, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E02, KC_NO }, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E01 }, \
-        { R05, R04, R03, R02, R01, R00, KC_NO, KC_NO }, \
-        { R15, R14, R13, R12, R11, R10, KC_NO, KC_NO }, \
-        { R25, R24, R23, R22, R21, R20, KC_NO, KC_NO }, \
-        { KC_NO, KC_NO, KC_NO, R32, R31, R30, KC_NO, KC_NO }, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E04, KC_NO}, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E03} \
-    }