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

2 files changed, 75 insertions, 113 deletions

diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json
index 5bd5baef9d..b0789d2683 100644
--- a/keyboards/tszaboo/ortho4exent/info.json
+++ b/keyboards/tszaboo/ortho4exent/info.json
@@ -24,79 +24,82 @@
     "layouts": {
       "LAYOUT": {
         "layout": [
-			{"label":"k00","x":0,"y":0,"w":1.5},
-			{"label":"k01","x":1.5,"y":0},
-			{"label":"k02","x":2.5,"y":0},
-			{"label":"k03","x":3.5,"y":0},
-			{"label":"k04","x":4.5,"y":0},
-			{"label":"k05","x":5.5,"y":0},
-			{"label":"k06","x":6.5,"y":0},
-			{"label":"k07","x":7.5,"y":0},
-			{"label":"k08","x":8.5,"y":0},
-			{"label":"k09","x":9.5,"y":0},
-			{"label":"k0A","x":10.5,"y":0},
-			{"label":"k0B","x":11.5,"y":0},
-			{"label":"k0C","x":12.5,"y":0},
-			{"label":"k0D","x":13.5,"y":0},
-			{"label":"k0E","x":14.5,"y":0,"w":1.5},
-			{"label":"k10","x":0,"y":1,"w":1.5},
-			{"label":"k11","x":1.5,"y":1},
-			{"label":"k12","x":2.5,"y":1},
-			{"label":"k13","x":3.5,"y":1},
-			{"label":"k14","x":4.5,"y":1},
-			{"label":"k15","x":5.5,"y":1},
-			{"label":"k16","x":6.5,"y":1},
-			{"label":"k17","x":7.5,"y":1},
-			{"label":"k18","x":8.5,"y":1},
-			{"label":"k19","x":9.5,"y":1},
-			{"label":"k1A","x":10.5,"y":1},
-			{"label":"k1B","x":11.5,"y":1},
-			{"label":"k1C","x":12.5,"y":1},
-			{"label":"k1D","x":13.5,"y":1},
-			{"label":"k1E","x":14.5,"y":1,"w":1.5},
-			{"label":"k20","x":0,"y":2,"w":1.5},
-			{"label":"k21","x":1.5,"y":2},
-			{"label":"k22","x":2.5,"y":2},
-			{"label":"k23","x":3.5,"y":2},
-			{"label":"k24","x":4.5,"y":2},
-			{"label":"k25","x":5.5,"y":2},
-			{"label":"k26","x":6.5,"y":2},
-			{"label":"k27","x":7.5,"y":2},
-			{"label":"k28","x":8.5,"y":2},
-			{"label":"k29","x":9.5,"y":2},
-			{"label":"k2A","x":10.5,"y":2},
-			{"label":"k2B","x":11.5,"y":2},
-			{"label":"k2C","x":12.5,"y":2},
-			{"label":"k2D","x":13.5,"y":2},
-			{"label":"k2E","x":14.5,"y":2,"w":1.5},
-			{"label":"k30","x":0,"y":3,"w":1.5},
-			{"label":"k31","x":1.5,"y":3},
-			{"label":"k32","x":2.5,"y":3},
-			{"label":"k33","x":3.5,"y":3},
-			{"label":"k34","x":4.5,"y":3},
-			{"label":"k35","x":5.5,"y":3},
-			{"label":"k36","x":6.5,"y":3},
-			{"label":"k37","x":7.5,"y":3},
-			{"label":"k38","x":8.5,"y":3},
-			{"label":"k39","x":9.5,"y":3},
-			{"label":"k3A","x":10.5,"y":3},
-			{"label":"k3B","x":11.5,"y":3},
-			{"label":"k3C","x":12.5,"y":3},
-			{"label":"k3D","x":13.5,"y":3},
-			{"label":"k3E","x":14.5,"y":3,"w":1.5},
-			{"label":"k40","x":0,"y":4,"w":1.5},
-			{"label":"k41","x":1.5,"y":4,"w":1.5},
-			{"label":"k42","x":3,"y":4,"w":1.5},
-			{"label":"k43","x":4.5,"y":4,"w":2},
-			{"label":"k44","x":6.5,"y":4},
-			{"label":"k45","x":7.5,"y":4},
-			{"label":"k46","x":8.5,"y":4},
-			{"label":"k47","x":9.5,"y":4,"w":2},
-			{"label":"k48","x":11.5,"y":4,"w":1.5},
-			{"label":"k49","x":13,"y":4,"w":1.5},
-			{"label":"k4A","x":14.5,"y":4,"w":1.5}
+          {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+          {"matrix": [0, 1], "x": 1.5, "y": 0},
+          {"matrix": [0, 2], "x": 2.5, "y": 0},
+          {"matrix": [0, 3], "x": 3.5, "y": 0},
+          {"matrix": [0, 4], "x": 4.5, "y": 0},
+          {"matrix": [0, 5], "x": 5.5, "y": 0},
+          {"matrix": [0, 6], "x": 6.5, "y": 0},
+          {"matrix": [0, 7], "x": 7.5, "y": 0},
+          {"matrix": [0, 8], "x": 8.5, "y": 0},
+          {"matrix": [0, 9], "x": 9.5, "y": 0},
+          {"matrix": [0, 10], "x": 10.5, "y": 0},
+          {"matrix": [0, 11], "x": 11.5, "y": 0},
+          {"matrix": [0, 12], "x": 12.5, "y": 0},
+          {"matrix": [0, 13], "x": 13.5, "y": 0},
+          {"matrix": [0, 14], "x": 14.5, "y": 0, "w": 1.5},
 
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [1, 13], "x": 13.5, "y": 1},
+          {"matrix": [1, 14], "x": 14.5, "y": 1, "w": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+          {"matrix": [2, 1], "x": 1.5, "y": 2},
+          {"matrix": [2, 2], "x": 2.5, "y": 2},
+          {"matrix": [2, 3], "x": 3.5, "y": 2},
+          {"matrix": [2, 4], "x": 4.5, "y": 2},
+          {"matrix": [2, 5], "x": 5.5, "y": 2},
+          {"matrix": [2, 6], "x": 6.5, "y": 2},
+          {"matrix": [2, 7], "x": 7.5, "y": 2},
+          {"matrix": [2, 8], "x": 8.5, "y": 2},
+          {"matrix": [2, 9], "x": 9.5, "y": 2},
+          {"matrix": [2, 10], "x": 10.5, "y": 2},
+          {"matrix": [2, 11], "x": 11.5, "y": 2},
+          {"matrix": [2, 12], "x": 12.5, "y": 2},
+          {"matrix": [2, 13], "x": 13.5, "y": 2},
+          {"matrix": [2, 14], "x": 14.5, "y": 2, "w": 1.5},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+          {"matrix": [3, 1], "x": 1.5, "y": 3},
+          {"matrix": [3, 2], "x": 2.5, "y": 3},
+          {"matrix": [3, 3], "x": 3.5, "y": 3},
+          {"matrix": [3, 4], "x": 4.5, "y": 3},
+          {"matrix": [3, 5], "x": 5.5, "y": 3},
+          {"matrix": [3, 6], "x": 6.5, "y": 3},
+          {"matrix": [3, 7], "x": 7.5, "y": 3},
+          {"matrix": [3, 8], "x": 8.5, "y": 3},
+          {"matrix": [3, 9], "x": 9.5, "y": 3},
+          {"matrix": [3, 10], "x": 10.5, "y": 3},
+          {"matrix": [3, 11], "x": 11.5, "y": 3},
+          {"matrix": [3, 12], "x": 12.5, "y": 3},
+          {"matrix": [3, 13], "x": 13.5, "y": 3},
+          {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.5},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+          {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+          {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.5},
+          {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2},
+          {"matrix": [4, 6], "x": 6.5, "y": 4},
+          {"matrix": [4, 7], "x": 7.5, "y": 4},
+          {"matrix": [4, 8], "x": 8.5, "y": 4},
+          {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 2},
+          {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+          {"matrix": [4, 13], "x": 13, "y": 4, "w": 1.5},
+          {"matrix": [4, 14], "x": 14.5, "y": 4, "w": 1.5}
         ]
       }
     }
-  }
+}
diff --git a/keyboards/tszaboo/ortho4exent/ortho4exent.h b/keyboards/tszaboo/ortho4exent/ortho4exent.h
deleted file mode 100644
index 3814ce069c..0000000000
--- a/keyboards/tszaboo/ortho4exent/ortho4exent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 tszaboo
- *
- * 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, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,\
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,\
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E,\
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E,\
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A                     \
-) \
-{ \
-    { k00, k01,   k02, k03, k04,   k05, k06, k07, k08,   k09,   k0A, k0B,   k0C, k0D, k0E }, \
-    { k10, k11,   k12, k13, k14,   k15, k16, k17, k18,   k19,   k1A, k1B,   k1C, k1D, k1E }, \
-    { k20, k21,   k22, k23, k24,   k25, k26, k27, k28,   k29,   k2A, k2B,   k2C, k2D, k2E }, \
-    { k30, k31,   k32, k33, k34,   k35, k36, k37, k38,   k39,   k3A, k3B,   k3C, k3D, k3E }, \
-    { k40, k41, KC_NO, k42, k43, KC_NO, k44, k45, k46,   k47, KC_NO, k48, KC_NO, k49, k4A }, \
-}