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

2 files changed, 17 insertions, 52 deletions

diff --git a/keyboards/craftwalk/craftwalk.h b/keyboards/craftwalk/craftwalk.h
deleted file mode 100644
index 80c32ef05e..0000000000
--- a/keyboards/craftwalk/craftwalk.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 sotoba
- *
- * 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, \
-  k10, k11, k12, k13, \
-  k20, k21, k22, k23, k24, k25, k26 \
-) \
-{ \
-  { KC_NO, k00, k01, k02, KC_NO, KC_NO, KC_NO }, \
-  { k10, k11, k12, k13, KC_NO, KC_NO, KC_NO },  \
-  { k20, k21, k22, k23, k24, k25, k26 } \
-}
diff --git a/keyboards/craftwalk/info.json b/keyboards/craftwalk/info.json
index 67c7fe6525..1f8bd3e0f7 100644
--- a/keyboards/craftwalk/info.json
+++ b/keyboards/craftwalk/info.json
@@ -18,20 +18,23 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"Q", "x":1.25, "y":0.25},
-              {"label":"W", "x":2.25, "y":0},
-              {"label":"E", "x":3.25, "y":0.25},
-              {"label":"Ctrl", "x":0, "y":1},
-              {"label":"A", "x":1.25, "y":1.25},
-              {"label":"S", "x":2.25, "y":1},
-              {"label":"D", "x":3.25, "y":1.25},
-              {"label":"Shift", "x":0, "y":2},
-              {"label":"Adjust", "x":1.25, "y":2.25},
-              {"label":"Mouse", "x":2.25, "y":2},
-              {"label":"Mouse", "x":3.25, "y":2.25},
-              {"label":"F", "x":4.25, "y":2},
-              {"label":"Num", "x":5.25, "y":3, "h":1.5},
-              {"label":"Space", "x":6.25, "y":3, "h":1.5}
+                {"matrix": [0, 1], "x": 1.25, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+
+                {"matrix": [2, 5], "x": 5.25, "y": 3, "h": 1.5},
+                {"matrix": [2, 6], "x": 6.25, "y": 3, "h": 1.5}
             ]
         }
     }