Move single `LAYOUT_all`s to data driven (#20430)

1 files changed, 74 insertions, 65 deletions

diff --git a/keyboards/nopunin10did/kastenwagen1840/info.json b/keyboards/nopunin10did/kastenwagen1840/info.json
index 7612f52e1e..4f6a03771d 100644
--- a/keyboards/nopunin10did/kastenwagen1840/info.json
+++ b/keyboards/nopunin10did/kastenwagen1840/info.json
@@ -24,71 +24,80 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0   ,  "y":0,    "label":"Esc"},
-                {"x":1   ,  "y":0,    "label":"Q"},
-                {"x":2   ,  "y":0,    "label":"W"},
-                {"x":3   ,  "y":0,    "label":"E"},
-                {"x":4   ,  "y":0,    "label":"R"},
-                {"x":5   ,  "y":0,    "label":"T"},
-                {"x":6   ,  "y":0,    "label":"Y"},
-                {"x":7   ,  "y":0,    "label":"U"},
-                {"x":8   ,  "y":0,    "label":"I"},
-                {"x":9   ,  "y":0,    "label":"O"},
-                {"x":10  ,  "y":0,    "label":"P"},
-                {"x":11  ,  "y":0,    "label":"L Bracket"},
-                {"x":12  ,  "y":0,    "label":"Backspace", "w":1.75},
-                {"x":14.25, "y":0,    "label":"P-7"},
-                {"x":15.25, "y":0,    "label":"P-8"},
-                {"x":16.25, "y":0,    "label":"P-9"},
-                {"x":17.25, "y":0,    "label":"P-Minus"},
-                {"x":0   ,  "y":1,    "label":"Tab", "w":1.25},
-                {"x":1.25,  "y":1,    "label":"A"},
-                {"x":2.25,  "y":1,    "label":"S"},
-                {"x":3.25,  "y":1,    "label":"D"},
-                {"x":4.25,  "y":1,    "label":"F"},
-                {"x":5.25,  "y":1,    "label":"G"},
-                {"x":6.25,  "y":1,    "label":"H"},
-                {"x":7.25,  "y":1,    "label":"J"},
-                {"x":8.25,  "y":1,    "label":"K"},
-                {"x":9.25,  "y":1,    "label":"L"},
-                {"x":10.25, "y":1,    "label":"Semicolon"},
-                {"x":11.25, "y":1,    "label":"Quote"},
-                {"x":12.25, "y":1,    "label":"Enter", "w":1.5},
-                {"x":14.25, "y":1,    "label":"P-4"},
-                {"x":15.25, "y":1,    "label":"P-5"},
-                {"x":16.25, "y":1,    "label":"P-6"},
-                {"x":17.25, "y":1,    "label":"P-Plus"},
-                {"x":0   ,  "y":2,    "label":"Left Shift", "w":1.75},
-                {"x":1.75,  "y":2,    "label":"Z"},
-                {"x":2.75,  "y":2,    "label":"X"},
-                {"x":3.75,  "y":2,    "label":"C"},
-                {"x":4.75,  "y":2,    "label":"V"},
-                {"x":5.75,  "y":2,    "label":"B"},
-                {"x":6.75,  "y":2,    "label":"N"},
-                {"x":7.75,  "y":2,    "label":"M"},
-                {"x":8.75,  "y":2,    "label":"Comma"},
-                {"x":9.75,  "y":2,    "label":"Period"},
-                {"x":10.75, "y":2,    "label":"Slash"},
-                {"x":11.75, "y":2,    "label":"Right Shift", "w":1.25},
-                {"x":13.125,"y":2.125,"label":"Up"},
-                {"x":14.25, "y":2,    "label":"P-1"},
-                {"x":15.25, "y":2,    "label":"P-2"},
-                {"x":16.25, "y":2,    "label":"P-3"},
-                {"x":17.25, "y":2,    "label":"P-Mult"},
-                {"x":0    , "y":3,    "label":"Left Ctrl", "w":1.25},
-                {"x":1.25 , "y":3,    "label":"Left Alt", "w":1.25},
-                {"x":2.5  , "y":3,    "label":"MO(2)"},
-                {"x":3.5  , "y":3,    "label":"Space", "w":2.75},
-                {"x":6.25 , "y":3,    "label":"Space", "w":2.25},
-                {"x":8.5  , "y":3,    "label":"MO(3)"},
-                {"x":9.5  , "y":3,    "label":"R Win / Alt Gr", "w":1.25},
-                {"x":10.75, "y":3,    "label":"MO(1)", "w":1.25},
-                {"x":12.125,"y":3.125,"label":"Left"},
-                {"x":13.125,"y":3.125,"label":"Down"},
-                {"x":14.125,"y":3.125,"label":"Right"},
-                {"x":15.25 ,"y":3,    "label":"P-0"},
-                {"x":16.25 ,"y":3,    "label":"P-Dot"},
-                {"x":17.25 ,"y":3,    "label":"P-Enter"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0, "w": 1.75},
+
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [3, 0], "x": 1.25, "y": 1},
+                {"matrix": [2, 1], "x": 2.25, "y": 1},
+                {"matrix": [3, 1], "x": 3.25, "y": 1},
+                {"matrix": [2, 2], "x": 4.25, "y": 1},
+                {"matrix": [3, 2], "x": 5.25, "y": 1},
+                {"matrix": [2, 3], "x": 6.25, "y": 1},
+                {"matrix": [3, 3], "x": 7.25, "y": 1},
+                {"matrix": [2, 4], "x": 8.25, "y": 1},
+                {"matrix": [3, 4], "x": 9.25, "y": 1},
+                {"matrix": [2, 5], "x": 10.25, "y": 1},
+                {"matrix": [3, 5], "x": 11.25, "y": 1},
+                {"matrix": [2, 6], "x": 12.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 7], "x": 14.25, "y": 1},
+                {"matrix": [3, 7], "x": 15.25, "y": 1},
+                {"matrix": [2, 8], "x": 16.25, "y": 1},
+                {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"matrix": [4, 6], "x": 13.125, "y": 2.125},
+
+                {"matrix": [4, 7], "x": 14.25, "y": 2},
+                {"matrix": [5, 7], "x": 15.25, "y": 2},
+                {"matrix": [4, 8], "x": 16.25, "y": 2},
+                {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [6, 1], "x": 2.5, "y": 3},
+                {"matrix": [7, 1], "x": 3.5, "y": 3, "w": 2.75},
+                {"matrix": [7, 3], "x": 6.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3, "w": 1.25},
+
+                {"matrix": [7, 5], "x": 12.125, "y": 3.125},
+                {"matrix": [7, 6], "x": 13.125, "y": 3.125},
+                {"matrix": [6, 7], "x": 14.125, "y": 3.125},
+
+                {"matrix": [7, 7], "x": 15.25, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+                {"matrix": [7, 8], "x": 17.25, "y": 3}
             ]
         }
     }