Move small macropad-ish layouts to data driven (#20341)

3 files changed, 19 insertions, 76 deletions

diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json
index d0e4b42329..98afd2252b 100644
--- a/keyboards/yampad/info.json
+++ b/keyboards/yampad/info.json
@@ -19,28 +19,28 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "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":"k10", "x":0, "y":1},
-                {"label":"k11", "x":1, "y":1},
-                {"label":"k12", "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},
 
-                {"label":"k20", "x":0, "y":2},
-                {"label":"k21", "x":1, "y":2},
-                {"label":"k22", "x":2, "y":2},
-                {"label":"k13", "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": [1, 3], "x": 3, "y": 1, "h": 2},
 
-                {"label":"k30", "x":0, "y":3},
-                {"label":"k31", "x":1, "y":3},
-                {"label":"k32", "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},
 
-                {"label":"k40", "x":0, "y":4},
-                {"label":"k41", "x":1, "y":4},
-                {"label":"k42", "x":2, "y":4},
-                {"label":"k43", "x":3, "y":3, "h":2}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/yampad/yampad.c b/keyboards/yampad/yampad.c
index eab218d3b9..45b0c42484 100644
--- a/keyboards/yampad/yampad.c
+++ b/keyboards/yampad/yampad.c
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "yampad.h"
+#include "quantum.h"
 
 #if defined(OLED_ENABLE)
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/yampad/yampad.h b/keyboards/yampad/yampad.h
deleted file mode 100644
index 68ec98ffdd..0000000000
--- a/keyboards/yampad/yampad.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-/* Copyright 2019
- *
- * 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 ___ KC_NO
-
-/* 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.
- */
-
-/* COSPAD numpad matrix layout
-   * ,-------------------.
-   * | 00 | 01 | 02 | 03 |
-   * |----|----|----|----|
-   * | 10 | 11 | 12 |    |
-   * |----|----|----| 13 |
-   * | 20 | 21 | 22 |    |
-   * |----|----|----|----|
-   * | 30 | 31 | 32 |    |
-   * |----|----|----| 43 |
-   * | 40 | 41 | 42 |    |
-   * `-------------------'
- */
-#define LAYOUT( \
-	k00, k01, k02, k03,  \
-	k10, k11, k12,       \
-	k20, k21, k22, k13,  \
-	k30, k31, k32,       \
-	k40, k41, k42, k43   \
-) \
-{ \
-	{k00, k01, k02, k03}, \
-	{k10, k11, k12, k13}, \
-	{k20, k21, k22, ___}, \
-	{k30, k31, k32, ___}, \
-	{k40, k41, k42, k43}  \
-}