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

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

2 files changed, 26 insertions, 64 deletions

diff --git a/keyboards/snampad/info.json b/keyboards/snampad/info.json
index a8a9222d67..e5eb0272bb 100644
--- a/keyboards/snampad/info.json
+++ b/keyboards/snampad/info.json
@@ -19,27 +19,32 @@
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Tab", "x":1, "y":0},
-                {"label":"Fn", "x":2, "y":0},
-                {"label":"Back", "x":3, "y":0},
-                {"label":"Num Lock", "x":0, "y":1},
-                {"label":"/", "x":1, "y":1},
-                {"label":"*", "x":2, "y":1},
-                {"label":"-", "x":3, "y":1},
-                {"label":"7", "x":0, "y":2},
-                {"label":"8", "x":1, "y":2},
-                {"label":"9", "x":2, "y":2},
-                {"label":"4", "x":0, "y":3},
-                {"label":"5", "x":1, "y":3},
-                {"label":"6", "x":2, "y":3},
-                {"label":"+", "x":3, "y":2, "h":2},
-                {"label":"1", "x":0, "y":4},
-                {"label":"2", "x":1, "y":4},
-                {"label":"3", "x":2, "y":4},
-                {"label":"0", "x":0, "y":5, "w":2},
-                {"label":".", "x":2, "y":5},
-                {"label":"Enter", "x":3, "y":4, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+                {"matrix": [3, 1], "x": 1, "y": 2},
+                {"matrix": [3, 2], "x": 2, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 4},
+                {"matrix": [1, 1], "x": 1, "y": 4},
+                {"matrix": [1, 2], "x": 2, "y": 4},
+
+                {"matrix": [0, 1], "x": 0, "y": 5, "w": 2},
+                {"matrix": [0, 2], "x": 2, "y": 5},
+                {"matrix": [1, 3], "x": 3, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/snampad/snampad.h b/keyboards/snampad/snampad.h
deleted file mode 100644
index ec7a779a4c..0000000000
--- a/keyboards/snampad/snampad.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 Peter Tillemans
- *
- * 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( \
-               k00, k01, k02, k03,      \
-               k10, k11, k12, k13,      \
-               k20, k21, k22,           \
-               k30, k31, k32, k23,      \
-               k40, k41, k42,           \
-                 k51,    k52, k43       \
-) \
-{ \
-  { KC_NO, k51,   k52 , KC_NO},  \
-  { k40, k41,   k42 , k43},  \
-  { k30, k31,   k32 , KC_NO},  \
-  { k20, k21,   k22 , k23},  \
-  { k10, k11,   k12 , k13},  \
-  { k00, k01,   k02 , k03} \
-}