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

3 files changed, 23 insertions, 57 deletions

diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json
index 6ec3f15d62..3c2e69eb83 100644
--- a/keyboards/xbows/numpad/info.json
+++ b/keyboards/xbows/numpad/info.json
@@ -19,34 +19,33 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"Esc", "x":0, "y":0},
-              {"label":"Tab", "x":1, "y":0},
-              {"label":"Backspace", "x":2, "y":0},
-              {"label":"Fn", "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.5},
-              {"label":"/", "x":1, "y":1.5},
-              {"label":"*", "x":2, "y":1.5},
-              {"label":"=", "x":3, "y":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
 
-              {"label":"7", "x":0, "y":2.5},
-              {"label":"8", "x":1, "y":2.5},
-              {"label":"9", "x":2, "y":2.5},
-              {"label":"-", "x":3, "y":2.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
 
-              {"label":"4", "x":0, "y":3.5},
-              {"label":"5", "x":1, "y":3.5},
-              {"label":"6", "x":2, "y":3.5},
-              {"label":"+", "x":3, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.5},
 
-              {"label":"1", "x":0, "y":4.5},
-              {"label":"2", "x":1, "y":4.5},
-              {"label":"3", "x":2, "y":4.5},
-              {"label":"Enter", "x":3, "y":4.5, "h":2},
-
-              {"label":"0", "x":0, "y":5.5, "w":2},
-              {"label":".", "x":2, "y":5.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2},
 
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/xbows/numpad/numpad.c b/keyboards/xbows/numpad/numpad.c
index 4d6c256981..da20172f34 100644
--- a/keyboards/xbows/numpad/numpad.c
+++ b/keyboards/xbows/numpad/numpad.c
@@ -13,7 +13,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 "numpad.h"
+ #include "quantum.h"
  #ifdef RGB_MATRIX_ENABLE
  const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
diff --git a/keyboards/xbows/numpad/numpad.h b/keyboards/xbows/numpad/numpad.h
deleted file mode 100644
index c160bff757..0000000000
--- a/keyboards/xbows/numpad/numpad.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Shulin Huang <mumu@x-bows.com>
- *
- * 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 LAYOUT( \
-	K000, K001, K002, K003,   \
-	K100, K101, K102, K103,   \
-	K200, K201, K202, K203,   \
-	K300, K301, K302, K303,   \
-	K400, K401, K402, K403,   \
-	K500,       K502          \
-) \
-	{ \
-    { K000, K001, K002, K003 }, \
-    { K100, K101, K102, K103 }, \
-    { K200, K201, K202, K203 }, \
-    { K300, K301, K302, K303 }, \
-    { K400, K401, K402, K403 }, \
-    { K500, KC_NO,K502, KC_NO}  \
-}