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

5 files changed, 144 insertions, 121 deletions

diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json
index de64ba20a0..143eaaa557 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -17,76 +17,5 @@
         "soft_serial_pin": "D1"
      },
     "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x":1, "y":0.75},
-                {"x":2, "y":0.62},
-                {"x":3, "y":0.25},
-                {"x":4, "y":0},
-                {"x":5, "y":0.25},
-                {"x":6, "y":0.37},
-
-                {"x":11.75, "y":0.37},
-                {"x":12.75, "y":0.25},
-                {"x":13.75, "y":0},
-                {"x":14.75, "y":0.25},
-                {"x":15.75, "y":0.62},
-                {"x":16.75, "y":0.75},
-
-                {"x":0, "y":2.5},
-                {"x":1, "y":1.75},
-                {"x":2, "y":1.62},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.37},
-
-                {"x":11.75, "y":1.37},
-                {"x":12.75, "y":1.25},
-                {"x":13.75, "y":1},
-                {"x":14.75, "y":1.25},
-                {"x":15.75, "y":1.62},
-                {"x":16.75, "y":1.75},
-                {"x":17.75, "y":2.5},
-
-                {"x":1, "y":2.75},
-                {"x":2, "y":2.62},
-                {"x":3, "y":2.25},
-                {"x":4, "y":2},
-                {"x":5, "y":2.25},
-                {"x":6, "y":2.37},
-
-                {"x":11.75, "y":2.37},
-                {"x":12.75, "y":2.25},
-                {"x":13.75, "y":2},
-                {"x":14.75, "y":2.25},
-                {"x":15.75, "y":2.62},
-                {"x":16.75, "y":2.75},
-
-                {"x":1, "y":3.75},
-                {"x":2, "y":3.62},
-                {"x":3, "y":3.25},
-                {"x":4, "y":3},
-                {"x":5, "y":3.25},
-                {"x":6, "y":3.37},
-
-                {"x":11.75, "y":3.37},
-                {"x":12.75, "y":3.25},
-                {"x":13.75, "y":3},
-                {"x":14.75, "y":3.25},
-                {"x":15.75, "y":3.62},
-                {"x":16.75, "y":3.75},
-
-                {"x":5, "y":4.25},
-                {"x":6, "y":4.37},
-                {"x":7, "y":4.5},
-
-                {"x":10.75, "y":4.5},
-                {"x":11.75, "y":4.37},
-                {"x":12.75, "y":4.25}
-            ]
-        }
-    }
+    "bootloader": "caterina"
 }
diff --git a/keyboards/jiran/rev1/info.json b/keyboards/jiran/rev1/info.json
index 830440f4f6..b9a6d56fe6 100644
--- a/keyboards/jiran/rev1/info.json
+++ b/keyboards/jiran/rev1/info.json
@@ -2,5 +2,76 @@
     "backlight": {
         "pin": "B6",
         "levels": 5
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1, "y": 0.75},
+                {"matrix": [0, 1], "x": 2, "y": 0.62},
+                {"matrix": [0, 2], "x": 3, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.37},
+
+                {"matrix": [5, 5], "x": 11.75, "y": 0.37},
+                {"matrix": [5, 4], "x": 12.75, "y": 0.25},
+                {"matrix": [5, 3], "x": 13.75, "y": 0},
+                {"matrix": [5, 2], "x": 14.75, "y": 0.25},
+                {"matrix": [5, 1], "x": 15.75, "y": 0.62},
+                {"matrix": [5, 0], "x": 16.75, "y": 0.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 0], "x": 1, "y": 1.75},
+                {"matrix": [1, 1], "x": 2, "y": 1.62},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6, "y": 1.37},
+
+                {"matrix": [6, 5], "x": 11.75, "y": 1.37},
+                {"matrix": [6, 4], "x": 12.75, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.75, "y": 1},
+                {"matrix": [6, 2], "x": 14.75, "y": 1.25},
+                {"matrix": [6, 1], "x": 15.75, "y": 1.62},
+                {"matrix": [6, 0], "x": 16.75, "y": 1.75},
+                {"matrix": [9, 0], "x": 17.75, "y": 2.5},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.62},
+                {"matrix": [2, 2], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6, "y": 2.37},
+
+                {"matrix": [7, 5], "x": 11.75, "y": 2.37},
+                {"matrix": [7, 4], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 13.75, "y": 2},
+                {"matrix": [7, 2], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 15.75, "y": 2.62},
+                {"matrix": [7, 0], "x": 16.75, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 1, "y": 3.75},
+                {"matrix": [3, 1], "x": 2, "y": 3.62},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.37},
+
+                {"matrix": [8, 5], "x": 11.75, "y": 3.37},
+                {"matrix": [8, 4], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 2], "x": 14.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 15.75, "y": 3.62},
+                {"matrix": [8, 0], "x": 16.75, "y": 3.75},
+
+                {"matrix": [4, 3], "x": 5, "y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 4.37},
+                {"matrix": [4, 5], "x": 7, "y": 4.5},
+
+                {"matrix": [9, 5], "x": 10.75, "y": 4.5},
+                {"matrix": [9, 4], "x": 11.75, "y": 4.37},
+                {"matrix": [9, 3], "x": 12.75, "y": 4.25}
+            ]
+        }
     }
 }
diff --git a/keyboards/jiran/rev1/rev1.h b/keyboards/jiran/rev1/rev1.h
deleted file mode 100644
index d243bd366b..0000000000
--- a/keyboards/jiran/rev1/rev1.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-
-
-#define LAYOUT( \
-         L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L40, L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, R45, \
-         L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-         L30, L31, L32, L33, L34, L35,           R30, R31, R32, R33, R34, R35, \
-                        L43, L44, L45,           R40, R41, R42 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05 }, \
-        { L10, L11, L12, L13, L14, L15 }, \
-        { L20, L21, L22, L23, L24, L25 }, \
-        { L30, L31, L32, L33, L34, L35 }, \
-        { L40, KC_NO, KC_NO, L43, L44, L45, }, \
-        { R05, R04, R03, R02, R01, R00 }, \
-        { R15, R14, R13, R12, R11, R10 }, \
-        { R25, R24, R23, R22, R21, R20 }, \
-        { R35, R34, R33, R32, R31, R30 }, \
-        { R45, KC_NO, KC_NO, R42, R41, R40 } \
-    }
diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/info.json
index fd406420c6..8539b47652 100644
--- a/keyboards/jiran/rev2/info.json
+++ b/keyboards/jiran/rev2/info.json
@@ -1,5 +1,76 @@
 {
    "ws2812": {
        "pin": "B6"
-   }
+   },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1, "y": 0.75},
+                {"matrix": [0, 1], "x": 2, "y": 0.62},
+                {"matrix": [0, 2], "x": 3, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.37},
+
+                {"matrix": [5, 5], "x": 11.75, "y": 0.37},
+                {"matrix": [5, 4], "x": 12.75, "y": 0.25},
+                {"matrix": [5, 3], "x": 13.75, "y": 0},
+                {"matrix": [5, 2], "x": 14.75, "y": 0.25},
+                {"matrix": [5, 1], "x": 15.75, "y": 0.62},
+                {"matrix": [5, 0], "x": 16.75, "y": 0.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 0], "x": 1, "y": 1.75},
+                {"matrix": [1, 1], "x": 2, "y": 1.62},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6, "y": 1.37},
+
+                {"matrix": [6, 5], "x": 11.75, "y": 1.37},
+                {"matrix": [6, 4], "x": 12.75, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.75, "y": 1},
+                {"matrix": [6, 2], "x": 14.75, "y": 1.25},
+                {"matrix": [6, 1], "x": 15.75, "y": 1.62},
+                {"matrix": [6, 0], "x": 16.75, "y": 1.75},
+                {"matrix": [9, 0], "x": 17.75, "y": 2.5},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.62},
+                {"matrix": [2, 2], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6, "y": 2.37},
+
+                {"matrix": [7, 5], "x": 11.75, "y": 2.37},
+                {"matrix": [7, 4], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 13.75, "y": 2},
+                {"matrix": [7, 2], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 15.75, "y": 2.62},
+                {"matrix": [7, 0], "x": 16.75, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 1, "y": 3.75},
+                {"matrix": [3, 1], "x": 2, "y": 3.62},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.37},
+
+                {"matrix": [8, 5], "x": 11.75, "y": 3.37},
+                {"matrix": [8, 4], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 2], "x": 14.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 15.75, "y": 3.62},
+                {"matrix": [8, 0], "x": 16.75, "y": 3.75},
+
+                {"matrix": [4, 3], "x": 5, "y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 4.37},
+                {"matrix": [4, 5], "x": 7, "y": 4.5},
+
+                {"matrix": [9, 5], "x": 10.75, "y": 4.5},
+                {"matrix": [9, 4], "x": 11.75, "y": 4.37},
+                {"matrix": [9, 3], "x": 12.75, "y": 4.25}
+            ]
+        }
+    }
 }
diff --git a/keyboards/jiran/rev2/rev2.h b/keyboards/jiran/rev2/rev2.h
deleted file mode 100644
index 01ffe1a48e..0000000000
--- a/keyboards/jiran/rev2/rev2.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-         L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L40, L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, R45, \
-         L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-         L30, L31, L32, L33, L34, L35,           R30, R31, R32, R33, R34, R35, \
-                        L43, L44, L45,           R40, R41, R42 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05 }, \
-        { L10, L11, L12, L13, L14, L15 }, \
-        { L20, L21, L22, L23, L24, L25 }, \
-        { L30, L31, L32, L33, L34, L35 }, \
-        { L40, KC_NO, KC_NO, L43, L44, L45, }, \
-        { R05, R04, R03, R02, R01, R00 }, \
-        { R15, R14, R13, R12, R11, R10 }, \
-        { R25, R24, R23, R22, R21, R20 }, \
-        { R35, R34, R33, R32, R31, R30 }, \
-        { R45, KC_NO, KC_NO, R42, R41, R40 } \
-    }