Fix layouts containing keys with multiple matrix positions (#20191)

1 files changed, 74 insertions, 5 deletions

diff --git a/keyboards/handwired/ddg_56/info.json b/keyboards/handwired/ddg_56/info.json
index a6407d262d..2a0f5df409 100644
--- a/keyboards/handwired/ddg_56/info.json
+++ b/keyboards/handwired/ddg_56/info.json
@@ -25,11 +25,80 @@
   "layouts": {
       "LAYOUT": {
           "layout": [
-            {"x":0, "y":0.25}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":14, "y":1}, {"x":15, "y":1},
-            {"x":0, "y":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":14, "y":2}, {"x":15, "y":2},
-            {"x":0, "y":2.25}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2},
-            {"x":0, "y":3.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3},
-            {"x":14.5, "y":3.25}, {"x":1.3333, "y":4, "w":1.5}, {"x":2.8333, "y":4}, {"x":3.8333, "y":4, "w":1.25}, {"x":5.0833, "y":4}, {"x":6.0833, "y":4, "w":2.25}, {"x":8.3333, "y":4}, {"x":9.3333, "y":4, "w":1.25}, {"x":10.5833, "y":4}, {"x":11.5833, "y":4, "w":1.5}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}]
+            {"matrix": [0, 0], "x": 0, "y": 0.25},
+            {"matrix": [0, 1], "x": 1.25, "y": 0},
+            {"matrix": [0, 2], "x": 2.25, "y": 0},
+            {"matrix": [0, 3], "x": 3.25, "y": 0},
+            {"matrix": [0, 4], "x": 4.25, "y": 0},
+            {"matrix": [0, 5], "x": 5.25, "y": 0},
+            {"matrix": [0, 6], "x": 6.25, "y": 0},
+            {"matrix": [0, 7], "x": 7.25, "y": 0},
+            {"matrix": [0, 8], "x": 8.25, "y": 0},
+            {"matrix": [0, 9], "x": 9.25, "y": 0},
+            {"matrix": [0, 10], "x": 10.25, "y": 0},
+            {"matrix": [0, 11], "x": 11.25, "y": 0},
+            {"matrix": [0, 12], "x": 12.25, "y": 0},
+
+            {"matrix": [0, 13], "x": 14, "y": 1},
+            {"matrix": [1, 13], "x": 15, "y": 1},
+            {"matrix": [1, 0], "x": 0, "y": 1.25},
+            {"matrix": [1, 1], "x": 1.25, "y": 1},
+            {"matrix": [1, 2], "x": 2.25, "y": 1},
+            {"matrix": [1, 3], "x": 3.25, "y": 1},
+            {"matrix": [1, 4], "x": 4.25, "y": 1},
+            {"matrix": [1, 5], "x": 5.25, "y": 1},
+            {"matrix": [1, 6], "x": 6.25, "y": 1},
+            {"matrix": [1, 7], "x": 7.25, "y": 1},
+            {"matrix": [1, 8], "x": 8.25, "y": 1},
+            {"matrix": [1, 9], "x": 9.25, "y": 1},
+            {"matrix": [1, 10], "x": 10.25, "y": 1},
+            {"matrix": [1, 11], "x": 11.25, "y": 1},
+            {"matrix": [1, 12], "x": 12.25, "y": 1},
+
+            {"matrix": [2, 13], "x": 14, "y": 2},
+            {"matrix": [3, 13], "x": 15, "y": 2},
+            {"matrix": [2, 0], "x": 0, "y": 2.25},
+            {"matrix": [2, 1], "x": 1.25, "y": 2},
+            {"matrix": [2, 2], "x": 2.25, "y": 2},
+            {"matrix": [2, 3], "x": 3.25, "y": 2},
+            {"matrix": [2, 4], "x": 4.25, "y": 2},
+            {"matrix": [2, 5], "x": 5.25, "y": 2},
+            {"matrix": [2, 6], "x": 6.25, "y": 2},
+            {"matrix": [2, 7], "x": 7.25, "y": 2},
+            {"matrix": [2, 8], "x": 8.25, "y": 2},
+            {"matrix": [2, 9], "x": 9.25, "y": 2},
+            {"matrix": [2, 10], "x": 10.25, "y": 2},
+            {"matrix": [2, 11], "x": 11.25, "y": 2},
+            {"matrix": [2, 12], "x": 12.25, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3.25},
+            {"matrix": [3, 1], "x": 1.25, "y": 3},
+            {"matrix": [3, 2], "x": 2.25, "y": 3},
+            {"matrix": [3, 3], "x": 3.25, "y": 3},
+            {"matrix": [3, 4], "x": 4.25, "y": 3},
+            {"matrix": [3, 5], "x": 5.25, "y": 3},
+            {"matrix": [3, 6], "x": 6.25, "y": 3},
+            {"matrix": [3, 7], "x": 7.25, "y": 3},
+            {"matrix": [3, 8], "x": 8.25, "y": 3},
+            {"matrix": [3, 9], "x": 9.25, "y": 3},
+            {"matrix": [3, 10], "x": 10.25, "y": 3},
+            {"matrix": [3, 11], "x": 11.25, "y": 3},
+            {"matrix": [3, 12], "x": 12.25, "y": 3},
+            {"matrix": [4, 11], "x": 14.5, "y": 3.25},
+
+            {"matrix": [4, 1], "x": 1.3333, "y": 4, "w": 1.5},
+            {"matrix": [4, 2], "x": 2.8333, "y": 4},
+            {"matrix": [4, 3], "x": 3.8333, "y": 4, "w": 1.25},
+            {"matrix": [4, 4], "x": 5.0833, "y": 4},
+            {"matrix": [4, 5], "x": 6.0833, "y": 4, "w": 2.25},
+            {"matrix": [4, 6], "x": 8.3333, "y": 4},
+            {"matrix": [4, 7], "x": 9.3333, "y": 4, "w": 1.25},
+            {"matrix": [4, 8], "x": 10.5833, "y": 4},
+            {"matrix": [4, 9], "x": 11.5833, "y": 4, "w": 1.5},
+            {"matrix": [4, 10], "x": 13.5, "y": 4.25},
+            {"matrix": [4, 12], "x": 14.5, "y": 4.25},
+            {"matrix": [4, 13], "x": 15.5, "y": 4.25}
+          ]
       }
   }
 }