Move Alice and Ergodox layouts to data driven (#20340)

2 files changed, 156 insertions, 170 deletions

diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json
index bc7aa9113c..8722c5e037 100644
--- a/keyboards/evyd13/wonderland/info.json
+++ b/keyboards/evyd13/wonderland/info.json
@@ -27,144 +27,169 @@
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"k10", "x":0, "y":0},
-                {"label":"k00", "x":1.25, "y":0},
-                {"label":"k01", "x":2.25, "y":0},
-                {"label":"k02", "x":3.25, "y":0},
-                {"label":"k03", "x":4.25, "y":0},
-                {"label":"k04", "x":5.25, "y":0},
-                {"label":"k05", "x":6.25, "y":0},
-                {"label":"k06", "x":7.25, "y":0},
-                {"label":"k07", "x":10.25, "y":0},
-                {"label":"k08", "x":11.25, "y":0},
-                {"label":"k09", "x":12.25, "y":0},
-                {"label":"k0a", "x":13.25, "y":0},
-                {"label":"k0b", "x":14.25, "y":0},
-                {"label":"k0c", "x":15.25, "y":0},
-                {"label":"k0d", "x":16.25, "y":0},
-                {"label":"k0e", "x":17.25, "y":0},
-                {"label":"k20", "x":0, "y":1},
-                {"label":"k11", "x":1.25, "y":1, "w":1.5},
-                {"label":"k12", "x":2.75, "y":1},
-                {"label":"k13", "x":3.75, "y":1},
-                {"label":"k14", "x":4.75, "y":1},
-                {"label":"k15", "x":5.75, "y":1},
-                {"label":"k16", "x":6.75, "y":1},
-                {"label":"k17", "x":9.75, "y":1},
-                {"label":"k18", "x":10.75, "y":1},
-                {"label":"k19", "x":11.75, "y":1},
-                {"label":"k1a", "x":12.75, "y":1},
-                {"label":"k1b", "x":13.75, "y":1},
-                {"label":"k1c", "x":14.75, "y":1},
-                {"label":"k1d", "x":15.75, "y":1},
-                {"label":"k1e", "x":16.75, "y":1, "w":1.5},
-                {"label":"k30", "x":0, "y":2},
-                {"label":"k21", "x":1.25, "y":2, "w":1.75},
-                {"label":"k22", "x":3, "y":2},
-                {"label":"k23", "x":4, "y":2},
-                {"label":"k24", "x":5, "y":2},
-                {"label":"k25", "x":6, "y":2},
-                {"label":"k26", "x":7, "y":2},
-                {"label":"k27", "x":10, "y":2},
-                {"label":"k28", "x":11, "y":2},
-                {"label":"k29", "x":12, "y":2},
-                {"label":"k2a", "x":13, "y":2},
-                {"label":"k2b", "x":14, "y":2},
-                {"label":"k2c", "x":15, "y":2},
-                {"label":"k2e", "x":16, "y":2, "w":2.25},
-                {"label":"k31", "x":1.25, "y":3, "w":2.25},
-                {"label":"k32", "x":3.5, "y":3},
-                {"label":"k33", "x":4.5, "y":3},
-                {"label":"k34", "x":5.5, "y":3},
-                {"label":"k35", "x":6.5, "y":3},
-                {"label":"k36", "x":7.5, "y":3},
-                {"label":"k37", "x":9.5, "y":3},
-                {"label":"k38", "x":10.5, "y":3},
-                {"label":"k39", "x":11.5, "y":3},
-                {"label":"k3a", "x":12.5, "y":3},
-                {"label":"k3b", "x":13.5, "y":3},
-                {"label":"k3c", "x":14.5, "y":3},
-                {"label":"k3d", "x":15.5, "y":3, "w":1.75},
-                {"label":"k3e", "x":17.25, "y":3},
-                {"label":"k41", "x":1.25, "y":4, "w":1.5},
-                {"label":"k43", "x":4.25, "y":4, "w":1.5},
-                {"label":"k45", "x":5.75, "y":4, "w":2},
-                {"label":"k46", "x":7.75, "y":4, "w":1.25},
-                {"label":"k48", "x":9.5, "y":4, "w":2.75},
-                {"label":"k4a", "x":12.25, "y":4, "w":1.5},
-                {"label":"k4e", "x":16.75, "y":4, "w":1.5}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"k10", "x":0, "y":0},
-                {"label":"k00", "x":1.25, "y":0},
-                {"label":"k01", "x":2.25, "y":0},
-                {"label":"k02", "x":3.25, "y":0},
-                {"label":"k03", "x":4.25, "y":0},
-                {"label":"k04", "x":5.25, "y":0},
-                {"label":"k05", "x":6.25, "y":0},
-                {"label":"k06", "x":7.25, "y":0},
-                {"label":"k07", "x":10.25, "y":0},
-                {"label":"k08", "x":11.25, "y":0},
-                {"label":"k09", "x":12.25, "y":0},
-                {"label":"k0a", "x":13.25, "y":0},
-                {"label":"k0b", "x":14.25, "y":0},
-                {"label":"k0c", "x":15.25, "y":0},
-                {"label":"k0e", "x":16.25, "y":0, "w":2},
-                {"label":"k20", "x":0, "y":1},
-                {"label":"k11", "x":1.25, "y":1, "w":1.5},
-                {"label":"k12", "x":2.75, "y":1},
-                {"label":"k13", "x":3.75, "y":1},
-                {"label":"k14", "x":4.75, "y":1},
-                {"label":"k15", "x":5.75, "y":1},
-                {"label":"k16", "x":6.75, "y":1},
-                {"label":"k17", "x":9.75, "y":1},
-                {"label":"k18", "x":10.75, "y":1},
-                {"label":"k19", "x":11.75, "y":1},
-                {"label":"k1a", "x":12.75, "y":1},
-                {"label":"k1b", "x":13.75, "y":1},
-                {"label":"k1c", "x":14.75, "y":1},
-                {"label":"k1d", "x":15.75, "y":1},
-                {"label":"k1e", "x":16.75, "y":1, "w":1.5},
-                {"label":"k30", "x":0, "y":2},
-                {"label":"k21", "x":1.25, "y":2, "w":1.75},
-                {"label":"k22", "x":3, "y":2},
-                {"label":"k23", "x":4, "y":2},
-                {"label":"k24", "x":5, "y":2},
-                {"label":"k25", "x":6, "y":2},
-                {"label":"k26", "x":7, "y":2},
-                {"label":"k27", "x":10, "y":2},
-                {"label":"k28", "x":11, "y":2},
-                {"label":"k29", "x":12, "y":2},
-                {"label":"k2a", "x":13, "y":2},
-                {"label":"k2b", "x":14, "y":2},
-                {"label":"k2c", "x":15, "y":2},
-                {"label":"k2e", "x":16, "y":2, "w":2.25},
-                {"label":"k31", "x":1.25, "y":3, "w":2.25},
-                {"label":"k32", "x":3.5, "y":3},
-                {"label":"k33", "x":4.5, "y":3},
-                {"label":"k34", "x":5.5, "y":3},
-                {"label":"k35", "x":6.5, "y":3},
-                {"label":"k36", "x":7.5, "y":3},
-                {"label":"k37", "x":9.5, "y":3},
-                {"label":"k38", "x":10.5, "y":3},
-                {"label":"k39", "x":11.5, "y":3},
-                {"label":"k3a", "x":12.5, "y":3},
-                {"label":"k3b", "x":13.5, "y":3},
-                {"label":"k3c", "x":14.5, "y":3},
-                {"label":"k3d", "x":15.5, "y":3, "w":1.75},
-                {"label":"k3e", "x":17.25, "y":3},
-                {"label":"k41", "x":1.25, "y":4, "w":1.5},
-                {"label":"k43", "x":4.25, "y":4, "w":1.5},
-                {"label":"k45", "x":5.75, "y":4, "w":2},
-                {"label":"k46", "x":7.75, "y":4, "w":1.25},
-                {"label":"k48", "x":9.5, "y":4, "w":2.75},
-                {"label":"k4a", "x":12.25, "y":4, "w":1.5},
-                {"label":"k4e", "x":16.75, "y":4, "w":1.5}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/wonderland/wonderland.h b/keyboards/evyd13/wonderland/wonderland.h
deleted file mode 100644
index 13ea147638..0000000000
--- a/keyboards/evyd13/wonderland/wonderland.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-#define LAYOUT_alice_split_bs( \
-    k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-         k41,           k43, k45, k46,      k48, k4a,                     k4e  \
-) \
-{ \
-    {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, k2c, XXX, k2e}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e}  \
-}
-
-#define LAYOUT_alice( \
-    k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
-    k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-         k41,           k43, k45, k46,      k48, k4a,                     k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, 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, k2c, XXX, k2e}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e}  \
-}
-
-#define LAYOUT LAYOUT_alice_split_bs
-
-void matrix_init_user(void);
-void matrix_scan_user(void);