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

2 files changed, 63 insertions, 22 deletions

diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json
index 7c6ed69ce3..01fd3265e9 100644
--- a/keyboards/ergotravel/rev1/info.json
+++ b/keyboards/ergotravel/rev1/info.json
@@ -23,7 +23,69 @@
   "processor": "atmega32u4",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"L00", "x":0, "y":0.375}, {"label":"L01", "x":1, "y":0.25}, {"label":"L02", "x":2, "y":0.125}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0.125}, {"label":"L05", "x":5, "y":0.25}, {"label":"L06", "x":6, "y":0.5}, {"label":"R00", "x":9, "y":0.5}, {"label":"R01", "x":10, "y":0.25}, {"label":"R02", "x":11, "y":0.125}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0.125}, {"label":"R05", "x":14, "y":0.25}, {"label":"R06", "x":15, "y":0.375}, {"label":"L10", "x":0, "y":1.375}, {"label":"L11", "x":1, "y":1.25}, {"label":"L12", "x":2, "y":1.125}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1.125}, {"label":"L15", "x":5, "y":1.25}, {"label":"L16", "x":6, "y":1.5}, {"label":"R10", "x":9, "y":1.5}, {"label":"R11", "x":10, "y":1.25}, {"label":"R12", "x":11, "y":1.125}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1.125}, {"label":"R15", "x":14, "y":1.25}, {"label":"R16", "x":15, "y":1.375}, {"label":"L20", "x":0, "y":2.375}, {"label":"L21", "x":1, "y":2.25}, {"label":"L22", "x":2, "y":2.125}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2.125}, {"label":"L25", "x":5, "y":2.25}, {"label":"L26", "x":6.5, "y":3}, {"label":"R20", "x":8.5, "y":3}, {"label":"R21", "x":10, "y":2.25}, {"label":"R22", "x":11, "y":2.125}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2.125}, {"label":"R25", "x":14, "y":2.25}, {"label":"R26", "x":15, "y":2.375}, {"label":"L30", "x":0, "y":3.375}, {"label":"L31", "x":1, "y":3.25}, {"label":"L32", "x":2, "y":3.125}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":5.5, "y":4}, {"label":"L35", "x":6.5, "y":4}, {"label":"R30", "x":8.5, "y":4}, {"label":"R31", "x":9.5, "y":4}, {"label":"R32", "x":12, "y":3}, {"label":"R33", "x":13, "y":3.125}, {"label":"R34", "x":14, "y":3.25}, {"label":"R35", "x":15, "y":3.375}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.25},
+        {"matrix": [0, 2], "x": 2, "y": 0.125},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.125},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+        {"matrix": [4, 6], "x": 9, "y": 0.5},
+        {"matrix": [4, 5], "x": 10, "y": 0.25},
+        {"matrix": [4, 4], "x": 11, "y": 0.125},
+        {"matrix": [4, 3], "x": 12, "y": 0},
+        {"matrix": [4, 2], "x": 13, "y": 0.125},
+        {"matrix": [4, 1], "x": 14, "y": 0.25},
+        {"matrix": [4, 0], "x": 15, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.125},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.125},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+        {"matrix": [5, 6], "x": 9, "y": 1.5},
+        {"matrix": [5, 5], "x": 10, "y": 1.25},
+        {"matrix": [5, 4], "x": 11, "y": 1.125},
+        {"matrix": [5, 3], "x": 12, "y": 1},
+        {"matrix": [5, 2], "x": 13, "y": 1.125},
+        {"matrix": [5, 1], "x": 14, "y": 1.25},
+        {"matrix": [5, 0], "x": 15, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.25},
+        {"matrix": [2, 2], "x": 2, "y": 2.125},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.125},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 3},
+
+        {"matrix": [6, 6], "x": 8.5, "y": 3},
+        {"matrix": [6, 5], "x": 10, "y": 2.25},
+        {"matrix": [6, 4], "x": 11, "y": 2.125},
+        {"matrix": [6, 3], "x": 12, "y": 2},
+        {"matrix": [6, 2], "x": 13, "y": 2.125},
+        {"matrix": [6, 1], "x": 14, "y": 2.25},
+        {"matrix": [6, 0], "x": 15, "y": 2.375},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375},
+        {"matrix": [3, 1], "x": 1, "y": 3.25},
+        {"matrix": [3, 2], "x": 2, "y": 3.125},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 4},
+        {"matrix": [3, 5], "x": 6.5, "y": 4},
+
+        {"matrix": [7, 5], "x": 8.5, "y": 4},
+        {"matrix": [7, 4], "x": 9.5, "y": 4},
+        {"matrix": [7, 3], "x": 12, "y": 3},
+        {"matrix": [7, 2], "x": 13, "y": 3.125},
+        {"matrix": [7, 1], "x": 14, "y": 3.25},
+        {"matrix": [7, 0], "x": 15, "y": 3.375}
+      ]
     }
   }
 }
diff --git a/keyboards/ergotravel/rev1/rev1.h b/keyboards/ergotravel/rev1/rev1.h
deleted file mode 100644
index c241c2d599..0000000000
--- a/keyboards/ergotravel/rev1/rev1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06,       R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16,       R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, L26,       R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33,      L34, L35,       R30, R31,      R32, R33, R34, R35 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25, L26 }, \
-    { L30, L31, L32, L33, L34, L35, XXX }, \
-    { R06, R05, R04, R03, R02, R01, R00 }, \
-    { R16, R15, R14, R13, R12, R11, R10 }, \
-    { R26, R25, R24, R23, R22, R21, R20 }, \
-    { R35, R34, R33, R32, R31, R30, XXX } \
-}