Move remaining `LAYOUT`s to data driven (#20422)

1 files changed, 105 insertions, 92 deletions

diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json
index 41e3a6b4a2..62aa154c0b 100644
--- a/keyboards/meson/info.json
+++ b/keyboards/meson/info.json
@@ -23,100 +23,113 @@
     "layouts": {
       "LAYOUT": {
         "layout": [
-          {"label": "", "x": 0, "y": 0},
-          {"label": "", "x": 1, "y": 0},
-          {"label": "", "x": 2, "y": 0},
-          {"label": "", "x": 3, "y": 0},
-          {"label": "", "x": 4, "y": 0},
-          {"label": "", "x": 5, "y": 0},
-          {"label": "", "x": 6, "y": 0},
-          {"label": "", "x": 8.5, "y": 0},
-          {"label": "", "x": 9.5, "y": 0},
-          {"label": "", "x": 10.5, "y": 0},
-          {"label": "", "x": 11.5, "y": 0},
-          {"label": "", "x": 12.5, "y": 0},
-          {"label": "", "x": 13.5, "y": 0},
-          {"label": "", "x": 14.5, "y": 0},
-          {"label": "", "x": 0, "y": 1},
-          {"label": "", "x": 1, "y": 1},
-          {"label": "", "x": 2, "y": 1},
-          {"label": "", "x": 3, "y": 1},
-          {"label": "", "x": 4, "y": 1},
-          {"label": "", "x": 5, "y": 1},
-          {"label": "", "x": 6, "y": 1},
-          {"label": "", "x": 8.5, "y": 1},
-          {"label": "", "x": 9.5, "y": 1},
-          {"label": "", "x": 10.5, "y": 1},
-          {"label": "", "x": 11.5, "y": 1},
-          {"label": "", "x": 12.5, "y": 1},
-          {"label": "", "x": 13.5, "y": 1},
-          {"label": "", "x": 14.5, "y": 1},
-          {"label": "", "x": 0, "y": 2},
-          {"label": "", "x": 1, "y": 2},
-          {"label": "", "x": 2, "y": 2},
-          {"label": "", "x": 3, "y": 2},
-          {"label": "", "x": 4, "y": 2},
-          {"label": "", "x": 5, "y": 2},
-          {"label": "", "x": 6, "y": 2},
-          {"label": "", "x": 8.5, "y": 2},
-          {"label": "", "x": 9.5, "y": 2},
-          {"label": "", "x": 10.5, "y": 2},
-          {"label": "", "x": 11.5, "y": 2},
-          {"label": "", "x": 12.5, "y": 2},
-          {"label": "", "x": 13.5, "y": 2},
-          {"label": "", "x": 14.5, "y": 2},
-          {"label": "", "x": 4, "y": 3},
-          {"label": "", "x": 5, "y": 3},
-          {"label": "", "x": 9.5, "y": 3},
-          {"label": "", "x": 10.5, "y": 3}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+
+          {"matrix": [4, 6], "x": 8.5, "y": 0},
+          {"matrix": [4, 5], "x": 9.5, "y": 0},
+          {"matrix": [4, 4], "x": 10.5, "y": 0},
+          {"matrix": [4, 3], "x": 11.5, "y": 0},
+          {"matrix": [4, 2], "x": 12.5, "y": 0},
+          {"matrix": [4, 1], "x": 13.5, "y": 0},
+          {"matrix": [4, 0], "x": 14.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": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+
+          {"matrix": [5, 6], "x": 8.5, "y": 1},
+          {"matrix": [5, 5], "x": 9.5, "y": 1},
+          {"matrix": [5, 4], "x": 10.5, "y": 1},
+          {"matrix": [5, 3], "x": 11.5, "y": 1},
+          {"matrix": [5, 2], "x": 12.5, "y": 1},
+          {"matrix": [5, 1], "x": 13.5, "y": 1},
+          {"matrix": [5, 0], "x": 14.5, "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": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+
+          {"matrix": [6, 6], "x": 8.5, "y": 2},
+          {"matrix": [6, 5], "x": 9.5, "y": 2},
+          {"matrix": [6, 4], "x": 10.5, "y": 2},
+          {"matrix": [6, 3], "x": 11.5, "y": 2},
+          {"matrix": [6, 2], "x": 12.5, "y": 2},
+          {"matrix": [6, 1], "x": 13.5, "y": 2},
+          {"matrix": [6, 0], "x": 14.5, "y": 2},
+
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [7, 5], "x": 9.5, "y": 3},
+          {"matrix": [7, 4], "x": 10.5, "y": 3}
         ]
-      }, 
-    "LAYOUT_2u": {
+      },
+      "LAYOUT_2u": {
         "layout": [
-          {"label": "", "x": 0, "y": 0},
-          {"label": "", "x": 1, "y": 0},
-          {"label": "", "x": 2, "y": 0},
-          {"label": "", "x": 3, "y": 0},
-          {"label": "", "x": 4, "y": 0},
-          {"label": "", "x": 5, "y": 0},
-          {"label": "", "x": 6, "y": 0},
-          {"label": "", "x": 8.5, "y": 0},
-          {"label": "", "x": 9.5, "y": 0},
-          {"label": "", "x": 10.5, "y": 0},
-          {"label": "", "x": 11.5, "y": 0},
-          {"label": "", "x": 12.5, "y": 0},
-          {"label": "", "x": 13.5, "y": 0},
-          {"label": "", "x": 14.5, "y": 0},
-          {"label": "", "x": 0, "y": 1},
-          {"label": "", "x": 1, "y": 1},
-          {"label": "", "x": 2, "y": 1},
-          {"label": "", "x": 3, "y": 1},
-          {"label": "", "x": 4, "y": 1},
-          {"label": "", "x": 5, "y": 1},
-          {"label": "", "x": 6, "y": 1},
-          {"label": "", "x": 8.5, "y": 1},
-          {"label": "", "x": 9.5, "y": 1},
-          {"label": "", "x": 10.5, "y": 1},
-          {"label": "", "x": 11.5, "y": 1},
-          {"label": "", "x": 12.5, "y": 1},
-          {"label": "", "x": 13.5, "y": 1},
-          {"label": "", "x": 14.5, "y": 1},
-          {"label": "", "x": 0, "y": 2},
-          {"label": "", "x": 1, "y": 2},
-          {"label": "", "x": 2, "y": 2},
-          {"label": "", "x": 3, "y": 2},
-          {"label": "", "x": 4, "y": 2},
-          {"label": "", "x": 5, "y": 2},
-          {"label": "", "x": 6, "y": 2},
-          {"label": "", "x": 8.5, "y": 2},
-          {"label": "", "x": 9.5, "y": 2},
-          {"label": "", "x": 10.5, "y": 2},
-          {"label": "", "x": 11.5, "y": 2},
-          {"label": "", "x": 12.5, "y": 2},
-          {"label": "", "x": 13.5, "y": 2},
-          {"label": "", "x": 14.5, "y": 2},
-          {"label": "", "x": 4, "y": 3, "w": 2},
-          {"label": "", "x": 9.5, "y": 3, "w": 2}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+
+          {"matrix": [4, 6], "x": 8.5, "y": 0},
+          {"matrix": [4, 5], "x": 9.5, "y": 0},
+          {"matrix": [4, 4], "x": 10.5, "y": 0},
+          {"matrix": [4, 3], "x": 11.5, "y": 0},
+          {"matrix": [4, 2], "x": 12.5, "y": 0},
+          {"matrix": [4, 1], "x": 13.5, "y": 0},
+          {"matrix": [4, 0], "x": 14.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": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+
+          {"matrix": [5, 6], "x": 8.5, "y": 1},
+          {"matrix": [5, 5], "x": 9.5, "y": 1},
+          {"matrix": [5, 4], "x": 10.5, "y": 1},
+          {"matrix": [5, 3], "x": 11.5, "y": 1},
+          {"matrix": [5, 2], "x": 12.5, "y": 1},
+          {"matrix": [5, 1], "x": 13.5, "y": 1},
+          {"matrix": [5, 0], "x": 14.5, "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": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+
+          {"matrix": [6, 6], "x": 8.5, "y": 2},
+          {"matrix": [6, 5], "x": 9.5, "y": 2},
+          {"matrix": [6, 4], "x": 10.5, "y": 2},
+          {"matrix": [6, 3], "x": 11.5, "y": 2},
+          {"matrix": [6, 2], "x": 12.5, "y": 2},
+          {"matrix": [6, 1], "x": 13.5, "y": 2},
+          {"matrix": [6, 0], "x": 14.5, "y": 2},
+
+          {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+
+          {"matrix": [7, 4], "x": 9.5, "y": 3, "w": 2}
         ]
       }
     }