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

keyboards/handwired/frankie_macropad/frankie_macropad.h

@@ -1,39 +0,0 @@
-/* Copyright 2021 Eric Wood
- *
- * 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"
-
-#define ___ KC_NO
-
-/* 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( \
-              k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23  \
-) { \
-    { ___, ___, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }  \
-}

keyboards/handwired/frankie_macropad/info.json

@@ -27,18 +27,18 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k02", "x": 2, "y": 0},
-                {"label": "k03", "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "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},
+                {"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},
 
-                {"label": "k20", "x": 0, "y": 2},
-                {"label": "k21", "x": 1, "y": 2},
-                {"label": "k22", "x": 2, "y": 2},
-                {"label": "k23", "x": 3, "y": 2}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
             ]
         }
     }