Move single `LAYOUT`s to data driven (#20365)

2 files changed, 43 insertions, 77 deletions

diff --git a/keyboards/eternal_keypad/eternal_keypad.h b/keyboards/eternal_keypad/eternal_keypad.h
deleted file mode 100644
index 45afff5a01..0000000000
--- a/keyboards/eternal_keypad/eternal_keypad.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 duckyb
- *
- * 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( \
-	     k01, k02, k03, k04, k05, k06, k07, \
-	     k11, k12, k13, k14, k15, k16, k17, \
-	k20, k21, k22, k23, k24, k25, k26, k27, \
-	k30, k31, k32, k33, k34, k35, k36, k37, \
-	k40, k41, k42, k43,      k45,      k47  \
-) { \
-	{ KC_NO, k01,   k02,   k03,   k04,   k05,   k06,   k07 }, \
-	{ KC_NO, k11,   k12,   k13,   k14,   k15,   k16,   k17 }, \
-	{ k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27 }, \
-	{ k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37 }, \
-	{ k40,   k41,   k42,   k43,   KC_NO, k45,   KC_NO, k47 }  \
-}
diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json
index 35a5a543a4..f10b4ab8a4 100644
--- a/keyboards/eternal_keypad/info.json
+++ b/keyboards/eternal_keypad/info.json
@@ -24,42 +24,49 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k01", "x": 1.5, "y": 0, "w": 1.25},
-                {"label": "k02", "x": 2.75, "y": 0},
-                {"label": "k03", "x": 3.75, "y": 0},
-                {"label": "k04", "x": 4.75, "y": 0},
-                {"label": "k05", "x": 5.75, "y": 0},
-                {"label": "k06", "x": 6.75, "y": 0},
-                {"label": "k07", "x": 7.75, "y": 0},
-                {"label": "k11", "x": 1.5, "y": 1, "w": 1.25},
-                {"label": "k12", "x": 2.75, "y": 1},
-                {"label": "k13", "x": 3.75, "y": 1},
-                {"label": "k14", "x": 4.75, "y": 1},
-                {"label": "k15", "x": 5.75, "y": 1},
-                {"label": "k16", "x": 6.75, "y": 1},
-                {"label": "k17", "x": 7.75, "y": 1},
-                {"label": "k20", "x": 0, "y": 2},
-                {"label": "k21", "x": 1.5, "y": 2, "w": 1.25},
-                {"label": "k22", "x": 2.75, "y": 2},
-                {"label": "k23", "x": 3.75, "y": 2},
-                {"label": "k24", "x": 4.75, "y": 2},
-                {"label": "k25", "x": 5.75, "y": 2},
-                {"label": "k26", "x": 6.75, "y": 2},
-                {"label": "k27", "x": 7.75, "y": 2},
-                {"label": "k30", "x": 0, "y": 3},
-                {"label": "k31", "x": 1.5, "y": 3, "w": 1.25},
-                {"label": "k32", "x": 2.75, "y": 3},
-                {"label": "k33", "x": 3.75, "y": 3},
-                {"label": "k34", "x": 4.75, "y": 3},
-                {"label": "k35", "x": 5.75, "y": 3},
-                {"label": "k36", "x": 6.75, "y": 3},
-                {"label": "k37", "x": 7.75, "y": 3},
-                {"label": "k40", "x": 0, "y": 4},
-                {"label": "k41", "x": 1.5, "y": 4, "w": 1.25},
-                {"label": "k42", "x": 2.75, "y": 4, "w": 1.25},
-                {"label": "k43", "x": 4, "y": 4},
-                {"label": "k45", "x": 5, "y": 4, "w": 2.75},
-                {"label": "k47", "x": 7.75, "y": 4}
+                {"matrix": [0, 1], "x": 1.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 7.75, "y": 4}
             ]
         }
     }