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

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

2 files changed, 59 insertions, 158 deletions

diff --git a/keyboards/kapcave/paladinpad/info.json b/keyboards/kapcave/paladinpad/info.json
index fcc6ba4941..245ef7066a 100644
--- a/keyboards/kapcave/paladinpad/info.json
+++ b/keyboards/kapcave/paladinpad/info.json
@@ -13,77 +13,81 @@
   "layouts": {
       "LAYOUT_ortho_5x4": {
           "layout": [
-              {"x":0, "y":0},
-              {"x":1, "y":0},
-              {"x":2, "y":0},
-              {"x":3, "y":0},
-              {"x":0, "y":1},
-              {"x":1, "y":1},
-              {"x":2, "y":1},
-              {"x":3, "y":1},
-              {"x":0, "y":2},
-              {"x":1, "y":2},
-              {"x":2, "y":2},
-              {"x":3, "y":2},
-              {"x":0, "y":3},
-              {"x":1, "y":3},
-              {"x":2, "y":3},
-              {"x":3, "y":3},
-              {"x":0, "y":4},
-              {"x":1, "y":4},
-              {"x":2, "y":4},
-              {"x":3, "y":4}
+              {"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": [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": [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": [3, 0], "x": 0, "y": 3},
+              {"matrix": [3, 1], "x": 1, "y": 3},
+              {"matrix": [3, 2], "x": 2, "y": 3},
+              {"matrix": [4, 3], "x": 3, "y": 3},
+
+              {"matrix": [4, 0], "x": 0, "y": 4},
+              {"matrix": [4, 2], "x": 1, "y": 4},
+              {"matrix": [4, 1], "x": 2, "y": 4},
+              {"matrix": [3, 3], "x": 3, "y": 4}
           ]
       },
       "LAYOUT_numpad_aek": {
           "layout": [
-              {"x":0, "y":0},
-              {"x":1, "y":0},
-              {"x":2, "y":0},
-              {"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},
 
-              {"x":0, "y":1},
-              {"x":1, "y":1},
-              {"x":2, "y":1},
-              {"x":3, "y":1},
+              {"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},
 
-              {"x":0, "y":2},
-              {"x":1, "y":2},
-              {"x":2, "y":2},
-              {"x":3, "y":2},
+              {"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},
 
-              {"x":0, "y":3},
-              {"x":1, "y":3},
-              {"x":2, "y":3},
+              {"matrix": [3, 0], "x": 0, "y": 3},
+              {"matrix": [3, 1], "x": 1, "y": 3},
+              {"matrix": [3, 2], "x": 2, "y": 3},
 
-              {"x":0, "y":4, "w":2},
-              {"x":2, "y":4},
-              {"x":3, "y":3, "h":2}
+              {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+              {"matrix": [4, 1], "x": 2, "y": 4},
+              {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
           ]
       },
       "LAYOUT_numpad_5x4": {
         "layout": [
-              {"x":0, "y":0},
-              {"x":1, "y":0},
-              {"x":2, "y":0},
-              {"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},
 
-              {"x":0, "y":1},
-              {"x":1, "y":1},
-              {"x":2, "y":1},
+              {"matrix": [1, 0], "x": 0, "y": 1},
+              {"matrix": [1, 1], "x": 1, "y": 1},
+              {"matrix": [1, 2], "x": 2, "y": 1},
 
-              {"x":0, "y":2},
-              {"x":1, "y":2},
-              {"x":2, "y":2},
-              {"x":3, "y":1, "h":2},
+              {"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": 1, "h": 2},
 
-              {"x":0, "y":3},
-              {"x":1, "y":3},
-              {"x":2, "y":3},
+              {"matrix": [3, 0], "x": 0, "y": 3},
+              {"matrix": [3, 1], "x": 1, "y": 3},
+              {"matrix": [3, 2], "x": 2, "y": 3},
 
-              {"x":0, "y":4, "w":2},
-              {"x":2, "y":4},
-              {"x":3, "y":3, "h":2}
+              {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+              {"matrix": [4, 1], "x": 2, "y": 4},
+              {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
         ]
     }
   }
diff --git a/keyboards/kapcave/paladinpad/paladinpad.h b/keyboards/kapcave/paladinpad/paladinpad.h
deleted file mode 100644
index 54b320c424..0000000000
--- a/keyboards/kapcave/paladinpad/paladinpad.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-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"
-
-/*
- * ┌─────┬─────┬─────┬─────┐
- * │Num1 │ Eq  │Slsh │Star │
- * ├─────┼─────┼─────┼─────┤
- * │  7  │  8  │  9  │     │
- * ├─────┼─────┼─────┤Plus │
- * │  4  │  5  │  6  │     │
- * ├─────┼─────┼─────┼─────┤
- * │  1  │  2  │  3  │     │
- * ├─────┴─────┼─────┤ Ent │
- * │     0     │  .  │     │
- * └───────────┴─────┴─────┘
- */
-
-#define LAYOUT_numpad_5x4( \
-	K_NUM1, K_SLSH, K_STAR, K_MINUS, \
-    K_7, K_8, K_9, \
-    K_4, K_5, K_6, K_PLUS, \
-    K_1, K_2, K_3, \
-         K_0, K_DOT, K_ENT   \
-) { \
-	{ K_NUM1, K_SLSH, K_STAR, K_MINUS }, \
-    { K_7, K_8, K_9, KC_NO }, \
-    { K_4, K_5, K_6, K_PLUS }, \
-    { K_1, K_2, K_3, K_ENT }, \
-    { K_0, K_DOT, KC_NO, KC_NO }  \
-}
-
-/*
- * ┌─────┬─────┬─────┬─────┐
- * │Num1 │Eql  │Slsh │Star │
- * ├─────┼─────┼─────┼─────┤
- * │  7  │  8  │  9  │Minus│
- * ├─────┼─────┼─────┼─────┤
- * │  4  │  5  │  6  │Plus │
- * ├─────┼─────┼─────┼─────┤
- * │  1  │  2  │  3  │     │
- * ├─────┼─────┼─────┤ Ent │
- * │  0  │ 10  │  .  │     │
- * └─────┴─────┴─────┴─────┘
- */
-
-#define LAYOUT_numpad_aek( \
-	K_NUM1, K_EQ1, K_SLSH1, K_STAR1, \
-    K_7, K_8, K_9, K_MINUS1, \
-    K_4, K_5, K_6, K_PLUS, \
-    K_1, K_2, K_3, \
-         K_0, K_DOT1, K_ENT   \
-) { \
-	{ K_NUM1, K_EQ1, K_SLSH1, K_STAR1 }, \
-    { K_7, K_8, K_9, K_MINUS1 }, \
-    { K_4, K_5, K_6, K_PLUS }, \
-    { K_1, K_2, K_3, K_ENT }, \
-    { K_0, K_DOT1, KC_NO, KC_NO }  \
-}
-
-/*
- * ┌─────┬─────┬─────┬─────┐
- * │Num1 │ Eq  │Slsh │Star │
- * ├─────┼─────┼─────┼─────┤
- * │  7  │  8  │  9  │Minus│
- * ├─────┼─────┼─────┼─────┤
- * │  4  │  5  │  6  │Plus │
- * ├─────┼─────┼─────┼─────┤
- * │  1  │  2  │  3  │ 11  │
- * ├─────┼─────┼─────┼─────┤
- * │  0  │ 10  │  .  │ Ent │
- * └─────┴─────┴─────┴─────┘
- */
-
-#define LAYOUT_ortho_5x4( \
-	K_NUM1, K_EQ1, K_SLSH1, K_STAR1, \
-    K_7, K_8, K_9, K_MINUS1, \
-    K_4, K_5, K_6, K_PLUS, \
-    K_1, K_2, K_3, K_11, \
-    K_0, K_10, K_DOT1, K_ENT   \
-) { \
-	{ K_NUM1, K_EQ1, K_SLSH1, K_STAR1 }, \
-    { K_7, K_8, K_9, K_MINUS1 }, \
-    { K_4, K_5, K_6, K_PLUS }, \
-    { K_1, K_2, K_3, K_ENT }, \
-    { K_0, K_DOT1, K_10, K_11 }  \
-}