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

2 files changed, 11 insertions, 46 deletions

diff --git a/keyboards/bthlabs/geekpad/geekpad.h b/keyboards/bthlabs/geekpad/geekpad.h
deleted file mode 100644
index 4dc6800fe5..0000000000
--- a/keyboards/bthlabs/geekpad/geekpad.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019-present Tomek Wójcik <contact@bthlabs.pl>
- *
- * 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( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22  \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-}
diff --git a/keyboards/bthlabs/geekpad/info.json b/keyboards/bthlabs/geekpad/info.json
index 8200e7d036..c1b0ef54c0 100644
--- a/keyboards/bthlabs/geekpad/info.json
+++ b/keyboards/bthlabs/geekpad/info.json
@@ -18,15 +18,17 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x": 0, "y": 0},
-        {"x": 1, "y": 0},
-        {"x": 2,"y": 0},
-        {"x": 0, "y": 1},
-        {"x": 1, "y": 1},
-        {"x": 2,"y": 1},
-        {"x": 0, "y": 2},
-        {"x": 1, "y": 2},
-        {"x": 2,"y": 2}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2}
       ]
     }
   }