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

2 files changed, 9 insertions, 36 deletions

diff --git a/keyboards/handwired/6macro/6macro.h b/keyboards/handwired/6macro/6macro.h
deleted file mode 100644
index c1d5005128..0000000000
--- a/keyboards/handwired/6macro/6macro.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2019 joaofbmaia
- *
- * 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  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-}
diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json
index d081a75d3e..02111f4746 100644
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/info.json
@@ -17,7 +17,15 @@
     "bootloader": "atmel-dfu",
     "layouts": {
       "LAYOUT": {
-        "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}]
+        "layout": [
+          {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+          {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+          {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+
+          {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1},
+          {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1},
+          {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1}
+        ]
       }
     }
   }