Move single `LAYOUT`s to data driven (#20365)

2 files changed, 61 insertions, 20 deletions

diff --git a/keyboards/dichotomy/dichotomy.h b/keyboards/dichotomy/dichotomy.h
index 37372d6496..f62ed49aa0 100755
--- a/keyboards/dichotomy/dichotomy.h
+++ b/keyboards/dichotomy/dichotomy.h
@@ -23,22 +23,3 @@
 #define set_led_magenta() red_led_on();  grn_led_off(); blu_led_on()
 #define set_led_cyan()    red_led_off(); grn_led_on();  blu_led_on()
 #define set_led_white()   red_led_on();  grn_led_on();  blu_led_on()
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    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, \
-                   k33, k34, k35,      k36, k37, k38, \
-              k42, k43, k44, k45,      k46, k47, k48, k49 \
-) { \
-    { 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 }, \
-    { XXX, XXX, XXX, k33, k34, k35, k36, k37, k38, XXX, XXX, XXX }, \
-    { XXX, XXX, k42, k43, k44, k45, k46, k47, k48, k49, XXX, XXX } \
-}
diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/info.json
index bd37a0a2c7..1b2d9a29c9 100644
--- a/keyboards/dichotomy/info.json
+++ b/keyboards/dichotomy/info.json
@@ -12,7 +12,67 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"k00", "x":0, "y":0.5}, {"label":"k01", "x":1, "y":0.5}, {"label":"k02", "x":2, "y":0.25}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0.5}, {"label":"k05", "x":5, "y":0.5}, {"label":"k06", "x":7, "y":0.5}, {"label":"k07", "x":8, "y":0.5}, {"label":"k08", "x":9, "y":0}, {"label":"k09", "x":10, "y":0.25}, {"label":"k0A", "x":11, "y":0.5}, {"label":"k0B", "x":12, "y":0.5}, {"label":"k10", "x":0, "y":1.5}, {"label":"k11", "x":1, "y":1.5}, {"label":"k12", "x":2, "y":1.25}, {"label":"k13", "x":3, "y":1}, {"label":"k14", "x":4, "y":1.5}, {"label":"k15", "x":5, "y":1.5}, {"label":"k16", "x":7, "y":1.5}, {"label":"k17", "x":8, "y":1.5}, {"label":"k18", "x":9, "y":1}, {"label":"k19", "x":10, "y":1.25}, {"label":"k1A", "x":11, "y":1.5}, {"label":"k1B", "x":12, "y":1.5}, {"label":"k20", "x":0, "y":2.5}, {"label":"k21", "x":1, "y":2.5}, {"label":"k22", "x":2, "y":2.25}, {"label":"k23", "x":3, "y":2}, {"label":"k24", "x":4, "y":2.5}, {"label":"k25", "x":5, "y":2.5}, {"label":"k26", "x":7, "y":2.5}, {"label":"k27", "x":8, "y":2.5}, {"label":"k28", "x":9, "y":2}, {"label":"k29", "x":10, "y":2.25}, {"label":"k2A", "x":11, "y":2.5}, {"label":"k2B", "x":12, "y":2.5}, {"label":"k33", "x":3, "y":4}, {"label":"k34", "x":4, "y":4}, {"label":"k35", "x":5, "y":4}, {"label":"k36", "x":7, "y":4}, {"label":"k37", "x":8, "y":4}, {"label":"k38", "x":9, "y":4}, {"label":"k42", "x":2, "y":5}, {"label":"k43", "x":3, "y":5}, {"label":"k44", "x":4, "y":5}, {"label":"k45", "x":5, "y":5}, {"label":"k46", "x":7, "y":5}, {"label":"k47", "x":8, "y":5}, {"label":"k48", "x":9, "y":5}, {"label":"k49", "x":10, "y":5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.5},
+        {"matrix": [0, 1], "x": 1, "y": 0.5},
+        {"matrix": [0, 2], "x": 2, "y": 0.25},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.5},
+        {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+        {"matrix": [0, 6], "x": 7, "y": 0.5},
+        {"matrix": [0, 7], "x": 8, "y": 0.5},
+        {"matrix": [0, 8], "x": 9, "y": 0},
+        {"matrix": [0, 9], "x": 10, "y": 0.25},
+        {"matrix": [0, 10], "x": 11, "y": 0.5},
+        {"matrix": [0, 11], "x": 12, "y": 0.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+        {"matrix": [1, 6], "x": 7, "y": 1.5},
+        {"matrix": [1, 7], "x": 8, "y": 1.5},
+        {"matrix": [1, 8], "x": 9, "y": 1},
+        {"matrix": [1, 9], "x": 10, "y": 1.25},
+        {"matrix": [1, 10], "x": 11, "y": 1.5},
+        {"matrix": [1, 11], "x": 12, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5},
+        {"matrix": [2, 1], "x": 1, "y": 2.5},
+        {"matrix": [2, 2], "x": 2, "y": 2.25},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.5},
+        {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+        {"matrix": [2, 6], "x": 7, "y": 2.5},
+        {"matrix": [2, 7], "x": 8, "y": 2.5},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2.25},
+        {"matrix": [2, 10], "x": 11, "y": 2.5},
+        {"matrix": [2, 11], "x": 12, "y": 2.5},
+
+        {"matrix": [3, 3], "x": 3, "y": 4},
+        {"matrix": [3, 4], "x": 4, "y": 4},
+        {"matrix": [3, 5], "x": 5, "y": 4},
+
+        {"matrix": [3, 6], "x": 7, "y": 4},
+        {"matrix": [3, 7], "x": 8, "y": 4},
+        {"matrix": [3, 8], "x": 9, "y": 4},
+
+        {"matrix": [4, 2], "x": 2, "y": 5},
+        {"matrix": [4, 3], "x": 3, "y": 5},
+        {"matrix": [4, 4], "x": 4, "y": 5},
+        {"matrix": [4, 5], "x": 5, "y": 5},
+
+        {"matrix": [4, 6], "x": 7, "y": 5},
+        {"matrix": [4, 7], "x": 8, "y": 5},
+        {"matrix": [4, 8], "x": 9, "y": 5},
+        {"matrix": [4, 9], "x": 10, "y": 5}
+      ]
     }
   }
 }