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

2 files changed, 20 insertions, 52 deletions

diff --git a/keyboards/keebzdotnet/wazowski/info.json b/keyboards/keebzdotnet/wazowski/info.json
index f993b81f2f..c993b41ac9 100644
--- a/keyboards/keebzdotnet/wazowski/info.json
+++ b/keyboards/keebzdotnet/wazowski/info.json
@@ -18,20 +18,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":1, "y":0},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":7, "y":2},
-                {"x":0, "y":2},
-                {"x":2, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":1},
-                {"x":1, "y":3},
-                {"x":3, "y":3},
-                {"x":7, "y":0},
-                {"x":8, "y":1}
+                {"matrix": [0, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [0, 2], "x": 4, "y": 1},
+                {"matrix": [0, 3], "x": 5, "y": 1},
+
+                {"matrix": [0, 4], "x": 7, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 4, "y": 2},
+                {"matrix": [1, 3], "x": 5, "y": 2},
+
+                {"matrix": [1, 4], "x": 6, "y": 1},
+
+                {"matrix": [2, 0], "x": 1, "y": 3},
+                {"matrix": [2, 1], "x": 3, "y": 3},
+
+                {"matrix": [2, 3], "x": 7, "y": 0},
+
+                {"matrix": [2, 4], "x": 8, "y": 1}
             ]
         }
     }
diff --git a/keyboards/keebzdotnet/wazowski/wazowski.h b/keyboards/keebzdotnet/wazowski/wazowski.h
deleted file mode 100644
index 98af75a0e8..0000000000
--- a/keyboards/keebzdotnet/wazowski/wazowski.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 keebzdotnet
- *
- * 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 is 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, k03, k04, \
-    k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13 \
-) \
-{ \
-    { k00, k01, k02, k03, k04 }, \
-    { k05, k06, k07, k08, k09 }, \
-    { k10, k11, KC_NO, k12, k13 }  \
-}