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

3 files changed, 96 insertions, 56 deletions

diff --git a/keyboards/handwired/z150/info.json b/keyboards/handwired/z150/info.json
index 6b93b73e20..373c80ac7f 100644
--- a/keyboards/handwired/z150/info.json
+++ b/keyboards/handwired/z150/info.json
@@ -17,7 +17,101 @@
     "bootloader": "stm32duino",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"!", "x":3.5, "y":0}, {"label":"@", "x":4.5, "y":0}, {"label":"#", "x":5.5, "y":0}, {"label":"$", "x":6.5, "y":0}, {"label":"%", "x":7.5, "y":0}, {"label":"^", "x":8.5, "y":0}, {"label":"&", "x":9.5, "y":0}, {"label":"*", "x":10.5, "y":0}, {"label":"(", "x":11.5, "y":0}, {"label":")", "x":12.5, "y":0}, {"label":"_", "x":13.5, "y":0}, {"label":"+", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0, "w":1.75}, {"label":"", "x":17.25, "y":0}, {"label":"", "x":18.25, "y":0, "w":1.5}, {"label":"", "x":19.75, "y":0, "w":1.5}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1, "w":1.25}, {"label":"7", "x":17.25, "y":1}, {"label":"8", "x":18.25, "y":1}, {"label":"9", "x":19.25, "y":1}, {"label":"PrtSc", "x":20.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Ctrl", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":9.25, "y":2}, {"label":"J", "x":10.25, "y":2}, {"label":"K", "x":11.25, "y":2}, {"label":"L", "x":12.25, "y":2}, {"label":":", "x":13.25, "y":2}, {"label":"\"", "x":14.25, "y":2}, {"label":"Enter", "x":15.25, "y":2, "w":2}, {"label":"4", "x":17.25, "y":2}, {"label":"5", "x":18.25, "y":2}, {"label":"6", "x":19.25, "y":2}, {"label":"\u0432\u0402\u201c", "x":20.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":2.25}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":9.75, "y":3}, {"label":"M", "x":10.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":">", "x":12.75, "y":3}, {"label":"?", "x":13.75, "y":3}, {"label":"Shift", "x":14.75, "y":3, "w":1.5}, {"label":"|", "x":16.25, "y":3}, {"label":"1", "x":17.25, "y":3}, {"label":"2", "x":18.25, "y":3}, {"label":"6", "x":19.25, "y":3}, {"label":"+", "x":20.25, "y":3, "h":2}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.75}, {"label":"~", "x":4.25, "y":4}, {"x":5.25, "y":4, "w":9}, {"label":"CapsLock", "x":14.25, "y":4, "w":2}, {"label":"0", "x":16.25, "y":4, "w":2}, {"label":".", "x":18.25, "y":4, "w":2}]
+            "layout": [
+                {"matrix": [3, 5], "x": 0, "y": 0},
+                {"matrix": [3, 4], "x": 1, "y": 0},
+
+                {"matrix": [10, 7], "x": 2.5, "y": 0},
+                {"matrix": [10, 6], "x": 3.5, "y": 0},
+                {"matrix": [10, 5], "x": 4.5, "y": 0},
+                {"matrix": [10, 4], "x": 5.5, "y": 0},
+                {"matrix": [10, 3], "x": 6.5, "y": 0},
+                {"matrix": [10, 2], "x": 7.5, "y": 0},
+                {"matrix": [10, 1], "x": 8.5, "y": 0},
+                {"matrix": [10, 0], "x": 9.5, "y": 0},
+                {"matrix": [9, 7], "x": 10.5, "y": 0},
+                {"matrix": [9, 6], "x": 11.5, "y": 0},
+                {"matrix": [9, 5], "x": 12.5, "y": 0},
+                {"matrix": [9, 4], "x": 13.5, "y": 0},
+                {"matrix": [9, 3], "x": 14.5, "y": 0},
+                {"matrix": [9, 2], "x": 15.5, "y": 0, "w": 1.75},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [2, 3], "x": 18.25, "y": 0, "w": 1.5},
+                {"matrix": [2, 2], "x": 19.75, "y": 0, "w": 1.5},
+
+                {"matrix": [3, 3], "x": 0, "y": 1},
+                {"matrix": [3, 2], "x": 1, "y": 1},
+
+                {"matrix": [9, 1], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [9, 0], "x": 4, "y": 1},
+                {"matrix": [8, 7], "x": 5, "y": 1},
+                {"matrix": [8, 6], "x": 6, "y": 1},
+                {"matrix": [8, 5], "x": 7, "y": 1},
+                {"matrix": [8, 4], "x": 8, "y": 1},
+                {"matrix": [8, 3], "x": 9, "y": 1},
+                {"matrix": [8, 2], "x": 10, "y": 1},
+                {"matrix": [8, 1], "x": 11, "y": 1},
+                {"matrix": [8, 0], "x": 12, "y": 1},
+                {"matrix": [7, 7], "x": 13, "y": 1},
+                {"matrix": [7, 6], "x": 14, "y": 1},
+                {"matrix": [7, 5], "x": 15, "y": 1, "w": 1.25},
+                {"matrix": [2, 1], "x": 17.25, "y": 1},
+                {"matrix": [2, 0], "x": 18.25, "y": 1},
+                {"matrix": [1, 7], "x": 19.25, "y": 1},
+                {"matrix": [1, 6], "x": 20.25, "y": 1},
+
+                {"matrix": [3, 1], "x": 0, "y": 2},
+                {"matrix": [3, 0], "x": 1, "y": 2},
+
+                {"matrix": [7, 3], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [7, 2], "x": 4.25, "y": 2},
+                {"matrix": [7, 1], "x": 5.25, "y": 2},
+                {"matrix": [7, 0], "x": 6.25, "y": 2},
+                {"matrix": [6, 7], "x": 7.25, "y": 2},
+                {"matrix": [6, 6], "x": 8.25, "y": 2},
+                {"matrix": [6, 5], "x": 9.25, "y": 2},
+                {"matrix": [6, 4], "x": 10.25, "y": 2},
+                {"matrix": [6, 3], "x": 11.25, "y": 2},
+                {"matrix": [6, 2], "x": 12.25, "y": 2},
+                {"matrix": [6, 1], "x": 13.25, "y": 2},
+                {"matrix": [6, 0], "x": 14.25, "y": 2},
+                {"matrix": [7, 4], "x": 15.25, "y": 2, "w": 2},
+                {"matrix": [1, 5], "x": 17.25, "y": 2},
+                {"matrix": [1, 4], "x": 18.25, "y": 2},
+                {"matrix": [1, 3], "x": 19.25, "y": 2},
+                {"matrix": [1, 2], "x": 20.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 0, "y": 3},
+                {"matrix": [2, 7], "x": 1, "y": 3},
+
+                {"matrix": [5, 6], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [5, 4], "x": 4.75, "y": 3},
+                {"matrix": [5, 3], "x": 5.75, "y": 3},
+                {"matrix": [5, 2], "x": 6.75, "y": 3},
+                {"matrix": [5, 1], "x": 7.75, "y": 3},
+                {"matrix": [5, 0], "x": 8.75, "y": 3},
+                {"matrix": [4, 7], "x": 9.75, "y": 3},
+                {"matrix": [4, 6], "x": 10.75, "y": 3},
+                {"matrix": [4, 5], "x": 11.75, "y": 3},
+                {"matrix": [4, 4], "x": 12.75, "y": 3},
+                {"matrix": [4, 3], "x": 13.75, "y": 3},
+                {"matrix": [4, 2], "x": 14.75, "y": 3, "w": 1.5},
+                {"matrix": [4, 1], "x": 16.25, "y": 3},
+                {"matrix": [1, 1], "x": 17.25, "y": 3},
+                {"matrix": [1, 0], "x": 18.25, "y": 3},
+                {"matrix": [0, 7], "x": 19.25, "y": 3},
+                {"matrix": [0, 4], "x": 20.25, "y": 3, "h": 2},
+
+                {"matrix": [2, 4], "x": 0, "y": 4},
+                {"matrix": [2, 5], "x": 1, "y": 4},
+
+                {"matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.75},
+                {"matrix": [5, 5], "x": 4.25, "y": 4},
+                {"matrix": [3, 7], "x": 5.25, "y": 4, "w": 9},
+                {"matrix": [3, 6], "x": 14.25, "y": 4, "w": 2},
+                {"matrix": [0, 6], "x": 16.25, "y": 4, "w": 2},
+                {"matrix": [0, 5], "x": 18.25, "y": 4, "w": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/z150/z150.c b/keyboards/handwired/z150/z150.c
index cf49c87ef0..a887a95bfd 100644
--- a/keyboards/handwired/z150/z150.c
+++ b/keyboards/handwired/z150/z150.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "z150.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     setPinOutput(NUM_LOCK_LED_PIN);
diff --git a/keyboards/handwired/z150/z150.h b/keyboards/handwired/z150/z150.h
deleted file mode 100644
index 1a1c89f32b..0000000000
--- a/keyboards/handwired/z150/z150.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2020 DmNosachev
- *
- * 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"
-
-/* readability */
-#define XXX KC_NO
-
-/* 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( \
-  K35, K34,   KA7, KA6, KA5, KA4, KA3, KA2, KA1, KA0, K97, K96, K95, K94, K93,   K92, K57,    K23,   K22, \
-  K33, K32,   K91,  K90, K87, K86, K85, K84, K83, K82, K81, K80, K77, K76, K75,       K21, K20, K17, K16, \
-  K31, K30,   K73,   K72, K71, K70, K67, K66, K65, K64, K63, K62, K61, K60,      K74, K15, K14, K13, K12, \
-  K26, K27,   K56,    K54, K53, K52, K51, K50, K47, K46, K45, K44, K43,    K42,  K41, K11, K10, K07, K04, \
-  K24, K25,   K40,   K55,                   K37,                           K36,       K06,      K05 \
-) \
-{ \
-/* 0 */  { XXX, XXX, XXX, XXX, K04, K05, K06, K07 }, \
-/* 1 */  { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-/* 2 */  { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-/* 3 */  { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-/* 4 */  { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-/* 5 */  { K50, K51, K52, K53, K54, K55, K56, K57 }, \
-/* 6 */  { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-/* 7 */  { K70, K71, K72, K73, K74, K75, K76, K77 }, \
-/* 8 */  { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-/* 9 */  { K90, K91, K92, K93, K94, K95, K96, K97 }, \
-/* A */  { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 }  \
-}
-/*         0    1    2    3    4    5    6    7     */
-