Move remaining `LAYOUT`s to data driven (#20422)

3 files changed, 141 insertions, 75 deletions

diff --git a/keyboards/handwired/sejin_eat1010r2/info.json b/keyboards/handwired/sejin_eat1010r2/info.json
index e913412a9f..1d39802cf8 100644
--- a/keyboards/handwired/sejin_eat1010r2/info.json
+++ b/keyboards/handwired/sejin_eat1010r2/info.json
@@ -33,7 +33,127 @@
     },
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"\u2190", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Enter", "x":13.5, "y":2.5, "w":1.5, "h":2}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 11], "x": 2, "y": 0},
+                {"matrix": [2, 11], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [1, 7], "x": 5, "y": 0},
+
+                {"matrix": [1, 5], "x": 6.5, "y": 0},
+                {"matrix": [2, 5], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [2, 4], "x": 11, "y": 0},
+                {"matrix": [3, 5], "x": 12, "y": 0},
+                {"matrix": [2, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 12], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [1, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 11], "x": 2, "y": 1.5},
+                {"matrix": [3, 7], "x": 3, "y": 1.5},
+                {"matrix": [2, 1], "x": 4, "y": 1.5},
+                {"matrix": [1, 1], "x": 5, "y": 1.5},
+                {"matrix": [1, 2], "x": 6, "y": 1.5},
+                {"matrix": [2, 2], "x": 7, "y": 1.5},
+                {"matrix": [4, 5], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 3], "x": 10, "y": 1.5},
+                {"matrix": [3, 3], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [0, 6], "x": 13, "y": 1.5},
+                {"matrix": [4, 6], "x": 14, "y": 1.5},
+
+                {"matrix": [3, 6], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 13], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 13], "x": 18.5, "y": 1.5},
+                {"matrix": [3, 14], "x": 19.5, "y": 1.5},
+                {"matrix": [4, 14], "x": 20.5, "y": 1.5},
+                {"matrix": [3, 15], "x": 21.5, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [0, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 11], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [0, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [0, 3], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [0, 7], "x": 13.5, "y": 2.5, "w": 1.5, "h": 2},
+
+                {"matrix": [0, 5], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [0, 12], "x": 17.25, "y": 2.5},
+
+                {"matrix": [0, 13], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 19.5, "y": 2.5},
+                {"matrix": [0, 14], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [0, 11], "x": 2.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 1], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 11.75, "y": 3.5},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [5, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [5, 14], "x": 20.5, "y": 3.5},
+
+                {"matrix": [7, 10], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 11], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 11], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [5, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 13], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 14], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 15], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [7, 9], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 8], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 11], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [6, 8], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 9], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 6], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
+
+                {"matrix": [7, 14], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [7, 15], "x": 20.5, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c b/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
index 67691cd542..6032779422 100644
--- a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
+++ b/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
@@ -15,6 +15,26 @@
  */
 #include QMK_KEYBOARD_H
 
+#define LAYOUT_debug( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \
+    K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \
+    K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \
+    K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \
+    { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \
+}
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_debug(
diff --git a/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h b/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h
deleted file mode 100644
index 9618ed6b64..0000000000
--- a/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2023 DmNosachev
- *
- * 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"
-
-/* readability */
-#define XXX 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( \
-	K10,      K1B, K2B, K27, K17,   K15, K25, K14, K13,    K24, K35, K26, K16,   K1C, K2C, K1D, \
-	K20, K30, K3B, K37, K21, K11, K12, K22, K45, K34, K23, K33, K44, K06, K46,   K36, K3C, K3D,  K2D, K3E, K4E, K3F, \
-	K40,  K00, K4B, K47, K41, K31, K32, K42, K55, K04, K43, K03, K54, K07,       K05, K4C, K0C,  K0D, K4D, K0E, K4F, \
-	K70,   K50, K0B, K67, K51, K01, K02, K52, K65, K64, K53,              K63,                   K5C, K5D, K5E, \
-	K7A,    K6B, K5B, K77, K71, K61, K62, K72, K75, K74, K73,             K6A,        K56,       K6C, K6D, K6E, K5F, \
-	K79,     K78,               K7B,                               K68,   K69,   K66, K76, K7C,  K7E,      K7F \
-) \
-{ \
-/* 0 */  { K00, K01, K02, K03, K04, K05, K06, K07, XXX, XXX, XXX, K0B, K0C, K0D, K0E, XXX }, \
-/* 1 */  { K10, K11, K12, K13, K14, K15, K16, K17, XXX, XXX, XXX, K1B, K1C, K1D, XXX, XXX }, \
-/* 2 */  { K20, K21, K22, K23, K24, K25, K26, K27, XXX, XXX, XXX, K2B, K2C, K2D, XXX, XXX }, \
-/* 3 */  { K30, K31, K32, K33, K34, K35, K36, K37, XXX, XXX, XXX, K3B, K3C, K3D, K3E, K3F }, \
-/* 4 */  { K40, K41, K42, K43, K44, K45, K46, K47, XXX, XXX, XXX, K4B, K4C, K4D, K4E, K4F }, \
-/* 5 */  { K50, K51, K52, K53, K54, K55, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }, \
-/* 6 */  { XXX, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \
-/* 7 */  { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, XXX, K7E, K7F }  \
-}
-/*          0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F     */
-
-#define LAYOUT_debug( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
-	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \
-	K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \
-	K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \
-	K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F  \
-) \
-{ \
-/* 0 */  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-/* 1 */  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-/* 2 */  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-/* 3 */  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
-/* 4 */  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-/* 5 */  { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
-/* 6 */  { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \
-/* 7 */  { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F }  \
-}
-/*          0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F     */
-