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

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

2 files changed, 134 insertions, 36 deletions

diff --git a/keyboards/fractal/fractal.h b/keyboards/fractal/fractal.h
deleted file mode 100755
index 0af7c22390..0000000000
--- a/keyboards/fractal/fractal.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \
-  K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411  \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-  { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-  { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-  { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }, \
-  { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411 }  \
-}
-
-#define LAYOUT_preonic_mit( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \
-  K400, K401, K402, K403, K404,    K406,    K407, K408, K409, K410, K411  \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-  { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-  { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-  { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }, \
-  { K400,  K401,  K402,  K403,  K404,  KC_NO, K406,  K407,  K408,  K409,  K410,  K411 }  \
-}
diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json
index a8d41c884a..0d2ce4aeca 100644
--- a/keyboards/fractal/info.json
+++ b/keyboards/fractal/info.json
@@ -18,10 +18,139 @@
   "community_layouts": ["ortho_5x12"],
   "layouts": {
     "LAYOUT_ortho_5x12": {
-      "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}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]
-      },
-      "LAYOUT_preonic_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}, {"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}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4, "w":2}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]
-        }
+      "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": [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},
+
+        {"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": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+        {"matrix": [4, 7], "x": 7, "y": 4},
+        {"matrix": [4, 8], "x": 8, "y": 4},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4}
+      ]
+    },
+    "LAYOUT_preonic_mit": {
+        "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": [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},
+
+          {"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": [4, 6], "x": 5, "y": 4, "w": 2},
+          {"matrix": [4, 7], "x": 7, "y": 4},
+          {"matrix": [4, 8], "x": 8, "y": 4},
+          {"matrix": [4, 9], "x": 9, "y": 4},
+          {"matrix": [4, 10], "x": 10, "y": 4},
+          {"matrix": [4, 11], "x": 11, "y": 4}
+        ]
+      }
     }
 }