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

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

2 files changed, 101 insertions, 124 deletions

diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json
index fd7d4c0725..e4832540d4 100644
--- a/keyboards/cannonkeys/ortho48/info.json
+++ b/keyboards/cannonkeys/ortho48/info.json
@@ -27,105 +27,111 @@
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
-        {"label":"Tab", "x":0, "y":0},
-        {"label":"Q", "x":1, "y":0},
-        {"label":"W", "x":2, "y":0},
-        {"label":"E", "x":3, "y":0},
-        {"label":"R", "x":4, "y":0},
-        {"label":"T", "x":5, "y":0},
-        {"label":"Y", "x":6, "y":0},
-        {"label":"U", "x":7, "y":0},
-        {"label":"I", "x":8, "y":0},
-        {"label":"O", "x":9, "y":0},
-        {"label":"P", "x":10, "y":0},
-        {"label":"Delete", "x":11, "y":0},
-        {"label":"Esc", "x":0, "y":1},
-        {"label":"A", "x":1, "y":1},
-        {"label":"S", "x":2, "y":1},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1},
-        {"label":"G", "x":5, "y":1},
-        {"label":"H", "x":6, "y":1},
-        {"label":"J", "x":7, "y":1},
-        {"label":"K", "x":8, "y":1},
-        {"label":"L", "x":9, "y":1},
-        {"label":";", "x":10, "y":1},
-        {"label":"'", "x":11, "y":1},
-        {"label":"Shift", "x":0, "y":2},
-        {"label":"Z", "x":1, "y":2},
-        {"label":"X", "x":2, "y":2},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2},
-        {"label":"B", "x":5, "y":2},
-        {"label":"N", "x":6, "y":2},
-        {"label":"M", "x":7, "y":2},
-        {"label":",", "x":8, "y":2},
-        {"label":".", "x":9, "y":2},
-        {"label":"/", "x":10, "y":2},
-        {"label":"Enter", "x":11, "y":2},
-        {"label":"Fn", "x":0, "y":3},
-        {"label":"Ctrl", "x":1, "y":3},
-        {"label":"Alt", "x":2, "y":3},
-        {"label":"Meta", "x":3, "y":3},
-        {"label":"Lower", "x":4, "y":3},
-        {"label":"Space", "x":5, "y":3},
-        {"label":"Space", "x":6, "y":3},
-        {"label":"Raise", "x":7, "y":3},
-        {"label":"Left", "x":8, "y":3},
-        {"label":"Down", "x":9, "y":3},
-        {"label":"Up", "x":10, "y":3},
-        {"label":"Right", "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}
       ]
     },
     "LAYOUT_1x2uC": {
       "layout": [
-        {"label":"Tab", "x":0, "y":0},
-        {"label":"Q", "x":1, "y":0},
-        {"label":"W", "x":2, "y":0},
-        {"label":"E", "x":3, "y":0},
-        {"label":"R", "x":4, "y":0},
-        {"label":"T", "x":5, "y":0},
-        {"label":"Y", "x":6, "y":0},
-        {"label":"U", "x":7, "y":0},
-        {"label":"I", "x":8, "y":0},
-        {"label":"O", "x":9, "y":0},
-        {"label":"P", "x":10, "y":0},
-        {"label":"Delete", "x":11, "y":0},
-        {"label":"Esc", "x":0, "y":1},
-        {"label":"A", "x":1, "y":1},
-        {"label":"S", "x":2, "y":1},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1},
-        {"label":"G", "x":5, "y":1},
-        {"label":"H", "x":6, "y":1},
-        {"label":"J", "x":7, "y":1},
-        {"label":"K", "x":8, "y":1},
-        {"label":"L", "x":9, "y":1},
-        {"label":";", "x":10, "y":1},
-        {"label":"'", "x":11, "y":1},
-        {"label":"Shift", "x":0, "y":2},
-        {"label":"Z", "x":1, "y":2},
-        {"label":"X", "x":2, "y":2},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2},
-        {"label":"B", "x":5, "y":2},
-        {"label":"N", "x":6, "y":2},
-        {"label":"M", "x":7, "y":2},
-        {"label":",", "x":8, "y":2},
-        {"label":".", "x":9, "y":2},
-        {"label":"/", "x":10, "y":2},
-        {"label":"Enter", "x":11, "y":2},
-        {"label":"Fn", "x":0, "y":3},
-        {"label":"Ctrl", "x":1, "y":3},
-        {"label":"Alt", "x":2, "y":3},
-        {"label":"Meta", "x":3, "y":3},
-        {"label":"Lower", "x":4, "y":3},
-        {"label":"Space", "x":5, "y":3, "w":2},
-        {"label":"Raise", "x":7, "y":3},
-        {"label":"Left", "x":8, "y":3},
-        {"label":"Down", "x":9, "y":3},
-        {"label":"Up", "x":10, "y":3},
-        {"label":"Right", "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}
       ]
     }
   }
diff --git a/keyboards/cannonkeys/ortho48/ortho48.h b/keyboards/cannonkeys/ortho48/ortho48.h
deleted file mode 100644
index 1e51c37af7..0000000000
--- a/keyboards/cannonkeys/ortho48/ortho48.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_1x2uC( \
-    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, KC_NO, 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 } \
-}