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

2 files changed, 71 insertions, 26 deletions

diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/info.json
index 21774d1e82..175e621e23 100644
--- a/keyboards/fortitude60/rev1/info.json
+++ b/keyboards/fortitude60/rev1/info.json
@@ -27,7 +27,77 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, {"label":"L02", "x":2, "y":0}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0}, {"label":"L05", "x":5, "y":0}, {"label":"R00", "x":9, "y":0}, {"label":"R01", "x":10, "y":0}, {"label":"R02", "x":11, "y":0}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0}, {"label":"R05", "x":14, "y":0}, {"label":"L10", "x":0, "y":1}, {"label":"L11", "x":1, "y":1}, {"label":"L12", "x":2, "y":1}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1}, {"label":"L15", "x":5, "y":1}, {"label":"R10", "x":9, "y":1}, {"label":"R11", "x":10, "y":1}, {"label":"R12", "x":11, "y":1}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1}, {"label":"R15", "x":14, "y":1}, {"label":"L20", "x":0, "y":2}, {"label":"L21", "x":1, "y":2}, {"label":"L22", "x":2, "y":2}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2}, {"label":"L25", "x":5, "y":2}, {"label":"R20", "x":9, "y":2}, {"label":"R21", "x":10, "y":2}, {"label":"R22", "x":11, "y":2}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2}, {"label":"R25", "x":14, "y":2}, {"label":"L30", "x":0, "y":3}, {"label":"L31", "x":1, "y":3}, {"label":"L32", "x":2, "y":3}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3}, {"label":"LT5", "x":6, "y":3}, {"label":"RT5", "x":8, "y":3}, {"label":"R30", "x":9, "y":3}, {"label":"R31", "x":10, "y":3}, {"label":"R32", "x":11, "y":3}, {"label":"R33", "x":12, "y":3}, {"label":"R34", "x":13, "y":3}, {"label":"R35", "x":14, "y":3}, {"label":"LT0", "x":2, "y":4}, {"label":"LT1", "x":3, "y":4}, {"label":"LT2", "x":4, "y":4}, {"label":"LT3", "x":5, "y":4}, {"label":"LT4", "x":6, "y":4}, {"label":"RT4", "x":8, "y":4}, {"label":"RT3", "x":9, "y":4}, {"label":"RT2", "x":10, "y":4}, {"label":"RT1", "x":11, "y":4}, {"label":"RT0", "x":12, "y":4}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [5, 5], "x": 9, "y": 0},
+        {"matrix": [5, 4], "x": 10, "y": 0},
+        {"matrix": [5, 3], "x": 11, "y": 0},
+        {"matrix": [5, 2], "x": 12, "y": 0},
+        {"matrix": [5, 1], "x": 13, "y": 0},
+        {"matrix": [5, 0], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+
+        {"matrix": [6, 5], "x": 9, "y": 1},
+        {"matrix": [6, 4], "x": 10, "y": 1},
+        {"matrix": [6, 3], "x": 11, "y": 1},
+        {"matrix": [6, 2], "x": 12, "y": 1},
+        {"matrix": [6, 1], "x": 13, "y": 1},
+        {"matrix": [6, 0], "x": 14, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+
+        {"matrix": [7, 5], "x": 9, "y": 2},
+        {"matrix": [7, 4], "x": 10, "y": 2},
+        {"matrix": [7, 3], "x": 11, "y": 2},
+        {"matrix": [7, 2], "x": 12, "y": 2},
+        {"matrix": [7, 1], "x": 13, "y": 2},
+        {"matrix": [7, 0], "x": 14, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [4, 5], "x": 6, "y": 3},
+
+        {"matrix": [9, 5], "x": 8, "y": 3},
+        {"matrix": [8, 5], "x": 9, "y": 3},
+        {"matrix": [8, 4], "x": 10, "y": 3},
+        {"matrix": [8, 3], "x": 11, "y": 3},
+        {"matrix": [8, 2], "x": 12, "y": 3},
+        {"matrix": [8, 1], "x": 13, "y": 3},
+        {"matrix": [8, 0], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 2, "y": 4},
+        {"matrix": [4, 1], "x": 3, "y": 4},
+        {"matrix": [4, 2], "x": 4, "y": 4},
+        {"matrix": [4, 3], "x": 5, "y": 4},
+        {"matrix": [4, 4], "x": 6, "y": 4},
+
+        {"matrix": [9, 4], "x": 8, "y": 4},
+        {"matrix": [9, 3], "x": 9, "y": 4},
+        {"matrix": [9, 2], "x": 10, "y": 4},
+        {"matrix": [9, 1], "x": 11, "y": 4},
+        {"matrix": [9, 0], "x": 12, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/fortitude60/rev1/rev1.h b/keyboards/fortitude60/rev1/rev1.h
deleted file mode 100644
index 7445cfa906..0000000000
--- a/keyboards/fortitude60/rev1/rev1.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Standard Keymap
-// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35, LT5, RT5, R30, R31, R32, R33, R34, R35, \
-            LT0, LT1, LT2, LT3, LT4, RT4, RT3, RT2, RT1, RT0            \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { LT0, LT1, LT2, LT3, LT4, LT5 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { R35, R34, R33, R32, R31, R30 }, \
-    { RT0, RT1, RT2, RT3, RT4, RT5 } \
-  }