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

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

2 files changed, 21 insertions, 65 deletions

diff --git a/keyboards/matchstickworks/southpad/info.json b/keyboards/matchstickworks/southpad/info.json
index 6715c441a0..887c0484cb 100644
--- a/keyboards/matchstickworks/southpad/info.json
+++ b/keyboards/matchstickworks/southpad/info.json
@@ -18,32 +18,32 @@
     "layouts": {
         "LAYOUT_numpad_6x4_southpaw": {
             "layout": [
-                {"label":"Bksp", "x":0, "y":0},
-                {"label":"=", "x":1, "y":0},
-                {"label":"(", "x":2, "y":0},
-                {"label":")", "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":"-", "x":0, "y":1},
-                {"label":"*", "x":1, "y":1},
-                {"label":"/", "x":2, "y":1},
-                {"label":"Num Lock", "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},
 
-                {"label":"9", "x":1, "y":2},
-                {"label":"8", "x":2, "y":2},
-                {"label":"7", "x":3, "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, 0], "x": 0, "y": 2, "h": 2},
 
-                {"label":"+", "x":0, "y":2, "h":2},
-                {"label":"6", "x":1, "y":3},
-                {"label":"5", "x":2, "y":3},
-                {"label":"4", "x":3, "y":3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                {"label":"3", "x":1, "y":4},
-                {"label":"2", "x":2, "y":4},
-                {"label":"1", "x":3, "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, 0], "x": 0, "y": 4, "h": 2},
 
-                {"label":"Enter", "x":0, "y":4, "h":2},
-                {"label":".", "x":1, "y":5},
-                {"label":"0", "x":2, "y":5, "w":2}
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 3], "x": 2, "y": 5, "w": 2}
             ]
         }
     }
diff --git a/keyboards/matchstickworks/southpad/southpad.h b/keyboards/matchstickworks/southpad/southpad.h
deleted file mode 100644
index bdfb11bdd0..0000000000
--- a/keyboards/matchstickworks/southpad/southpad.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 Logan Butler
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_numpad_6x4_southpaw( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-         k21, k22, k23, \
-    k20, k31, k32, k33, \
-         k41, k42, k43, \
-    k40, k51,   k53     \
-) \
-{ \
-    { k00,   k01, k02,   k03 }, \
-    { k10,   k11, k12,   k13 }, \
-    { k20,   k21, k22,   k23 }, \
-    { KC_NO, k31, k32,   k33 }, \
-    { k40,   k41, k42,   k43 }, \
-    { KC_NO, k51, KC_NO, k53 }  \
-}
-