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

2 files changed, 67 insertions, 102 deletions

diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json
index 090c8bc4d7..e669e746df 100644
--- a/keyboards/ymdk/wings/info.json
+++ b/keyboards/ymdk/wings/info.json
@@ -29,87 +29,86 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0.25, "y":0.25},
-                {"x":1.25, "y":0.25},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0.25},
-                {"x":4.25, "y":0.25},
-                {"x":5.25, "y":0.25},
-                {"x":6.25, "y":0.25},
+                {"matrix": [0, 0], "x": 0.25, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 0.25},
 
-                {"x":9.5, "y":0.25},
-                {"x":10.5, "y":0.25},
-                {"x":11.5, "y":0.25},
-                {"x":12.5, "y":0.25},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0.25},
-                {"x":15.5, "y":0.25},
-                {"x":16.5, "y":0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25},
+                {"matrix": [0, 14], "x": 16.5, "y": 0.25},
 
-                {"x":18.25, "y":0},
+                {"matrix": [4, 14], "x": 18.25, "y": 0},
 
-                {"x":0, "y":1.25, "w":1.5},
-                {"x":1.5, "y":1.25},
-                {"x":2.75, "y":1.25},
-                {"x":3.75, "y":1.25},
-                {"x":4.75, "y":1.25},
-                {"x":5.75, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
 
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13.25, "y":1.25},
-                {"x":14.25, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25, "w":1.5},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
 
-                {"x":18.5, "y":1},
+                {"matrix": [1, 14], "x": 18.5, "y": 1},
 
-                {"x":0, "y":2.25, "w":1.75},
-                {"x":1.75, "y":2.25},
-                {"x":3, "y":2.25},
-                {"x":4, "y":2.25},
-                {"x":5, "y":2.25},
-                {"x":6, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2.25},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6, "y": 2.25},
 
-                {"x":9.25, "y":2.25},
-                {"x":10.25, "y":2.25},
-                {"x":11.25, "y":2.25},
-                {"x":12.25, "y":2.25},
-                {"x":13.75, "y":2.25},
-                {"x":14.75, "y":2.25},
-                {"x":15.75, "y":2.25, "w":2.25},
+                {"matrix": [2, 6], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
 
-                {"x":18.75, "y":2},
+                {"matrix": [2, 14], "x": 18.75, "y": 2},
 
-                {"x":0, "y":3.25, "w":2.25},
-                {"x":2.25, "y":3.25},
-                {"x":3.5, "y":3.25},
-                {"x":4.5, "y":3.25},
-                {"x":5.5, "y":3.25},
-                {"x":6.5, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 3.25},
 
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":13.5, "y":3.25},
-                {"x":14.5, "y":3.25},
-                {"x":15.5, "y":3.25, "w":1.75},
+                {"matrix": [3, 7], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 14.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 15.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.5, "y": 3.25},
 
-                {"x":17.5, "y":3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 6], "x": 5, "y": 4.25, "w": 2},
+                {"matrix": [4, 8], "x": 7, "y": 4.25},
 
-                {"x":0, "y":4.25, "w":1.5},
-                {"x":3.5, "y":4.25, "w":1.5},
-                {"x":5, "y":4.25, "w":2},
-                {"x":7, "y":4.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4.25, "w": 1.5},
 
-                {"x":9.75, "y":4.25, "w":2.75},
-                {"x":12.5, "y":4.25, "w":1.5},
-
-                {"x":16.5, "y":4.25},
-                {"x":17.5, "y":4.25},
-                {"x":18.5, "y":4.25}
+                {"matrix": [4, 11], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.5, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/ymdk/wings/wings.h b/keyboards/ymdk/wings/wings.h
deleted file mode 100644
index d9416157f1..0000000000
--- a/keyboards/ymdk/wings/wings.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 alittlepeace
- *
- * 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/>.
- */
-#include "quantum.h"
-#pragma once
-
-
-#define XXX KC_NO
-#define LAYOUT_all( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k4E, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D,           k2E, \
-	k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,           k3D,      \
-	k40, k42,                k46,      k48, k49, k4A,                k4B, k4C, k4D  \
-) \
-{ \
-	{ k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D, k0E}, \
-	{ k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D, k1E}, \
-	{ k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   XXX,   k2D, k2E}, \
-	{ k30,   XXX,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C,   k3D, XXX}, \
-	{ k40,   XXX,   k42,   XXX,   XXX,   XXX,   k46,   XXX,   k48,   k49,   k4A,   k4B,   k4C,   k4D, k4E}  \
-}