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

4 files changed, 19 insertions, 58 deletions

diff --git a/keyboards/sck/gtm/gtm.h b/keyboards/sck/gtm/gtm.h
deleted file mode 100644
index 47625f417f..0000000000
--- a/keyboards/sck/gtm/gtm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K04, \
-	K10, K11, K12, K13, K14, K25 \
-) { \
-	{ K00,    K01,    K02,    K03,    K04,    KC_NO }, \
-	{ K10,    K11,    K12,    K13,    K14,    KC_NO }, \
-    { KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K25 }, \
-}
diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json
index c3cc44cd64..c756b02c87 100644
--- a/keyboards/sck/gtm/info.json
+++ b/keyboards/sck/gtm/info.json
@@ -23,18 +23,19 @@
     "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},
-                {"label":"K15", "x":4, "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},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-                {"label":"K10", "x":0, "y":1},
-                {"label":"K11", "x":1, "y":1},
-                {"label":"K12", "x":2, "y":1},
-                {"label":"K13", "x":3, "y":1},
-                {"label":"K14", "x":4, "y":1},
-                {"label":"K16", "x":5.5, "y":0.5}
+                {"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},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 5], "x": 5.5, "y": 0.5}
             ]
         }
     }
diff --git a/keyboards/sck/neiso/info.json b/keyboards/sck/neiso/info.json
index 2f233b4066..c7b75dbbc3 100644
--- a/keyboards/sck/neiso/info.json
+++ b/keyboards/sck/neiso/info.json
@@ -17,7 +17,13 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0.25, "y":0, "w":2, "h":1.25}, {"x":2.75, "y":0.25, "w":1.25, "h":2}, {"x":1.5, "y":1.5}, {"x":0, "y":1.75, "w":1.25, "h":2}, {"x":1.75, "y":2.75, "w":2, "h":1.25}]
+            "layout": [
+                {"matrix": [0, 1], "x": 0.25, "y": 0, "w": 2, "h": 1.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25, "w": 1.25, "h": 2},
+                {"matrix": [0, 0], "x": 1.5, "y": 1.5},
+                {"matrix": [0, 3], "x": 0, "y": 1.75, "w": 1.25, "h": 2},
+                {"matrix": [0, 4], "x": 1.75, "y": 2.75, "w": 2, "h": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/sck/neiso/neiso.h b/keyboards/sck/neiso/neiso.h
deleted file mode 100644
index 7058fab5bf..0000000000
--- a/keyboards/sck/neiso/neiso.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * 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( \
-              k01,      k02, \
-                   k00,      \
-              k03,      k04  \
-) \
-    { {k00, k01, k02, k03, k04} }