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

3 files changed, 24 insertions, 66 deletions

diff --git a/keyboards/late9/rev1/info.json b/keyboards/late9/rev1/info.json
index 2558cb9faa..7d3a710bc5 100644
--- a/keyboards/late9/rev1/info.json
+++ b/keyboards/late9/rev1/info.json
@@ -18,12 +18,29 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3},
-                {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4},
-                {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5}
             ]
         }
     }
diff --git a/keyboards/late9/rev1/rev1.c b/keyboards/late9/rev1/rev1.c
index ffba137189..aa45141b06 100644
--- a/keyboards/late9/rev1/rev1.c
+++ b/keyboards/late9/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev1.h"
+#include "quantum.h"
 
 // OLED logo
 #ifdef OLED_ENABLE
diff --git a/keyboards/late9/rev1/rev1.h b/keyboards/late9/rev1/rev1.h
deleted file mode 100644
index 2e5bb5ec52..0000000000
--- a/keyboards/late9/rev1/rev1.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2021 rookiebwoy
- *
- * 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.
- */
-
-/* Matrix layout
- *   ,--------------.
- *   | 00 | 01 | 02 |
- *   |----|----|----|
- *   | 10 | 11 | 12 |
- *   |----|----|----|
- *   | 20 | 21 | 22 |
- *   |----|----|----|
- *   | 30 | 31 | 32 |
- *   |----|----|----|
- *   | 40 | 41 | 42 |
- *   |----|----|----|
- *   | 50 | 51 | 52 |
- *   `--------------'
- */
-#define LAYOUT( \
-	k00, k01, k02,  \
-	k10, k11, k12,  \
-	k20, k21, k22,  \
-	k30, k31, k32,  \
-	k40, k41, k42,  \
-	k50, k51, k52   \
-) \
-{ \
-	{k00, k01, k02}, \
-	{k10, k11, k12}, \
-	{k20, k21, k22}, \
-	{k30, k31, k32}, \
-	{k40, k41, k42}, \
-	{k50, k51, k52}  \
-}