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

2 files changed, 11 insertions, 48 deletions

diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json
index ef1402a41e..0da556eb1f 100644
--- a/keyboards/yoichiro/lunakey_macro/info.json
+++ b/keyboards/yoichiro/lunakey_macro/info.json
@@ -18,19 +18,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"0,0", "x":0.5, "y":0.5},
-                {"label":"0,1", "x":1.5, "y":0.175},
-                {"label":"0,2", "x":2.5, "y":0},
-                {"label":"0,3", "x":3.5, "y":0.5},
+                {"matrix": [0, 0], "x": 0.5, "y": 0.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.175},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.5},
 
-                {"label":"1,0", "x":0.5, "y":1.5},
-                {"label":"1,1", "x":1.5, "y":1.175},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.175},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.5},
 
-                {"label":"2,0", "x":0, "y":3},
-                {"label":"2,1", "x":1, "y":2.75},
-                {"label":"2,2", "x":2, "y":3}
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/yoichiro/lunakey_macro/lunakey_macro.h b/keyboards/yoichiro/lunakey_macro/lunakey_macro.h
deleted file mode 100644
index 487b7fe208..0000000000
--- a/keyboards/yoichiro/lunakey_macro/lunakey_macro.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 Yoichiro Tanaka
- *
- * 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, \
-    k10, k11, k12, k13, \
-    k20, k21, k22 \
-) { \
-    { k00, k01, k02, k03   }, \
-    { k10, k11, k12, k13   }, \
-    { k20, k21, k22, KC_NO }  \
-}