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

2 files changed, 81 insertions, 87 deletions

diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json
index f01c75da91..144075fde1 100644
--- a/keyboards/orthocode/info.json
+++ b/keyboards/orthocode/info.json
@@ -27,82 +27,92 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Mute", "x":0.5, "y":0},
+                {"matrix": [3, 0], "x": 0.5, "y": 0},
 
-                {"label":"RGB Tog", "x":0.5, "y":1},
-                {"label":"Esc", "x":1.75, "y":1},
-                {"label":"1", "x":3, "y":1},
-                {"label":"2", "x":4, "y":1},
-                {"label":"3", "x":5, "y":1},
-                {"label":"4", "x":6, "y":1},
-                {"label":"5", "x":7, "y":1},
-                {"label":"6", "x":10.5, "y":1},
-                {"label":"7", "x":11.5, "y":1},
-                {"label":"8", "x":12.5, "y":1},
-                {"label":"9", "x":13.5, "y":1},
-                {"label":"0", "x":14.5, "y":1},
-                {"label":"_", "x":15.5, "y":1},
-                {"label":"+", "x":16.5, "y":1},
-                {"label":"Home", "x":17.5, "y":1},
+                {"matrix": [0, 0], "x": 0.5, "y": 1},
 
-                {"label":"RGB Mode", "x":0.25, "y":2},
-                {"label":"Tab", "x":1.5, "y":2, "w":1.5},
-                {"label":"Q", "x":3, "y":2},
-                {"label":"W", "x":4, "y":2},
-                {"label":"E", "x":5, "y":2},
-                {"label":"R", "x":6, "y":2},
-                {"label":"T", "x":7, "y":2},
-                {"label":"Y", "x":10.5, "y":2},
-                {"label":"U", "x":11.5, "y":2},
-                {"label":"I", "x":12.5, "y":2},
-                {"label":"O", "x":13.5, "y":2},
-                {"label":"P", "x":14.5, "y":2},
-                {"label":"|", "x":15.5, "y":2, "w":1.5},
-                {"label":"Delete", "x":17, "y":2},
-                {"label":"End", "x":18, "y":2},
+                {"matrix": [0, 1], "x": 1.75, "y": 1},
+                {"matrix": [0, 2], "x": 3, "y": 1},
+                {"matrix": [0, 3], "x": 4, "y": 1},
+                {"matrix": [0, 4], "x": 5, "y": 1},
+                {"matrix": [0, 5], "x": 6, "y": 1},
+                {"matrix": [0, 6], "x": 7, "y": 1},
 
-                {"label":"RGB RMode", "x":0, "y":3},
-                {"label":"Caps", "x":1.25, "y":3, "w":1.75},
-                {"label":"A", "x":3, "y":3},
-                {"label":"S", "x":4, "y":3},
-                {"label":"D", "x":5, "y":3},
-                {"label":"F", "x":6, "y":3},
-                {"label":"G", "x":7, "y":3},
-                {"label":"H", "x":10.5, "y":3},
-                {"label":"J", "x":11.5, "y":3},
-                {"label":"K", "x":12.5, "y":3},
-                {"label":"L", "x":13.5, "y":3},
-                {"label":":", "x":14.5, "y":3},
-                {"label":"\"", "x":15.5, "y":3},
-                {"label":"Enter", "x":16.5, "y":3, "w":2.25},
+                {"matrix": [0, 7], "x": 10.5, "y": 1},
+                {"matrix": [0, 8], "x": 11.5, "y": 1},
+                {"matrix": [0, 9], "x": 12.5, "y": 1},
+                {"matrix": [0, 10], "x": 13.5, "y": 1},
+                {"matrix": [0, 11], "x": 14.5, "y": 1},
+                {"matrix": [0, 12], "x": 15.5, "y": 1},
+                {"matrix": [0, 13], "x": 16.5, "y": 1},
+                {"matrix": [0, 14], "x": 17.5, "y": 1},
 
-                {"label":"Shift", "x":0.75, "y":4, "w":2.25},
-                {"label":"Z", "x":3, "y":4},
-                {"label":"X", "x":4, "y":4},
-                {"label":"C", "x":5, "y":4},
-                {"label":"V", "x":6, "y":4},
-                {"label":"B", "x":7, "y":4},
-                {"label":"N", "x":10.5, "y":4},
-                {"label":"M", "x":11.5, "y":4},
-                {"label":"<", "x":12.5, "y":4},
-                {"label":">", "x":13.5, "y":4},
-                {"label":"?", "x":14.5, "y":4},
-                {"label":"\u2191", "x":17, "y":4},
+                {"matrix": [1, 0], "x": 0.25, "y": 2},
 
-                {"label":"Ctrl", "x":1.25, "y":5, "w":1.25},
-                {"label":"Win", "x":2.5, "y":5, "w":1.25},
-                {"label":"Alt", "x":3.75, "y":5, "w":1.25},
-                {"label":"Fn", "x":5.5, "y":5, "w":1.25},
-                {"label":"th1", "x":6.75, "y":5, "h":2.75},
-                {"label":"th2", "x":7.75, "y":5.25, "h":2.25},
-                {"label":"th3", "x":9.75, "y":5.25, "h":2.25},
-                {"label":"th4", "x":10.75, "y":5, "h":2.75},
-                {"label":"Fn", "x":11.75, "y":5, "w":1.25},
-                {"label":"Alt", "x":13, "y":5, "w":1.25},
-                {"label":"Ctrl", "x":14.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":16, "y":5},
-                {"label":"\u2193", "x":17, "y":5},
-                {"label":"\u2192", "x":18, "y":5}
+                {"matrix": [1, 1], "x": 1.5, "y": 2, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 2},
+                {"matrix": [1, 3], "x": 4, "y": 2},
+                {"matrix": [1, 4], "x": 5, "y": 2},
+                {"matrix": [1, 5], "x": 6, "y": 2},
+                {"matrix": [1, 6], "x": 7, "y": 2},
+
+                {"matrix": [1, 7], "x": 10.5, "y": 2},
+                {"matrix": [1, 8], "x": 11.5, "y": 2},
+                {"matrix": [1, 9], "x": 12.5, "y": 2},
+                {"matrix": [1, 10], "x": 13.5, "y": 2},
+                {"matrix": [1, 11], "x": 14.5, "y": 2},
+                {"matrix": [1, 12], "x": 15.5, "y": 2, "w": 1.5},
+                {"matrix": [1, 13], "x": 17, "y": 2},
+                {"matrix": [1, 14], "x": 18, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 3, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 3},
+                {"matrix": [2, 3], "x": 4, "y": 3},
+                {"matrix": [2, 4], "x": 5, "y": 3},
+                {"matrix": [2, 5], "x": 6, "y": 3},
+                {"matrix": [2, 6], "x": 7, "y": 3},
+
+                {"matrix": [2, 7], "x": 10.5, "y": 3},
+                {"matrix": [2, 8], "x": 11.5, "y": 3},
+                {"matrix": [2, 9], "x": 12.5, "y": 3},
+                {"matrix": [2, 10], "x": 13.5, "y": 3},
+                {"matrix": [2, 11], "x": 14.5, "y": 3},
+                {"matrix": [2, 12], "x": 15.5, "y": 3},
+                {"matrix": [2, 13], "x": 16.5, "y": 3, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 0.75, "y": 4, "w": 2.25},
+                {"matrix": [3, 2], "x": 3, "y": 4},
+                {"matrix": [3, 3], "x": 4, "y": 4},
+                {"matrix": [3, 4], "x": 5, "y": 4},
+                {"matrix": [3, 5], "x": 6, "y": 4},
+                {"matrix": [3, 6], "x": 7, "y": 4},
+
+                {"matrix": [3, 7], "x": 10.5, "y": 4},
+                {"matrix": [3, 8], "x": 11.5, "y": 4},
+                {"matrix": [3, 9], "x": 12.5, "y": 4},
+                {"matrix": [3, 10], "x": 13.5, "y": 4},
+                {"matrix": [3, 11], "x": 14.5, "y": 4},
+
+                {"matrix": [3, 13], "x": 17, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 5, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.5, "y": 5, "w": 1.25},
+                {"matrix": [4, 5], "x": 6.75, "y": 5, "h": 2.75},
+                {"matrix": [4, 6], "x": 7.75, "y": 5.25, "h": 2.25},
+
+                {"matrix": [4, 7], "x": 9.75, "y": 5.25, "h": 2.25},
+                {"matrix": [4, 8], "x": 10.75, "y": 5, "h": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 5, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 5, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 5, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 16, "y": 5},
+                {"matrix": [4, 13], "x": 17, "y": 5},
+                {"matrix": [4, 14], "x": 18, "y": 5}
             ]
         }
     }
diff --git a/keyboards/orthocode/orthocode.h b/keyboards/orthocode/orthocode.h
index 5e87418706..e1edbbe04d 100644
--- a/keyboards/orthocode/orthocode.h
+++ b/keyboards/orthocode/orthocode.h
@@ -16,26 +16,10 @@
 
 #pragma once
 
-#define _x_ KC_NO
 #define KC_SHSP SHIFTSPACE
 
 #include "quantum.h"
 
-#define LAYOUT( \
-    K30,                                                                       \
-    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,      \
-         K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      \
-         K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-{   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, _x_ }, \
-{   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_ }, \
-{   _x_, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E}   \
-}
-
 enum custom_keycodes {
     SHIFTSPACE = QK_KB_0,
 };