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

2 files changed, 57 insertions, 20 deletions

diff --git a/keyboards/mitosis/info.json b/keyboards/mitosis/info.json
index a6d48c4e4e..feab60b7fb 100644
--- a/keyboards/mitosis/info.json
+++ b/keyboards/mitosis/info.json
@@ -12,7 +12,63 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"x":0, "y":0.75}, {"x":1, "y":0.25}, {"x":2, "y":0}, {"x":3, "y":0.25}, {"x":4, "y":0.125}, {"x":7, "y":0.125}, {"x":8, "y":0.25}, {"x":9, "y":0}, {"x":10, "y":0.25}, {"x":11, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.25}, {"x":2, "y":1}, {"x":3, "y":1.25}, {"x":4, "y":1.125}, {"x":7, "y":1.125}, {"x":8, "y":1.25}, {"x":9, "y":1}, {"x":10, "y":1.25}, {"x":11, "y":1.75}, {"x":0, "y":2.75}, {"x":1, "y":2.25}, {"x":2, "y":2}, {"x":3, "y":2.25}, {"x":4, "y":2.125}, {"x":7, "y":2.125}, {"x":8, "y":2.25}, {"x":9, "y":2}, {"x":10, "y":2.25}, {"x":11, "y":2.75}, {"x":1.5, "y":3.75}, {"x":2.5, "y":3.75}, {"x":3.5, "y":3.75}, {"x":4.5, "y":3.75}, {"x":6.5, "y":3.75}, {"x":7.5, "y":3.75}, {"x":8.5, "y":3.75}, {"x":9.5, "y":3.75}, {"x":1.5, "y":4.75}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":4.75}, {"x":6.5, "y":4.75}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}, {"x":9.5, "y":4.75}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.75},
+        {"matrix": [0, 1], "x": 1, "y": 0.25},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.25},
+        {"matrix": [0, 4], "x": 4, "y": 0.125},
+
+        {"matrix": [0, 5], "x": 7, "y": 0.125},
+        {"matrix": [0, 6], "x": 8, "y": 0.25},
+        {"matrix": [0, 7], "x": 9, "y": 0},
+        {"matrix": [0, 8], "x": 10, "y": 0.25},
+        {"matrix": [0, 9], "x": 11, "y": 0.75},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.75},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.125},
+
+        {"matrix": [1, 5], "x": 7, "y": 1.125},
+        {"matrix": [1, 6], "x": 8, "y": 1.25},
+        {"matrix": [1, 7], "x": 9, "y": 1},
+        {"matrix": [1, 8], "x": 10, "y": 1.25},
+        {"matrix": [1, 9], "x": 11, "y": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.75},
+        {"matrix": [2, 1], "x": 1, "y": 2.25},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.25},
+        {"matrix": [2, 4], "x": 4, "y": 2.125},
+
+        {"matrix": [2, 5], "x": 7, "y": 2.125},
+        {"matrix": [2, 6], "x": 8, "y": 2.25},
+        {"matrix": [2, 7], "x": 9, "y": 2},
+        {"matrix": [2, 8], "x": 10, "y": 2.25},
+        {"matrix": [2, 9], "x": 11, "y": 2.75},
+
+        {"matrix": [3, 1], "x": 1.5, "y": 3.75},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.75},
+        {"matrix": [3, 3], "x": 3.5, "y": 3.75},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.75},
+
+        {"matrix": [3, 5], "x": 6.5, "y": 3.75},
+        {"matrix": [3, 6], "x": 7.5, "y": 3.75},
+        {"matrix": [3, 7], "x": 8.5, "y": 3.75},
+        {"matrix": [3, 8], "x": 9.5, "y": 3.75},
+
+        {"matrix": [4, 1], "x": 1.5, "y": 4.75},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.75},
+        {"matrix": [4, 3], "x": 3.5, "y": 4.75},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.75},
+
+        {"matrix": [4, 5], "x": 6.5, "y": 4.75},
+        {"matrix": [4, 6], "x": 7.5, "y": 4.75},
+        {"matrix": [4, 7], "x": 8.5, "y": 4.75},
+        {"matrix": [4, 8], "x": 9.5, "y": 4.75}
+      ]
     }
   }
 }
diff --git a/keyboards/mitosis/mitosis.h b/keyboards/mitosis/mitosis.h
index 4b7d3a60c4..04ef56503f 100644
--- a/keyboards/mitosis/mitosis.h
+++ b/keyboards/mitosis/mitosis.h
@@ -41,22 +41,3 @@
 #define set_led_cyan    PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G)
 #define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)
 */
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    k00, k01, k02, k03, k04,      k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13, k14,      k15, k16, k17, k18, k19, \
-    k20, k21, k22, k23, k24,      k25, k26, k27, k28, k29, \
-         k31, k32, k33, k34,      k35, k36, k37, k38, \
-         k41, k42, k43, k44,      k45, k46, k47, k48 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { XXX, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \
-    { XXX, k41, k42, k43, k44, k45, k46, k47, k48, XXX } \
-}