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

2 files changed, 68 insertions, 111 deletions

diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/info.json
index 91b6cd39c5..f1471efe8e 100644
--- a/keyboards/handwired/stef9998/split_5x7/info.json
+++ b/keyboards/handwired/stef9998/split_5x7/info.json
@@ -27,86 +27,83 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"F1", "x":6, "y":0},
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "F1", "matrix": [0, 6], "x": 6, "y": 0},
 
-        {"label":"Tab", "x":0, "y":1},
-        {"label":"Q", "x":1, "y":1},
-        {"label":"W", "x":2, "y":1},
-        {"label":"E", "x":3, "y":1},
-        {"label":"R", "x":4, "y":1},
-        {"label":"T", "x":5, "y":1},
-        {"label":"[", "x":6, "y":1},
+        {"label": "Tab", "matrix": [5, 6], "x": 0, "y": 1},
+        {"label": "Q", "matrix": [5, 5], "x": 1, "y": 1},
+        {"label": "W", "matrix": [5, 4], "x": 2, "y": 1},
+        {"label": "E", "matrix": [5, 3], "x": 3, "y": 1},
+        {"label": "R", "matrix": [5, 2], "x": 4, "y": 1},
+        {"label": "T", "matrix": [5, 1], "x": 5, "y": 1},
+        {"label": "[", "matrix": [5, 0], "x": 6, "y": 1},
 
-        {"label":"Caps Lock", "x":0, "y":2},
-        {"label":"A", "x":1, "y":2},
-        {"label":"S", "x":2, "y":2},
-        {"label":"D", "x":3, "y":2},
-        {"label":"F", "x":4, "y":2},
-        {"label":"G", "x":5, "y":2},
-        {"label":"=", "x":6, "y":2},
+        {"label": "Caps Lock", "matrix": [1, 0], "x": 0, "y": 2},
+        {"label": "A", "matrix": [1, 1], "x": 1, "y": 2},
+        {"label": "S", "matrix": [1, 2], "x": 2, "y": 2},
+        {"label": "D", "matrix": [1, 3], "x": 3, "y": 2},
+        {"label": "F", "matrix": [1, 4], "x": 4, "y": 2},
+        {"label": "G", "matrix": [1, 5], "x": 5, "y": 2},
+        {"label": "=", "matrix": [1, 6], "x": 6, "y": 2},
 
-        {"label":"Shift", "x":0, "y":3},
-        {"label":"Z", "x":1, "y":3},
-        {"label":"X", "x":2, "y":3},
-        {"label":"C", "x":3, "y":3},
-        {"label":"V", "x":4, "y":3},
-        {"label":"B", "x":5, "y":3},
-        {"label":"F3", "x":6, "y":3},
+        {"label": "Shift", "matrix": [6, 6], "x": 0, "y": 3},
+        {"label": "Z", "matrix": [6, 5], "x": 1, "y": 3},
+        {"label": "X", "matrix": [6, 4], "x": 2, "y": 3},
+        {"label": "C", "matrix": [6, 3], "x": 3, "y": 3},
+        {"label": "V", "matrix": [6, 2], "x": 4, "y": 3},
+        {"label": "B", "matrix": [6, 1], "x": 5, "y": 3},
+        {"label": "F3", "matrix": [6, 0], "x": 6, "y": 3},
 
-        {"label":"Ctrl", "x":0, "y":4},
-        {"label":"Ctrl", "x":1, "y":4},
-        {"label":"Gui", "x":2, "y":4, "w":1.25},
-        {"label":"Alt", "x":3.25, "y":4, "w":1.25},
-        {"label":"Space", "x":4.5, "y":4, "w":1.5},
-        {"label":"F5", "x":6, "y":4},
+        {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 4},
+        {"label": "Ctrl", "matrix": [2, 1], "x": 1, "y": 4},
+        {"label": "Gui", "matrix": [2, 2], "x": 2, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [2, 3], "x": 3.25, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [2, 4], "x": 4.5, "y": 4, "w": 1.5},
+        {"label": "F5", "matrix": [2, 5], "x": 6, "y": 4},
 
+        {"label": "F2", "matrix": [2, 6], "x": 14, "y": 0},
+        {"label": "6", "matrix": [7, 6], "x": 9, "y": 0},
+        {"label": "7", "matrix": [7, 5], "x": 10, "y": 0},
+        {"label": "8", "matrix": [7, 4], "x": 11, "y": 0},
+        {"label": "9", "matrix": [7, 3], "x": 12, "y": 0},
+        {"label": "0", "matrix": [7, 2], "x": 13, "y": 0},
+        {"label": "Backspace", "matrix": [7, 1], "x": 14, "y": 0},
 
-        {"label":"F2", "x":14, "y":0},
-        {"label":"6", "x":9, "y":0},
-        {"label":"7", "x":10, "y":0},
-        {"label":"8", "x":11, "y":0},
-        {"label":"9", "x":12, "y":0},
-        {"label":"0", "x":13, "y":0},
-        {"label":"Backspace", "x":14, "y":0},
+        {"label": "]", "matrix": [7, 0], "x": 8, "y": 1},
+        {"label": "Y", "matrix": [3, 0], "x": 9, "y": 1},
+        {"label": "U", "matrix": [3, 1], "x": 10, "y": 1},
+        {"label": "I", "matrix": [3, 2], "x": 11, "y": 1},
+        {"label": "O", "matrix": [3, 3], "x": 12, "y": 1},
+        {"label": "P", "matrix": [3, 4], "x": 13, "y": 1},
+        {"label": "\\", "matrix": [3, 5], "x": 14, "y": 1},
 
-        {"label":"]", "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":8, "y":2},
-        {"label":"H", "x":9, "y":2},
-        {"label":"J", "x":10, "y":2},
-        {"label":"K", "x":11, "y":2},
-        {"label":"L", "x":12, "y":2},
-        {"label":";", "x":13, "y":2},
-        {"label":"Enter", "x":14, "y":2},
-
-        {"label":"F4", "x":8, "y":3},
-        {"label":"N", "x":9, "y":3},
-        {"label":"M", "x":10, "y":3},
-        {"label":",", "x":11, "y":3},
-        {"label":".", "x":12, "y":3},
-        {"label":"/", "x":13, "y":3},
-        {"label":"Shift", "x":14, "y":3},
-
-        {"label":"F5", "x":8, "y":4},
-        {"label":"Space", "x":9, "y":4, "w":1.5},
-        {"label":"AltGr", "x":10.5, "y":4, "w":1.25},
-        {"label":"Fn", "x":11.75, "y":4, "w":1.25},
-        {"label":"Ctrl", "x":13, "y":4},
-        {"label":"Ctrl", "x":13, "y":4}
+        {"label": "-", "matrix": [3, 6], "x": 8, "y": 2},
+        {"label": "H", "matrix": [8, 6], "x": 9, "y": 2},
+        {"label": "J", "matrix": [8, 5], "x": 10, "y": 2},
+        {"label": "K", "matrix": [8, 4], "x": 11, "y": 2},
+        {"label": "L", "matrix": [8, 3], "x": 12, "y": 2},
+        {"label": ";", "matrix": [8, 2], "x": 13, "y": 2},
+        {"label": "Enter", "matrix": [8, 1], "x": 14, "y": 2},
 
+        {"label": "F4", "matrix": [8, 0], "x": 8, "y": 3},
+        {"label": "N", "matrix": [4, 0], "x": 9, "y": 3},
+        {"label": "M", "matrix": [4, 1], "x": 10, "y": 3},
+        {"label": ",", "matrix": [4, 2], "x": 11, "y": 3},
+        {"label": ".", "matrix": [4, 3], "x": 12, "y": 3},
+        {"label": "/", "matrix": [4, 5], "x": 13, "y": 3},
+        {"label": "Shift", "matrix": [4, 6], "x": 14, "y": 3},
 
+        {"label": "F5", "matrix": [9, 6], "x": 8, "y": 4},
+        {"label": "Space", "matrix": [9, 5], "x": 9, "y": 4, "w": 1.5},
+        {"label": "AltGr", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25},
+        {"label": "Fn", "matrix": [9, 2], "x": 11.75, "y": 4, "w": 1.25},
+        {"label": "Ctrl", "matrix": [9, 1], "x": 13, "y": 4},
+        {"label": "Ctrl", "matrix": [9, 0], "x": 13, "y": 4}
       ]
     }
   }
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
deleted file mode 100644
index 828c515484..0000000000
--- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2022 stef9998
-
-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"
-
-
-#define LAYOUT( \
-  k00, k01, k02, k03, k04, k05, k06,                k07, k08, k09, k10, k11, k12, k13, \
-  k14, k15, k16, k17, k18, k19, k20,                k21, k22, k23, k24, k25, k26, k27, \
-  k28, k29, k30, k31, k32, k33, k34,                k35, k36, k37, k38, k39, k40, k41, \
-  k42, k43, k44, k45, k46, k47, k48,                k49, k50, k51, k52, k53, k54, k55, \
-  k56, k57, k58, k59,      k61, k62,                k63, k64,      k66, k67, k68, k69  \
-) \
-{ \
-    { k00, k01, k02, k03, k04  , k05, k06 }, \
-    { k14, k15, k16, k17, k18  , k19, k20 }, \
-    { k28, k29, k30, k31, k32  , k33, k34 }, \
-    { k42, k43, k44, k45, k46  , k47, k48 }, \
-    { k56, k57, k58, k59, KC_NO, k61, k62 }, \
-    { k13, k12, k11, k10, k09  , k08, k07 }, \
-    { k27, k26, k25, k24, k23  , k22, k21 }, \
-    { k41, k40, k39, k38, k37  , k36, k35 }, \
-    { k55, k54, k53, k52, k51  , k50, k49 }, \
-    { k69, k68, k67, k66, KC_NO, k64, k63 }  \
-}