Move split layouts to data driven (#20290)

2 files changed, 48 insertions, 26 deletions

diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json
index 9d1e2b806f..e42ec5a08d 100644
--- a/keyboards/maple_computing/minidox/rev1/info.json
+++ b/keyboards/maple_computing/minidox/rev1/info.json
@@ -19,9 +19,56 @@
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["split_3x5_3"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_split_3x5_3"
+  },
   "layouts": {
     "LAYOUT_split_3x5_3": {
-      "layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.125},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.125},
+        {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+        {"matrix": [4, 4], "x": 7, "y": 0.25},
+        {"matrix": [4, 3], "x": 8, "y": 0.125},
+        {"matrix": [4, 2], "x": 9, "y": 0},
+        {"matrix": [4, 1], "x": 10, "y": 0.125},
+        {"matrix": [4, 0], "x": 11, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.125},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.125},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+        {"matrix": [5, 4], "x": 7, "y": 1.25},
+        {"matrix": [5, 3], "x": 8, "y": 1.125},
+        {"matrix": [5, 2], "x": 9, "y": 1},
+        {"matrix": [5, 1], "x": 10, "y": 1.125},
+        {"matrix": [5, 0], "x": 11, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.125},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.125},
+        {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+        {"matrix": [6, 4], "x": 7, "y": 2.25},
+        {"matrix": [6, 3], "x": 8, "y": 2.125},
+        {"matrix": [6, 2], "x": 9, "y": 2},
+        {"matrix": [6, 1], "x": 10, "y": 2.125},
+        {"matrix": [6, 0], "x": 11, "y": 2.375},
+
+        {"matrix": [3, 2], "x": 2.5, "y": 4.75},
+        {"matrix": [3, 3], "x": 3.5, "y": 4.75},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.75, "h": 2},
+
+        {"matrix": [7, 4], "x": 6.5, "y": 3.75, "h": 2},
+        {"matrix": [7, 3], "x": 7.5, "y": 4.75},
+        {"matrix": [7, 2], "x": 8.5, "y": 4.75}
+      ]
     }
   }
 }
diff --git a/keyboards/maple_computing/minidox/rev1/rev1.h b/keyboards/maple_computing/minidox/rev1/rev1.h
deleted file mode 100644
index bb8bd64666..0000000000
--- a/keyboards/maple_computing/minidox/rev1/rev1.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_3( \
-  k01, k02, k03, k04, k05,    k45, k44, k43, k42, k41, \
-  k11, k12, k13, k14, k15,    k55, k54, k53, k52, k51, \
-  k21, k22, k23, k24, k25,    k65, k64, k63, k62, k61, \
-            k33, k34, k35,    k75, k74, k73            \
-  ) \
-  { \
-    { k01, k02, k03, k04, k05 }, \
-    { k11, k12, k13, k14, k15 }, \
-    { k21, k22, k23, k24, k25 }, \
-    { ___, ___, k33, k34, k35 }, \
-    { k41, k42, k43, k44, k45 }, \
-    { k51, k52, k53, k54, k55 }, \
-    { k61, k62, k63, k64, k65 }, \
-    { ___, ___, k73, k74, k75 } \
-  }
-
-#define LAYOUT LAYOUT_split_3x5_3