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

1 files changed, 46 insertions, 42 deletions

diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
index 3fc07a2c1c..0ffebff135 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -28,51 +28,55 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"GUI/`~", "x":0, "y":0.8},
-                {"label":"Q", "x":1, "y":0.8},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0.5},
-                {"label":"T", "x":5, "y":0.5},
-                {"label":"Y", "x":7.5, "y":0.5},
-                {"label":"U", "x":8.5, "y":0.5},
-                {"label":"I", "x":9.5, "y":0},
-                {"label":"O", "x":10.5, "y":0},
-                {"label":"P", "x":11.5, "y":0.8},
-                {"label":"GUI/=+", "x":12.5, "y":0.8},
+                {"matrix": [0, 0], "x": 0, "y": 0.8},
+                {"matrix": [0, 1], "x": 1, "y": 0.8},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
 
-                {"label":"Ctrl/Tab", "x":0, "y":1.8},
-                {"label":"A", "x":1, "y":1.8},
-                {"label":"S", "x":2, "y":1},
-                {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1.5},
-                {"label":"G", "x":5, "y":1.5},
-                {"label":"H", "x":7.5, "y":1.5},
-                {"label":"J", "x":8.5, "y":1.5},
-                {"label":"K", "x":9.5, "y":1},
-                {"label":"L", "x":10.5, "y":1},
-                {"label":";:", "x":11.5, "y":1.8},
-                {"label":"Ctrl/'\"", "x":12.5, "y":1.8},
+                {"matrix": [0, 6], "x": 7.5, "y": 0.5},
+                {"matrix": [0, 7], "x": 8.5, "y": 0.5},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0.8},
+                {"matrix": [0, 11], "x": 12.5, "y": 0.8},
 
-                {"label":"Alt", "x":0, "y":2.8},
-                {"label":"Z", "x":1, "y":2.8},
-                {"label":"X", "x":2, "y":2},
-                {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2.5},
-                {"label":"B", "x":5, "y":2.5},
-                {"label":"N", "x":7.5, "y":2.5},
-                {"label":"M", "x":8.5, "y":2.5},
-                {"label":",<", "x":9.5, "y":2},
-                {"label":".>", "x":10.5, "y":2},
-                {"label":"/?", "x":11.5, "y":2.8},
-                {"label":"Alt", "x":12.5, "y":2.8},
+                {"matrix": [1, 0], "x": 0, "y": 1.8},
+                {"matrix": [1, 1], "x": 1, "y": 1.8},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
 
-                {"label":"Special/Esc", "x":4.25, "y":3.55},
-                {"label":"Shift/Backspace", "x":5.25, "y":3.65},
-                {"label":"Adm/Delete", "x":6.25, "y":1.875, "h":1.25},
-                {"label":"Extra/Enter", "x":6.25, "y":4.05},
-                {"label":"Shift/Space", "x":7.25, "y":3.65},
-                {"label":"Special/Alt", "x":8.25, "y":3.55}
+                {"matrix": [1, 6], "x": 7.5, "y": 1.5},
+                {"matrix": [1, 7], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 11.5, "y": 1.8},
+                {"matrix": [1, 11], "x": 12.5, "y": 1.8},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.8},
+                {"matrix": [2, 1], "x": 1, "y": 2.8},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+                {"matrix": [2, 6], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 9.5, "y": 2},
+                {"matrix": [2, 9], "x": 10.5, "y": 2},
+                {"matrix": [2, 10], "x": 11.5, "y": 2.8},
+                {"matrix": [2, 11], "x": 12.5, "y": 2.8},
+
+                {"matrix": [3, 3], "x": 4.25, "y": 3.55},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.65},
+                {"matrix": [3, 6], "x": 6.25, "y": 1.875, "h": 1.25},
+
+                {"matrix": [3, 5], "x": 6.25, "y": 4.05},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.65},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.55}
             ]
         }
     }