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

1 files changed, 98 insertions, 90 deletions

diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json
index 9decf28f70..e760ac11d8 100644
--- a/keyboards/monstargear/xo87/solderable/info.json
+++ b/keyboards/monstargear/xo87/solderable/info.json
@@ -25,101 +25,109 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K000", "x":0, "y":0},
-                {"label":"K001", "x":2, "y":0},
-                {"label":"K002", "x":3, "y":0},
-                {"label":"K003", "x":4, "y":0},
-                {"label":"K004", "x":5, "y":0},
-                {"label":"K005", "x":6.5, "y":0},
-                {"label":"K006", "x":7.5, "y":0},
-                {"label":"K007", "x":8.5, "y":0},
-                {"label":"K008", "x":9.5, "y":0},
-                {"label":"K009", "x":11, "y":0},
-                {"label":"K010", "x":12, "y":0},
-                {"label":"K011", "x":13, "y":0},
-                {"label":"K012", "x":14, "y":0},
-                {"label":"K013", "x":15.25, "y":0},
-                {"label":"K014", "x":16.25, "y":0},
-                {"label":"K015", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"label":"K100", "x":0, "y":1.25},
-                {"label":"K101", "x":1, "y":1.25},
-                {"label":"K102", "x":2, "y":1.25},
-                {"label":"K103", "x":3, "y":1.25},
-                {"label":"K104", "x":4, "y":1.25},
-                {"label":"K105", "x":5, "y":1.25},
-                {"label":"K106", "x":6, "y":1.25},
-                {"label":"K107", "x":7, "y":1.25},
-                {"label":"K108", "x":8, "y":1.25},
-                {"label":"K109", "x":9, "y":1.25},
-                {"label":"K110", "x":10, "y":1.25},
-                {"label":"K111", "x":11, "y":1.25},
-                {"label":"K112", "x":12, "y":1.25},
-                {"label":"K313", "x":13, "y":1.25, "w":2},
-                {"label":"K113", "x":15.25, "y":1.25},
-                {"label":"K114", "x":16.25, "y":1.25},
-                {"label":"K115", "x":17.25, "y":1.25},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
 
-                {"label":"K200", "x":0, "y":2.25, "w":1.5},
-                {"label":"K201", "x":1.5, "y":2.25},
-                {"label":"K202", "x":2.5, "y":2.25},
-                {"label":"K203", "x":3.5, "y":2.25},
-                {"label":"K204", "x":4.5, "y":2.25},
-                {"label":"K205", "x":5.5, "y":2.25},
-                {"label":"K206", "x":6.5, "y":2.25},
-                {"label":"K207", "x":7.5, "y":2.25},
-                {"label":"K208", "x":8.5, "y":2.25},
-                {"label":"K209", "x":9.5, "y":2.25},
-                {"label":"K210", "x":10.5, "y":2.25},
-                {"label":"K211", "x":11.5, "y":2.25},
-                {"label":"K212", "x":12.5, "y":2.25},
-                {"label":"K413", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K213", "x":15.25, "y":2.25},
-                {"label":"K214", "x":16.25, "y":2.25},
-                {"label":"K215", "x":17.25, "y":2.25},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
 
-                {"label":"K300", "x":0, "y":3.25, "w":1.75},
-                {"label":"K301", "x":1.75, "y":3.25},
-                {"label":"K302", "x":2.75, "y":3.25},
-                {"label":"K303", "x":3.75, "y":3.25},
-                {"label":"K304", "x":4.75, "y":3.25},
-                {"label":"K305", "x":5.75, "y":3.25},
-                {"label":"K306", "x":6.75, "y":3.25},
-                {"label":"K307", "x":7.75, "y":3.25},
-                {"label":"K308", "x":8.75, "y":3.25},
-                {"label":"K309", "x":9.75, "y":3.25},
-                {"label":"K310", "x":10.75, "y":3.25},
-                {"label":"K311", "x":11.75, "y":3.25},
-                {"label":"K312", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
 
-                {"label":"K400", "x":0, "y":4.25, "w":1.25},
-                {"label":"K401", "x":1.25, "y":4.25},
-                {"label":"K402", "x":2.25, "y":4.25},
-                {"label":"K403", "x":3.25, "y":4.25},
-                {"label":"K404", "x":4.25, "y":4.25},
-                {"label":"K405", "x":5.25, "y":4.25},
-                {"label":"K406", "x":6.25, "y":4.25},
-                {"label":"K407", "x":7.25, "y":4.25},
-                {"label":"K408", "x":8.25, "y":4.25},
-                {"label":"K409", "x":9.25, "y":4.25},
-                {"label":"K410", "x":10.25, "y":4.25},
-                {"label":"K411", "x":11.25, "y":4.25},
-                {"label":"K412", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"K414", "x":16.25, "y":4.25},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
 
-                {"label":"K500", "x":0, "y":5.25, "w":1.25},
-                {"label":"K501", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K502", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K505", "x":3.75, "y":5.25, "w":2.75},
-                {"label":"K506", "x":6.5, "y":5.25, "w":1.25},
-                {"label":"K509", "x":7.75, "y":5.25, "w":2.25},
-                {"label":"K510", "x":10, "y":5.25, "w":1.25},
-                {"label":"K511", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K512", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K415", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K513", "x":15.25, "y":5.25},
-                {"label":"K514", "x":16.25, "y":5.25},
-                {"label":"K515", "x":17.25, "y":5.25}
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 13], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 13], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 6], "x": 6.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 9], "x": 7.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 15], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.25}
             ]
         }
     }