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

2 files changed, 52 insertions, 76 deletions

diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json
index 6b2c9244c0..a0b1188a7c 100644
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ b/keyboards/keebio/rorschach/rev1/info.json
@@ -28,68 +28,67 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
+        {"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},
 
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 12, "y": 0 },
-        { "x": 13, "y": 0 },
-        { "x": 14, "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},
 
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
+        {"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},
 
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 12, "y": 1 },
-        { "x": 13, "y": 1 },
-        { "x": 14, "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},
 
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
+        {"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},
 
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 12, "y": 2 },
-        { "x": 13, "y": 2 },
-        { "x": 14, "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},
 
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
+        {"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},
 
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 },
-        { "x": 12, "y": 3 },
-        { "x": 13, "y": 3 },
-        { "x": 14, "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},
 
-        { "x": 5.5, "y": 4 },
-        { "x": 6, "y": 5 },
-
-        { "x": 8, "y": 5 },
-        { "x": 8.5, "y": 4 }
+        {"matrix": [4, 4], "x": 5.5, "y": 4},
+        {"matrix": [4, 5], "x": 6, "y": 5},
 
+        {"matrix": [9, 5], "x": 8, "y": 5},
+        {"matrix": [9, 4], "x": 8.5, "y": 4}
       ]
     }
   }
diff --git a/keyboards/keebio/rorschach/rev1/rev1.h b/keyboards/keebio/rorschach/rev1/rev1.h
deleted file mode 100644
index 32c421c7d0..0000000000
--- a/keyboards/keebio/rorschach/rev1/rev1.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, \
-    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,           R30, R31, R32, R33, R34, R35, \
-                             LT1, LT2, RT2, RT1 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05 }, \
-        { L10, L11, L12, L13, L14, L15 }, \
-        { L20, L21, L22, L23, L24, L25 }, \
-        { L30, L31, L32, L33, L34, L35 }, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, LT1, LT2 }, \
-        { R05, R04, R03, R02, R01, R00 }, \
-        { R15, R14, R13, R12, R11, R10 }, \
-        { R25, R24, R23, R22, R21, R20 }, \
-        { R35, R34, R33, R32, R31, R30 }, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, RT1, RT2 } \
-    }