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

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

2 files changed, 24 insertions, 82 deletions

diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json
index 11e85c1e2b..af1906a5fc 100644
--- a/keyboards/ymdk/ymd21/v2/info.json
+++ b/keyboards/ymdk/ymd21/v2/info.json
@@ -23,35 +23,35 @@
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"F3", "x":2, "y":0},
-                {"label":"F4", "x":3, "y":0},
+                {"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},
 
-                {"label":"Num Lock", "x":0, "y":1.25},
-                {"label":"/", "x":1, "y":1.25},
-                {"label":"*", "x":2, "y":1.25},
-                {"label":"-", "x":3, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
 
-                {"label":"7", "x":0, "y":2.25},
-                {"label":"8", "x":1, "y":2.25},
-                {"label":"9", "x":2, "y":2.25},
-                {"label":"=", "x":3, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
 
-                {"label":"4", "x":0, "y":3.25},
-                {"label":"5", "x":1, "y":3.25},
-                {"label":"6", "x":2, "y":3.25},
-                {"label":"+", "x":3, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
 
-                {"label":"1", "x":0, "y":4.25},
-                {"label":"2", "x":1, "y":4.25},
-                {"label":"3", "x":2, "y":4.25},
-                {"label":"Space", "x":3, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
 
-                {"label":"Fn", "x":0, "y":5.25},
-                {"label":"0", "x":1, "y":5.25},
-                {"label":".", "x":2, "y":5.25},
-                {"label":"Enter", "x":3, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/ymdk/ymd21/v2/v2.h b/keyboards/ymdk/ymd21/v2/v2.h
deleted file mode 100644
index a234b60508..0000000000
--- a/keyboards/ymdk/ymd21/v2/v2.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2022 QMK / James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┐
- * │00 │01 │02 │03 │
- * └───┴───┴───┴───┘
- * ┌───┬───┬───┬───┐
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤   ┌───┐
- * │20 │21 │22 │23 │   │   │
- * ├───┼───┼───┼───┤   │?? │ 2u Plus
- * │30 │31 │32 │33 │   │   │
- * ├───┼───┼───┼───┤   ├───┤
- * │40 │41 │42 │43 │   │   │
- * ├───┼───┼───┼───┤   │?? │ 2u Enter
- * │50 │51 │52 │53 │   │   │
- * └───┴───┴───┴───┘   └───┘
- * ┌───────┐
- * │??     │ 2u 0
- * └───────┘
- */
-
-
-#define LAYOUT_ortho_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43, \
-    K50, K51, K52, K53  \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41, K42, K43 }, \
-    { K50, K51, K52, K53 }, \
-}