Move miscellaneous layouts to data driven (#20516)

2 files changed, 88 insertions, 30 deletions

diff --git a/keyboards/handwired/dactyl/dactyl.h b/keyboards/handwired/dactyl/dactyl.h
index b901b67673..575fcf7c01 100644
--- a/keyboards/handwired/dactyl/dactyl.h
+++ b/keyboards/handwired/dactyl/dactyl.h
@@ -23,32 +23,3 @@ extern bool i2c_initialized;
 
 void init_dactyl(void);
 void init_expander(void);
-
-#define XXX KC_NO
-
-#define LAYOUT_dactyl( \
-    k00, k01, k02, k03, k04, k05, \
-    k10, k11, k12, k13, k14, k15, \
-    k20, k21, k22, k23, k24, k25, \
-    k30, k31, k32, k33, k34, k35, \
-    k40, k41, k42, k43, k44, \
-                                  k55, k50, \
-                                       k54, \
-                             k53, k52, k51, \
-\
-              k06, k07, k08, k09, k0A, k0B, \
-              k16, k17, k18, k19, k1A, k1B, \
-              k26, k27, k28, k29, k2A, k2B, \
-              k36, k37, k38, k39, k3A, k3B, \
-                   k47, k48, k49, k4A, k4B, \
-    k5B, k56, \
-    k57, \
-    k5A, k59, k58 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, k42, k43, k44, XXX, XXX, k47, k48, k49, k4A, k4B }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B } \
-}
diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json
index 3883c165ee..8297e609a1 100644
--- a/keyboards/handwired/dactyl/info.json
+++ b/keyboards/handwired/dactyl/info.json
@@ -13,7 +13,94 @@
   "debounce": 15,
   "layouts": {
     "LAYOUT_dactyl": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0}, {"label":"k05", "x":5, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k14", "x":4, "y":1}, {"label":"k15", "x":5, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k23", "x":3, "y":2}, {"label":"k24", "x":4, "y":2}, {"label":"k25", "x":5, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k33", "x":3, "y":3}, {"label":"k34", "x":4, "y":3}, {"label":"k35", "x":5, "y":3}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k43", "x":3, "y":4}, {"label":"k44", "x":4, "y":4}, {"label":"k55", "x":6, "y":5}, {"label":"k50", "x":7, "y":5}, {"label":"k54", "x":7, "y":6}, {"label":"k53", "x":5, "y":6, "h":2}, {"label":"k52", "x":6, "y":6, "h":2}, {"label":"k51", "x":7, "y":7}, {"label":"k06", "x":11, "y":0}, {"label":"k07", "x":12, "y":0}, {"label":"k08", "x":13, "y":0}, {"label":"k09", "x":14, "y":0}, {"label":"k0A", "x":15, "y":0}, {"label":"k0B", "x":16, "y":0}, {"label":"k16", "x":11, "y":1}, {"label":"k17", "x":12, "y":1}, {"label":"k18", "x":13, "y":1}, {"label":"k19", "x":14, "y":1}, {"label":"k1A", "x":15, "y":1}, {"label":"k1B", "x":16, "y":1}, {"label":"k26", "x":11, "y":2}, {"label":"k27", "x":12, "y":2}, {"label":"k28", "x":13, "y":2}, {"label":"k29", "x":14, "y":2}, {"label":"k2A", "x":15, "y":2}, {"label":"k2B", "x":16, "y":2}, {"label":"k36", "x":11, "y":3}, {"label":"k37", "x":12, "y":3}, {"label":"k38", "x":13, "y":3}, {"label":"k39", "x":14, "y":3}, {"label":"k3A", "x":15, "y":3}, {"label":"k3B", "x":16, "y":3}, {"label":"k47", "x":12, "y":4}, {"label":"k48", "x":13, "y":4}, {"label":"k49", "x":14, "y":4}, {"label":"k4A", "x":15, "y":4}, {"label":"k4B", "x":16, "y":4}, {"label":"k5B", "x":9, "y":5}, {"label":"k56", "x":10, "y":5}, {"label":"k57", "x":9, "y":6}, {"label":"k5A", "x":9, "y":7}, {"label":"k59", "x":10, "y":6, "h":2}, {"label":"k58", "x":11, "y":6, "h":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 0], "x": 7, "y": 5},
+
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 3], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+
+        {"matrix": [5, 1], "x": 7, "y": 7},
+
+        {"matrix": [0, 6], "x": 11, "y": 0},
+        {"matrix": [0, 7], "x": 12, "y": 0},
+        {"matrix": [0, 8], "x": 13, "y": 0},
+        {"matrix": [0, 9], "x": 14, "y": 0},
+        {"matrix": [0, 10], "x": 15, "y": 0},
+        {"matrix": [0, 11], "x": 16, "y": 0},
+
+        {"matrix": [1, 6], "x": 11, "y": 1},
+        {"matrix": [1, 7], "x": 12, "y": 1},
+        {"matrix": [1, 8], "x": 13, "y": 1},
+        {"matrix": [1, 9], "x": 14, "y": 1},
+        {"matrix": [1, 10], "x": 15, "y": 1},
+        {"matrix": [1, 11], "x": 16, "y": 1},
+
+        {"matrix": [2, 6], "x": 11, "y": 2},
+        {"matrix": [2, 7], "x": 12, "y": 2},
+        {"matrix": [2, 8], "x": 13, "y": 2},
+        {"matrix": [2, 9], "x": 14, "y": 2},
+        {"matrix": [2, 10], "x": 15, "y": 2},
+        {"matrix": [2, 11], "x": 16, "y": 2},
+
+        {"matrix": [3, 6], "x": 11, "y": 3},
+        {"matrix": [3, 7], "x": 12, "y": 3},
+        {"matrix": [3, 8], "x": 13, "y": 3},
+        {"matrix": [3, 9], "x": 14, "y": 3},
+        {"matrix": [3, 10], "x": 15, "y": 3},
+        {"matrix": [3, 11], "x": 16, "y": 3},
+
+        {"matrix": [4, 7], "x": 12, "y": 4},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4},
+        {"matrix": [4, 11], "x": 16, "y": 4},
+
+        {"matrix": [5, 11], "x": 9, "y": 5},
+        {"matrix": [5, 6], "x": 10, "y": 5},
+
+        {"matrix": [5, 7], "x": 9, "y": 6},
+
+        {"matrix": [5, 10], "x": 9, "y": 7},
+
+        {"matrix": [5, 9], "x": 10, "y": 6, "h": 2},
+        {"matrix": [5, 8], "x": 11, "y": 6, "h": 2}
+      ]
     }
   }
 }