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

3 files changed, 19 insertions, 56 deletions

diff --git a/keyboards/kmac_pad/info.json b/keyboards/kmac_pad/info.json
index 9d07f3d45a..f41da8a452 100644
--- a/keyboards/kmac_pad/info.json
+++ b/keyboards/kmac_pad/info.json
@@ -12,29 +12,29 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"K00", "x":3, "y":0},
+        {"matrix": [0, 0], "x": 3, "y": 0},
 
-        {"label":"K10", "x":0, "y":1.25},
-        {"label":"K11", "x":1, "y":1.25},
-        {"label":"K12", "x":2, "y":1.25},
-        {"label":"K13", "x":3, "y":1.25},
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
 
-        {"label":"K20", "x":0, "y":2.25},
-        {"label":"K21", "x":1, "y":2.25},
-        {"label":"K22", "x":2, "y":2.25},
-        {"label":"K23", "x":3, "y":2.25, "h":2},
+        {"matrix": [2, 0], "x": 0, "y": 2.25},
+        {"matrix": [2, 1], "x": 1, "y": 2.25},
+        {"matrix": [2, 2], "x": 2, "y": 2.25},
+        {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
 
-        {"label":"K30", "x":0, "y":3.25},
-        {"label":"K31", "x":1, "y":3.25},
-        {"label":"K32", "x":2, "y":3.25},
+        {"matrix": [3, 0], "x": 0, "y": 3.25},
+        {"matrix": [3, 1], "x": 1, "y": 3.25},
+        {"matrix": [3, 2], "x": 2, "y": 3.25},
 
-        {"label":"K40", "x":0, "y":4.25},
-        {"label":"K41", "x":1, "y":4.25},
-        {"label":"K42", "x":2, "y":4.25},
-        {"label":"K43", "x":3, "y":4.25, "h":2},
+        {"matrix": [4, 0], "x": 0, "y": 4.25},
+        {"matrix": [4, 1], "x": 1, "y": 4.25},
+        {"matrix": [4, 2], "x": 2, "y": 4.25},
+        {"matrix": [4, 3], "x": 3, "y": 4.25, "h": 2},
 
-        {"label":"K50", "x":0, "y":5.25, "w":2},
-        {"label":"K52", "x":2, "y":5.25}
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+        {"matrix": [5, 2], "x": 2, "y": 5.25}
       ]
     }
   }
diff --git a/keyboards/kmac_pad/kmac_pad.c b/keyboards/kmac_pad/kmac_pad.c
index 87083668cc..3de2cb711e 100644
--- a/keyboards/kmac_pad/kmac_pad.c
+++ b/keyboards/kmac_pad/kmac_pad.c
@@ -15,7 +15,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 "kmac_pad.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
 
diff --git a/keyboards/kmac_pad/kmac_pad.h b/keyboards/kmac_pad/kmac_pad.h
deleted file mode 100644
index 9979608339..0000000000
--- a/keyboards/kmac_pad/kmac_pad.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 talsu <talsu84@gmail.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( \
-                   K00, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32,      \
-    K40, K41, K42, K43, \
-    K50,      K52       \
-) \
-{ \
-    { K00, KC_NO, KC_NO, KC_NO }, \
-    { K10, K11,   K12,   K13   }, \
-    { K20, K21,   K22,   K23   }, \
-    { K30, K31,   K32,   KC_NO }, \
-    { K40, K41,   K42,   K43   }, \
-    { K50, KC_NO, K52,   KC_NO }  \
-}