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

3 files changed, 110 insertions, 141 deletions

diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json
index 06fa7ddf10..a496d4baba 100644
--- a/keyboards/wren/info.json
+++ b/keyboards/wren/info.json
@@ -31,100 +31,115 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"L00","x":0, "y":0.5},
-                {"label":"L01","x":1, "y":0.5},
-                {"label":"L02","x":2, "y":0.5},
-                {"label":"L03","x":3, "y":0.5},
-                {"label":"L04","x":4.5, "y":0.5},
-                {"label":"L05","x":5.5, "y":0.5},
-                {"label":"L06","x":6.5, "y":0.25},
-                {"label":"L07","x":7.5, "y":0},
-                {"label":"L08","x":8.5, "y":0.25},
-                {"label":"L09","x":9.5, "y":0.5},
-                {"label":"R00","x":14, "y":0.5},
-                {"label":"R01","x":15, "y":0.25},
-                {"label":"R02","x":16, "y":0},
-                {"label":"R03","x":17, "y":0.25},
-                {"label":"R04","x":18, "y":0.5},
-                {"label":"R05","x":19, "y":0.5},
-                {"label":"R06","x":20.5, "y":0.5},
-                {"label":"R07","x":21.5, "y":0.5},
-                {"label":"R08","x":22.5, "y":0.5},
-                {"label":"R09","x":23.5, "y":0.5},
-
-                {"label":"L10","x":0, "y":1.5},
-                {"label":"L11","x":1, "y":1.5},
-                {"label":"L12","x":2, "y":1.5},
-                {"label":"L13","x":3, "y":1.5},
-                {"label":"L14","x":4.5, "y":1.5},
-                {"label":"L15","x":5.5, "y":1.5},
-                {"label":"L16","x":6.5, "y":1.25},
-                {"label":"L17","x":7.5, "y":1},
-                {"label":"L18","x":8.5, "y":1.25},
-                {"label":"L19","x":9.5, "y":1.5},
-                {"label":"R10","x":14, "y":1.5},
-                {"label":"R11","x":15, "y":1.25},
-                {"label":"R12","x":16, "y":1},
-                {"label":"R13","x":17, "y":1.25},
-                {"label":"R14","x":18, "y":1.5},
-                {"label":"R15","x":19, "y":1.5},
-                {"label":"R16","x":20.5, "y":1.5},
-                {"label":"R17","x":21.5, "y":1.5},
-                {"label":"R18","x":22.5, "y":1.5},
-                {"label":"R19","x":23.5, "y":1.5},
-
-                {"label":"L20","x":0, "y":2.5},
-                {"label":"L21","x":1, "y":2.5},
-                {"label":"L22","x":2, "y":2.5},
-                {"label":"L23","x":3, "y":2.5},
-                {"label":"L24","x":4.5, "y":2.5},
-                {"label":"L25","x":5.5, "y":2.5},
-                {"label":"L26","x":6.5, "y":2.25},
-                {"label":"L27","x":7.5, "y":2},
-                {"label":"L28","x":8.5, "y":2.25},
-                {"label":"L29","x":9.5, "y":2.5},
-                {"label":"R20","x":14, "y":2.5},
-                {"label":"R21","x":15, "y":2.25},
-                {"label":"R22","x":16, "y":2},
-                {"label":"R23","x":17, "y":2.25},
-                {"label":"R24","x":18, "y":2.5},
-                {"label":"R25","x":19, "y":2.5},
-                {"label":"R26","x":20.5, "y":2.5},
-                {"label":"R27","x":21.5, "y":2.5},
-                {"label":"R28","x":22.5, "y":2.5},
-                {"label":"R29","x":23.5, "y":2.5},
-
-                {"label":"L30","x":0, "y":3.5},
-                {"label":"L31","x":1, "y":3.5},
-                {"label":"L32","x":2, "y":3.5},
-                {"label":"L33","x":3, "y":3.5},
-                {"label":"L34","x":4.5, "y":3.5},
-                {"label":"L35","x":5.5, "y":3.5},
-                {"label":"L36","x":6.5, "y":3.25},
-                {"label":"L37","x":7.5, "y":3},
-                {"label":"L38","x":8.5, "y":3.25},
-                {"label":"L39","x":9.5, "y":3.5},
-                {"label":"R30","x":14, "y":3.5},
-                {"label":"R31","x":15, "y":3.25},
-                {"label":"R32","x":16, "y":3},
-                {"label":"R33","x":17, "y":3.25},
-                {"label":"R34","x":18, "y":3.5},
-                {"label":"R35","x":19, "y":3.5},
-                {"label":"R36","x":20.5, "y":3.5},
-                {"label":"R37","x":21.5, "y":3.5},
-                {"label":"R38","x":22.5, "y":3.5},
-                {"label":"R39","x":23.5, "y":3.5},
-
-                {"label":"LT0","x":6, "y":4.5},
-                {"label":"LT1","x":7, "y":4.5},
-                {"label":"LT2","x":8, "y":4.5},
-                {"label":"LT3","x":9, "y":4.75},
-                {"label":"LT4","x":10.75, "y":4, "h":2},
-                {"label":"RT0","x":12.75, "y":4, "h":2},
-                {"label":"RT1","x":14.5, "y":4.75},
-                {"label":"RT2","x":15.5, "y":4.5},
-                {"label":"RT3","x":16.5, "y":4.5},
-                {"label":"RT4","x":17.5, "y":4.5}
+                {"matrix": [0, 9], "x": 0, "y": 0.5},
+                {"matrix": [0, 8], "x": 1, "y": 0.5},
+                {"matrix": [0, 7], "x": 2, "y": 0.5},
+                {"matrix": [0, 6], "x": 3, "y": 0.5},
+
+                {"matrix": [0, 5], "x": 4.5, "y": 0.5},
+                {"matrix": [0, 4], "x": 5.5, "y": 0.5},
+                {"matrix": [0, 3], "x": 6.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 7.5, "y": 0},
+                {"matrix": [0, 1], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 0], "x": 9.5, "y": 0.5},
+
+                {"matrix": [5, 0], "x": 14, "y": 0.5},
+                {"matrix": [5, 1], "x": 15, "y": 0.25},
+                {"matrix": [5, 2], "x": 16, "y": 0},
+                {"matrix": [5, 3], "x": 17, "y": 0.25},
+                {"matrix": [5, 4], "x": 18, "y": 0.5},
+                {"matrix": [5, 5], "x": 19, "y": 0.5},
+
+                {"matrix": [5, 6], "x": 20.5, "y": 0.5},
+                {"matrix": [5, 7], "x": 21.5, "y": 0.5},
+                {"matrix": [5, 8], "x": 22.5, "y": 0.5},
+                {"matrix": [5, 9], "x": 23.5, "y": 0.5},
+
+                {"matrix": [1, 9], "x": 0, "y": 1.5},
+                {"matrix": [1, 8], "x": 1, "y": 1.5},
+                {"matrix": [1, 7], "x": 2, "y": 1.5},
+                {"matrix": [1, 6], "x": 3, "y": 1.5},
+
+                {"matrix": [1, 5], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 3], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 7.5, "y": 1},
+                {"matrix": [1, 1], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 0], "x": 9.5, "y": 1.5},
+
+                {"matrix": [6, 0], "x": 14, "y": 1.5},
+                {"matrix": [6, 1], "x": 15, "y": 1.25},
+                {"matrix": [6, 2], "x": 16, "y": 1},
+                {"matrix": [6, 3], "x": 17, "y": 1.25},
+                {"matrix": [6, 4], "x": 18, "y": 1.5},
+                {"matrix": [6, 5], "x": 19, "y": 1.5},
+
+                {"matrix": [6, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 21.5, "y": 1.5},
+                {"matrix": [6, 8], "x": 22.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 23.5, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5},
+                {"matrix": [2, 8], "x": 1, "y": 2.5},
+                {"matrix": [2, 7], "x": 2, "y": 2.5},
+                {"matrix": [2, 6], "x": 3, "y": 2.5},
+
+                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 7.5, "y": 2},
+                {"matrix": [2, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 0], "x": 9.5, "y": 2.5},
+
+                {"matrix": [7, 0], "x": 14, "y": 2.5},
+                {"matrix": [7, 1], "x": 15, "y": 2.25},
+                {"matrix": [7, 2], "x": 16, "y": 2},
+                {"matrix": [7, 3], "x": 17, "y": 2.25},
+                {"matrix": [7, 4], "x": 18, "y": 2.5},
+                {"matrix": [7, 5], "x": 19, "y": 2.5},
+
+                {"matrix": [7, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 21.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 22.5, "y": 2.5},
+                {"matrix": [7, 9], "x": 23.5, "y": 2.5},
+
+                {"matrix": [3, 9], "x": 0, "y": 3.5},
+                {"matrix": [3, 8], "x": 1, "y": 3.5},
+                {"matrix": [3, 7], "x": 2, "y": 3.5},
+                {"matrix": [3, 6], "x": 3, "y": 3.5},
+
+                {"matrix": [3, 5], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.5},
+                {"matrix": [3, 3], "x": 6.5, "y": 3.25},
+                {"matrix": [3, 2], "x": 7.5, "y": 3},
+                {"matrix": [3, 1], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 0], "x": 9.5, "y": 3.5},
+
+                {"matrix": [8, 0], "x": 14, "y": 3.5},
+                {"matrix": [8, 1], "x": 15, "y": 3.25},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 3], "x": 17, "y": 3.25},
+                {"matrix": [8, 4], "x": 18, "y": 3.5},
+                {"matrix": [8, 5], "x": 19, "y": 3.5},
+
+                {"matrix": [8, 6], "x": 20.5, "y": 3.5},
+                {"matrix": [8, 7], "x": 21.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 22.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 23.5, "y": 3.5},
+
+                {"matrix": [4, 4], "x": 6, "y": 4.5},
+                {"matrix": [4, 3], "x": 7, "y": 4.5},
+                {"matrix": [4, 2], "x": 8, "y": 4.5},
+                {"matrix": [4, 1], "x": 9, "y": 4.75},
+
+                {"matrix": [4, 0], "x": 10.75, "y": 4, "h": 2},
+
+                {"matrix": [9, 0], "x": 12.75, "y": 4, "h": 2},
+
+                {"matrix": [9, 1], "x": 14.5, "y": 4.75},
+                {"matrix": [9, 2], "x": 15.5, "y": 4.5},
+                {"matrix": [9, 3], "x": 16.5, "y": 4.5},
+                {"matrix": [9, 4], "x": 17.5, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/wren/wren.c b/keyboards/wren/wren.c
index 487c9d3070..c775a888d5 100644
--- a/keyboards/wren/wren.c
+++ b/keyboards/wren/wren.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "wren.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/wren/wren.h b/keyboards/wren/wren.h
deleted file mode 100644
index ee589fe23c..0000000000
--- a/keyboards/wren/wren.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 Walter Hanley
- *
- * 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, L06, L07, L08, L09,           R00, R01, R02, R03, R04, R05, R06, R07, R08, R09, \
-    L10, L11, L12, L13, L14, L15, L16, L17, L18, L19,           R10, R11, R12, R13, R14, R15, R16, R17, R18, R19, \
-    L20, L21, L22, L23, L24, L25, L26, L27, L28, L29,           R20, R21, R22, R23, R24, R25, R26, R27, R28, R29, \
-    L30, L31, L32, L33, L34, L35, L36, L37, L38, L39,           R30, R31, R32, R33, R34, R35, R36, R37, R38, R39, \
-                                  LT0, LT1, LT2, LT3, LT4, RT0, RT1, RT2, RT3, RT4 \
-) { \
-    { L09,   L08,   L07,   L06,   L05,   L04,   L03,   L02,   L01,   L00   }, \
-    { L19,   L18,   L17,   L16,   L15,   L14,   L13,   L12,   L11,   L10   }, \
-    { L29,   L28,   L27,   L26,   L25,   L24,   L23,   L22,   L21,   L20   }, \
-    { L39,   L38,   L37,   L36,   L35,   L34,   L33,   L32,   L31,   L30   }, \
-    { LT4,   LT3,   LT2,   LT1,   LT0,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   R07,   R08,   R09   }, \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17,   R18,   R19   }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   R27,   R28,   R29   }, \
-    { R30,   R31,   R32,   R33,   R34,   R35,   R36,   R37,   R38,   R39   }, \
-    { RT0,   RT1,   RT2,   RT3,   RT4,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-}