Move ortho & numpad layouts to data driven (#20183)

Co-authored-by: Nick Brassel <nick@tzarc.org>

2 files changed, 108 insertions, 125 deletions

diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json
index d495b69365..cedf1fae5d 100644
--- a/keyboards/dm9records/plaid/info.json
+++ b/keyboards/dm9records/plaid/info.json
@@ -16,107 +16,120 @@
   "processor": "atmega328p",
   "bootloader": "usbasploader",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_plaid_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_plaid_mit": "LAYOUT_planck_mit"
+  },
   "layouts": {
     "LAYOUT_planck_mit": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "w": 2, "x": 5, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 } ]
+        {"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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "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": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "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": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "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, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 } ]
+        {"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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "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": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "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": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "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": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/dm9records/plaid/plaid.h b/keyboards/dm9records/plaid/plaid.h
index 2969967884..6687db5522 100644
--- a/keyboards/dm9records/plaid/plaid.h
+++ b/keyboards/dm9records/plaid/plaid.h
@@ -18,35 +18,5 @@
 
 #include "quantum.h"
 
-#define LAYOUT_planck_mit( \
-	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,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-	{ 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, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-	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 \
-) \
-{ \
-	{ 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 } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_plaid_grid LAYOUT_ortho_4x12
-#define LAYOUT_plaid_mit LAYOUT_planck_mit
-
 #define LED_RED C5
 #define LED_GREEN C4