Move remaining `LAYOUT_all`s to data driven (#20463)

1 files changed, 78 insertions, 64 deletions

diff --git a/keyboards/hub20/info.json b/keyboards/hub20/info.json
index 991c4ebc46..994b9405d9 100644
--- a/keyboards/hub20/info.json
+++ b/keyboards/hub20/info.json
@@ -30,78 +30,92 @@
     "layouts": {
       "LAYOUT_all": {
         "layout": [
-          {"label":"Mute", "x":0.5, "y":0},
-          {"label":"Play / Pause", "x":2.5, "y":0},
-          {"label":"-", "x":0, "y":1},
-          {"label":"*", "x":1, "y":1},
-          {"label":"/", "x":2, "y":1},
-          {"label":"Numlock", "x":3, "y":1},
-          {"label":"+", "x":0, "y":2},
-          {"label":"7", "x":1, "y":2},
-          {"label":"8", "x":2, "y":2},
-          {"label":"9", "x":3, "y":2},
-          {"label":"+", "x":0, "y":3},
-          {"label":"4", "x":1, "y":3},
-          {"label":"5", "x":2, "y":3},
-          {"label":"6", "x":3, "y":3},
-          {"label":"Enter", "x":0, "y":4},
-          {"label":"1", "x":1, "y":4},
-          {"label":"2", "x":2, "y":4},
-          {"label":"3", "x":3, "y":4},
-          {"label":"Enter", "x":0, "y":5},
-          {"label":".", "x":1, "y":5},
-          {"label":"0", "x":2, "y":5},
-          {"label":"0", "x":3, "y":5}
+          {"matrix": [0, 1], "x": 0.5, "y": 0},
+
+          {"matrix": [0, 2], "x": 2.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+
+          {"matrix": [5, 0], "x": 0, "y": 5},
+          {"matrix": [5, 1], "x": 1, "y": 5},
+          {"matrix": [5, 2], "x": 2, "y": 5},
+          {"matrix": [5, 3], "x": 3, "y": 5}
         ]
       },
       "LAYOUT_left_handed": {
         "layout": [
-          {"label":"Mute", "x":0.5, "y":0},
-          {"label":"Play / Pause", "x":2.5, "y":0},
-          {"label":"-", "x":0, "y":1},
-          {"label":"*", "x":1, "y":1},
-          {"label":"/", "x":2, "y":1},
-          {"label":"Numlock", "x":3, "y":1},
-          {"label":"7", "x":1, "y":2},
-          {"label":"8", "x":2, "y":2},
-          {"label":"9", "x":3, "y":2},
-          {"label":"+", "x":0, "y":2, "h":2},
-          {"label":"4", "x":1, "y":3},
-          {"label":"5", "x":2, "y":3},
-          {"label":"6", "x":3, "y":3},
-          {"label":"Enter", "x":0, "y":4, "h":2},
-          {"label":"1", "x":1, "y":4},
-          {"label":"2", "x":2, "y":4},
-          {"label":"3", "x":3, "y":4},
-          {"label":".", "x":1, "y":5},
-          {"label":"0", "x":3, "y":5, "w":2}
+          {"matrix": [0, 1], "x": 0.5, "y": 0},
+
+          {"matrix": [0, 2], "x": 2.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "h": 2},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+
+          {"matrix": [4, 1], "x": 0, "y": 4, "h": 2},
+          {"matrix": [4, 2], "x": 1, "y": 4},
+          {"matrix": [4, 3], "x": 2, "y": 4},
+          {"matrix": [4, 0], "x": 3, "y": 4},
+
+          {"matrix": [5, 1], "x": 1, "y": 5},
+          {"matrix": [5, 2], "x": 2, "y": 5, "w": 2}
         ]
       },
       "LAYOUT_right_handed": {
         "layout": [
-          {"label":"Mute",         "x":0.5, "y":0},
-          {"label":"Play / Pause", "x":2.5, "y":0},
-          {"label":"Numlock",      "x":0, "y":1},
-          {"label":"/",            "x":1, "y":1},
-          {"label":"*",            "x":2, "y":1},
-          {"label":"-",            "x":3, "y":1},
-            
-          {"label":"7",            "x":0, "y":2},
-          {"label":"8",            "x":1, "y":2},
-          {"label":"9",            "x":2, "y":2},
-            
-          {"label":"4",            "x":0, "y":3},
-          {"label":"5",            "x":1, "y":3},
-          {"label":"6",            "x":2, "y":3},
-          {"label":"+",            "x":3, "y":2, "h":2},
-
-          {"label":"1",            "x":0, "y":4},
-          {"label":"2",            "x":1, "y":4},
-          {"label":"3",            "x":2, "y":4},
-
-          {"label":"0",            "x":0, "y":5, "w":2},
-          {"label":".",            "x":2, "y":5},
-          {"label":"Enter",        "x":3, "y":4, "h":2}
+          {"matrix": [0, 1], "x": 0.5, "y": 0},
+
+          {"matrix": [0, 2], "x": 2.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+
+          {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+          {"matrix": [5, 2], "x": 2, "y": 5},
+          {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
         ]
       }
     }