Move Alice and Ergodox layouts to data driven (#20340)

2 files changed, 183 insertions, 113 deletions

diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.h b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
index b9636b69be..99826529ed 100644
--- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
+++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
@@ -80,74 +80,3 @@ inline void ergodox_led_all_set(uint8_t n) {
 }
 
 void ergodox_infinity_lcd_color(uint16_t r, uint16_t g, uint16_t b);
-
-#define XXX KC_NO
-
-#define LAYOUT_ergodox( \
-    A80, A70, A60, A50, A40, A30, A20, \
-    A81, A71, A61, A51, A41, A31, A21, \
-    A82, A72, A62, A52, A42, A32, \
-    A83, A73, A63, A53, A43, A33, A23, \
-    A84, A74, A64, A54, A44, \
-                                  A13, A03, \
-                                       A04, \
-                             A34, A24, A14, \
-\
-         B20, B30, B40, B50, B60, B70, B80, \
-         B21, B31, B41, B51, B61, B71, B81, \
-              B32, B42, B52, B62, B72, B82, \
-         B23, B33, B43, B53, B63, B73, B83, \
-                   B44, B54, B64, B74, B84, \
-    B03, B13, \
-    B04, \
-    B14, B24, B34 \
-) { \
-    { XXX, XXX, XXX, A03, A04 }, \
-    { XXX, XXX, XXX, A13, A14 }, \
-    { A20, A21, XXX, A23, A24 }, \
-    { A30, A31, A32, A33, A34 }, \
-    { A40, A41, A42, A43, A44 }, \
-    { A50, A51, A52, A53, A54 }, \
-    { A60, A61, A62, A63, A64 }, \
-    { A70, A71, A72, A73, A74 }, \
-    { A80, A81, A82, A83, A84 }, \
-    { XXX, XXX, XXX, B03, B04 }, \
-    { XXX, XXX, XXX, B13, B14 }, \
-    { B20, B21, XXX, B23, B24 }, \
-    { B30, B31, B32, B33, B34 }, \
-    { B40, B41, B42, B43, B44 }, \
-    { B50, B51, B52, B53, B54 }, \
-    { B60, B61, B62, B63, B64 }, \
-    { B70, B71, B72, B73, B74 }, \
-    { B80, B81, B82, B83, B84 } \
-}
-
-#define LAYOUT_ergodox_pretty( \
-    A80, A70, A60, A50, A40, A30, A20,               B20, B30, B40, B50, B60, B70, B80, \
-    A81, A71, A61, A51, A41, A31, A21,               B21, B31, B41, B51, B61, B71, B81, \
-    A82, A72, A62, A52, A42, A32,                         B32, B42, B52, B62, B72, B82, \
-    A83, A73, A63, A53, A43, A33, A23,               B23, B33, B43, B53, B63, B73, B83, \
-    A84, A74, A64, A54, A44,                                   B44, B54, B64, B74, B84, \
-                                  A13, A03,     B03, B13, \
-                                       A04,     B04, \
-                             A34, A24, A14,     B14, B24, B34 \
-) { \
-    { XXX, XXX, XXX, A03, A04 }, \
-    { XXX, XXX, XXX, A13, A14 }, \
-    { A20, A21, XXX, A23, A24 }, \
-    { A30, A31, A32, A33, A34 }, \
-    { A40, A41, A42, A43, A44 }, \
-    { A50, A51, A52, A53, A54 }, \
-    { A60, A61, A62, A63, A64 }, \
-    { A70, A71, A72, A73, A74 }, \
-    { A80, A81, A82, A83, A84 }, \
-    { XXX, XXX, XXX, B03, B04 }, \
-    { XXX, XXX, XXX, B13, B14 }, \
-    { B20, B21, XXX, B23, B24 }, \
-    { B30, B31, B32, B33, B34 }, \
-    { B40, B41, B42, B43, B44 }, \
-    { B50, B51, B52, B53, B54 }, \
-    { B60, B61, B62, B63, B64 }, \
-    { B70, B71, B72, B73, B74 }, \
-    { B80, B81, B82, B83, B84 } \
-}
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index c751cfe3f2..c03c38ed0d 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -16,52 +16,193 @@
     "board": "IC_TEENSY_3_1",
     "community_layouts": ["ergodox"],
     "layouts": {
-      "LAYOUT_ergodox": {
-        "layout": [
-          {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-          {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-          {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-          {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                 {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-
-                                        {"x":6, "y":5}, {"x":7, "y":5},
-                                                        {"x":7, "y":6},
-          {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
-
-
-                     {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-            {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                          {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-            {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
-
-
-          {"x":9, "y":5}, {"x":10, "y":5},
-          {"x":9, "y":6},
-          {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
-        ]
-    },
-    "LAYOUT_ergodox_pretty": {
-        "layout": [
-          {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-          {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+        "LAYOUT_ergodox": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [5, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [1, 3], "x": 6, "y": 5},
+                {"matrix": [0, 3], "x": 7, "y": 5},
+
+                {"matrix": [0, 4], "x": 7, "y": 6},
+                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [1, 4], "x": 7, "y": 7},
+
+                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [14, 0], "x": 12.5, "y": 0},
+                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [14, 1], "x": 12.5, "y": 1},
+                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [14, 2], "x": 12.5, "y": 2},
+                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [14, 3], "x": 12.5, "y": 3},
+                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [14, 4], "x": 12.5, "y": 4},
+                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [9, 3], "x": 9, "y": 5},
+                {"matrix": [10, 3], "x": 10, "y": 5},
+
+                {"matrix": [9, 4], "x": 9, "y": 6},
+
+                {"matrix": [10, 4], "x": 9, "y": 7},
+
+                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
+                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
+            ]
+        },
+        "LAYOUT_ergodox_pretty": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [14, 0], "x": 12.5, "y": 0},
+                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [14, 1], "x": 12.5, "y": 1},
+                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [14, 2], "x": 12.5, "y": 2},
+                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [14, 3], "x": 12.5, "y": 3},
+                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
 
-          {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-          {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [5, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [14, 4], "x": 12.5, "y": 4},
+                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
 
-          {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-          {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+                {"matrix": [1, 3], "x": 6, "y": 5},
+                {"matrix": [0, 3], "x": 7, "y": 5},
+                {"matrix": [9, 3], "x": 9, "y": 5},
+                {"matrix": [10, 3], "x": 10, "y": 5},
 
-          {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-          {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+                {"matrix": [0, 4], "x": 7, "y": 6},
+                {"matrix": [9, 4], "x": 9, "y": 6},
+                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
 
-                 {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [1, 4], "x": 7, "y": 7},
+                {"matrix": [10, 4], "x": 9, "y": 7},
 
-                                        {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                                                        {"x":7, "y":6},      {"x":9, "y":6},
-          {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
-        ]
+                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
+                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
+            ]
+        }
     }
-  }
 }