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

2 files changed, 85 insertions, 98 deletions

diff --git a/keyboards/handwired/eagleii/eagleii.h b/keyboards/handwired/eagleii/eagleii.h
deleted file mode 100644
index 5f3acac798..0000000000
--- a/keyboards/handwired/eagleii/eagleii.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K47,   K27, K37, K38, K28, K39, K29, K34, K24, K31, K21, K32, K22, K33, K23,      K0A, K0B, K46,      K44, \
-    K17,      K97, K18, K98, K19, K99, K14, K94, K11, K91, K12, K92, K13, K83,        K8A, K8B, K43,      K4A, \
-     KA0,      K77, K88, K78, K89, K79, K84, K74, K81, K71, K82, K72, K93,            K1A, K1B, K42,      K6B, \
-       K50,      K87, K08, K68, K09, K69, K04, K61, K01, K62, K02, K70,               K6A,      K41,           \
-       KB5, K66, K07,                 K64,                    K76, K03                                         \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04,   KC_NO, KC_NO, K07,   K08,   K09,   K0A,   K0B   }, \
-    { KC_NO, K11,   K12,   K13,   K14,   KC_NO, KC_NO, K17,   K18,   K19,   K1A,   K1B   }, \
-    { KC_NO, K21,   K22,   K23,   K24,   KC_NO, KC_NO, K27,   K28,   K29,   KC_NO, KC_NO }, \
-    { KC_NO, K31,   K32,   K33,   K34,   KC_NO, KC_NO, K37,   K38,   K39,   KC_NO, KC_NO }, \
-    { KC_NO, K41,   K42,   K43,   K44,   KC_NO, K46,   K47,   KC_NO, KC_NO, K4A,   KC_NO }, \
-    { K50,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, K61,   K62,   KC_NO, K64,   KC_NO, K66,   KC_NO, K68,   K69,   K6A,   K6B   }, \
-    { K70,   K71,   K72,   KC_NO, K74,   KC_NO, K76,   K77,   K78,   K79,   KC_NO, KC_NO }, \
-    { KC_NO, K81,   K82,   K83,   K84,   KC_NO, KC_NO, K87,   K88,   K89,   K8A,   K8B   }, \
-    { KC_NO, K91,   K92,   K93,   K94,   KC_NO, KC_NO, K97,   K98,   K99,   KC_NO, KC_NO }, \
-    { KA0,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-}
diff --git a/keyboards/handwired/eagleii/info.json b/keyboards/handwired/eagleii/info.json
index e84808c71d..a321bf8ed1 100644
--- a/keyboards/handwired/eagleii/info.json
+++ b/keyboards/handwired/eagleii/info.json
@@ -18,80 +18,91 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K47 (F7,C7)", "x":0, "y":0, "w":1.5},
-                {"label":"K27 (F1,C7)", "x":1.5, "y":0},
-                {"label":"K37 (B2,C7)", "x":2.5, "y":0},
-                {"label":"K38 (B2,F0)", "x":3.5, "y":0},
-                {"label":"K28 (F1,F0)", "x":4.5, "y":0},
-                {"label":"K39 (B2,B6)", "x":5.5, "y":0},
-                {"label":"K29 (F1,B6)", "x":6.5, "y":0},
-                {"label":"K34 (B2,B3)", "x":7.5, "y":0},
-                {"label":"K24 (F1,B3)", "x":8.5, "y":0},
-                {"label":"K31 (B2,C6)", "x":9.5, "y":0},
-                {"label":"K21 (F1,C6)", "x":10.5, "y":0},
-                {"label":"K32 (B2,E6)", "x":11.5, "y":0},
-                {"label":"K22 (F1,E6)", "x":12.5, "y":0},
-                {"label":"K33 (B2,D5)", "x":13.5, "y":0},
-                {"label":"K23 (F1,D5)", "x":14.5, "y":0},
-                {"label":"K0A (D0,B1)", "x":16.5, "y":0},
-                {"label":"K0B (D0,F4)", "x":17.5, "y":0},
-                {"label":"K46 (F7,D1)", "x":18.5, "y":0},
-                {"label":"K44 (F7,B3)", "x":20.5, "y":0},
-                {"label":"K17 (B5,C7)", "x":0, "y":1, "w":2},
-                {"label":"K97 (B7,C7)", "x":2, "y":1},
-                {"label":"K18 (B5,F0)", "x":3, "y":1},
-                {"label":"K98 (B7,F0)", "x":4, "y":1},
-                {"label":"K19 (B5,B6)", "x":5, "y":1},
-                {"label":"K99 (B7,B6)", "x":6, "y":1},
-                {"label":"K14 (B5,B3)", "x":7, "y":1},
-                {"label":"K94 (B7,B3)", "x":8, "y":1},
-                {"label":"K11 (B5,C6)", "x":9, "y":1},
-                {"label":"K91 (B7,C6)", "x":10, "y":1},
-                {"label":"K12 (B5,E6)", "x":11, "y":1},
-                {"label":"K92 (B7,E6)", "x":12, "y":1},
-                {"label":"K13 (B5,D5)", "x":13, "y":1},
-                {"label":"K83 (B4,D5)", "x":14, "y":1, "w":1.5},
-                {"label":"K8A (B4,B1)", "x":16.5, "y":1},
-                {"label":"K8B (B4,F4)", "x":17.5, "y":1},
-                {"label":"K43 (F7,D5)", "x":18.5, "y":1},
-                {"label":"K4A (F7,B1)", "x":20.5, "y":1},
-                {"label":"KA0 (F5,D2)", "x":0.25, "y":2, "w":2},
-                {"label":"K77 (D7,C7)", "x":2.25, "y":2},
-                {"label":"K88 (B4,F0)", "x":3.25, "y":2},
-                {"label":"K78 (D7,F0)", "x":4.25, "y":2},
-                {"label":"K89 (B4,B6)", "x":5.25, "y":2},
-                {"label":"K79 (D7,B6)", "x":6.25, "y":2},
-                {"label":"K84 (B4,B3)", "x":7.25, "y":2},
-                {"label":"K74 (D7,B3)", "x":8.25, "y":2},
-                {"label":"K81 (B4,C6)", "x":9.25, "y":2},
-                {"label":"K71 (D7,C6)", "x":10.25, "y":2},
-                {"label":"K82 (B4,E6)", "x":11.25, "y":2},
-                {"label":"K72 (D7,E6)", "x":12.25, "y":2},
-                {"label":"K93 (B7,D5)", "x":13.25, "y":2, "w":2},
-                {"label":"K1A (B5,B1)", "x":16.5, "y":2},
-                {"label":"K1B (B5,F4)", "x":17.5, "y":2},
-                {"label":"K42 (F7,E6)", "x":18.5, "y":2},
-                {"label":"K6B (D4,F4)", "x":20.5, "y":2, "h":2},
-                {"label":"K50 (F6,D2)", "x":0.75, "y":3, "w":2},
-                {"label":"K87 (B4,C7)", "x":2.75, "y":3},
-                {"label":"K08 (D0,F0)", "x":3.75, "y":3},
-                {"label":"K68 (D4,F0)", "x":4.75, "y":3},
-                {"label":"K09 (D0,B6)", "x":5.75, "y":3},
-                {"label":"K69 (D4,B6)", "x":6.75, "y":3},
-                {"label":"K04 (D0,B3)", "x":7.75, "y":3},
-                {"label":"K61 (D4,C6)", "x":8.75, "y":3},
-                {"label":"K01 (D0,C6)", "x":9.75, "y":3},
-                {"label":"K62 (D4,E6)", "x":10.75, "y":3},
-                {"label":"K02 (D0,E6)", "x":11.75, "y":3},
-                {"label":"K70 (D7,D2)", "x":12.75, "y":3, "w":2},
-                {"label":"K6A (D4,B1)", "x":16.5, "y":3, "w":2},
-                {"label":"K41 (F7,C6)", "x":18.5, "y":3},
-                {"label":"KB5 (B0,D3)", "x":0.75, "y":4},
-                {"label":"K66 (D4,D1)", "x":1.75, "y":4},
-                {"label":"K07 (D0,C7)", "x":2.75, "y":4},
-                {"label":"K64 (D4,B3)", "x":3.75, "y":4, "w":8},
-                {"label":"K76 (D7,D1)", "x":11.75, "y":4},
-                {"label":"K03 (D0,D5)", "x":12.75, "y":4, "w":2}
+                {"matrix": [4, 7], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 0},
+                {"matrix": [3, 7], "x": 2.5, "y": 0},
+                {"matrix": [3, 8], "x": 3.5, "y": 0},
+                {"matrix": [2, 8], "x": 4.5, "y": 0},
+                {"matrix": [3, 9], "x": 5.5, "y": 0},
+                {"matrix": [2, 9], "x": 6.5, "y": 0},
+                {"matrix": [3, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 4], "x": 8.5, "y": 0},
+                {"matrix": [3, 1], "x": 9.5, "y": 0},
+                {"matrix": [2, 1], "x": 10.5, "y": 0},
+                {"matrix": [3, 2], "x": 11.5, "y": 0},
+                {"matrix": [2, 2], "x": 12.5, "y": 0},
+                {"matrix": [3, 3], "x": 13.5, "y": 0},
+                {"matrix": [2, 3], "x": 14.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [4, 6], "x": 18.5, "y": 0},
+
+                {"matrix": [4, 4], "x": 20.5, "y": 0},
+
+                {"matrix": [1, 7], "x": 0, "y": 1, "w": 2},
+                {"matrix": [9, 7], "x": 2, "y": 1},
+                {"matrix": [1, 8], "x": 3, "y": 1},
+                {"matrix": [9, 8], "x": 4, "y": 1},
+                {"matrix": [1, 9], "x": 5, "y": 1},
+                {"matrix": [9, 9], "x": 6, "y": 1},
+                {"matrix": [1, 4], "x": 7, "y": 1},
+                {"matrix": [9, 4], "x": 8, "y": 1},
+                {"matrix": [1, 1], "x": 9, "y": 1},
+                {"matrix": [9, 1], "x": 10, "y": 1},
+                {"matrix": [1, 2], "x": 11, "y": 1},
+                {"matrix": [9, 2], "x": 12, "y": 1},
+                {"matrix": [1, 3], "x": 13, "y": 1},
+                {"matrix": [8, 3], "x": 14, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 10], "x": 16.5, "y": 1},
+                {"matrix": [8, 11], "x": 17.5, "y": 1},
+                {"matrix": [4, 3], "x": 18.5, "y": 1},
+
+                {"matrix": [4, 10], "x": 20.5, "y": 1},
+
+                {"matrix": [10, 0], "x": 0.25, "y": 2, "w": 2},
+                {"matrix": [7, 7], "x": 2.25, "y": 2},
+                {"matrix": [8, 8], "x": 3.25, "y": 2},
+                {"matrix": [7, 8], "x": 4.25, "y": 2},
+                {"matrix": [8, 9], "x": 5.25, "y": 2},
+                {"matrix": [7, 9], "x": 6.25, "y": 2},
+                {"matrix": [8, 4], "x": 7.25, "y": 2},
+                {"matrix": [7, 4], "x": 8.25, "y": 2},
+                {"matrix": [8, 1], "x": 9.25, "y": 2},
+                {"matrix": [7, 1], "x": 10.25, "y": 2},
+                {"matrix": [8, 2], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [9, 3], "x": 13.25, "y": 2, "w": 2},
+
+                {"matrix": [1, 10], "x": 16.5, "y": 2},
+                {"matrix": [1, 11], "x": 17.5, "y": 2},
+                {"matrix": [4, 2], "x": 18.5, "y": 2},
+
+                {"matrix": [6, 11], "x": 20.5, "y": 2, "h": 2},
+
+                {"matrix": [5, 0], "x": 0.75, "y": 3, "w": 2},
+                {"matrix": [8, 7], "x": 2.75, "y": 3},
+                {"matrix": [0, 8], "x": 3.75, "y": 3},
+                {"matrix": [6, 8], "x": 4.75, "y": 3},
+                {"matrix": [0, 9], "x": 5.75, "y": 3},
+                {"matrix": [6, 9], "x": 6.75, "y": 3},
+                {"matrix": [0, 4], "x": 7.75, "y": 3},
+                {"matrix": [6, 1], "x": 8.75, "y": 3},
+                {"matrix": [0, 1], "x": 9.75, "y": 3},
+                {"matrix": [6, 2], "x": 10.75, "y": 3},
+                {"matrix": [0, 2], "x": 11.75, "y": 3},
+                {"matrix": [7, 0], "x": 12.75, "y": 3, "w": 2},
+
+                {"matrix": [6, 10], "x": 16.5, "y": 3, "w": 2},
+                {"matrix": [4, 1], "x": 18.5, "y": 3},
+
+                {"matrix": [11, 5], "x": 0.75, "y": 4},
+                {"matrix": [6, 6], "x": 1.75, "y": 4},
+                {"matrix": [0, 7], "x": 2.75, "y": 4},
+                {"matrix": [6, 4], "x": 3.75, "y": 4, "w": 8},
+                {"matrix": [7, 6], "x": 11.75, "y": 4},
+                {"matrix": [0, 3], "x": 12.75, "y": 4, "w": 2}
             ]
         }
     }