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

2 files changed, 74 insertions, 37 deletions

diff --git a/keyboards/handwired/ddg_56/ddg_56.h b/keyboards/handwired/ddg_56/ddg_56.h
deleted file mode 100644
index dd0c78bea0..0000000000
--- a/keyboards/handwired/ddg_56/ddg_56.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define LAYOUT( \
-     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,     k0D, k1D, \
-     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,     k2D, k3D, \
-     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
-     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,        k4B, \
-               k41, k42, k43, k44, k45, k46, k47, k48, k49,             k4A, k4C, k4D \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
-    { k30, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \
-}
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}
+          ]
       }
   }
 }