Move miscellaneous layouts to data driven (#20516)

2 files changed, 101 insertions, 42 deletions

diff --git a/keyboards/bajjak/bajjak.h b/keyboards/bajjak/bajjak.h
index 25c51273d1..52f14ad3ea 100644
--- a/keyboards/bajjak/bajjak.h
+++ b/keyboards/bajjak/bajjak.h
@@ -126,30 +126,3 @@ typedef union {
 } keyboard_config_t;
 
 extern keyboard_config_t keyboard_config;
-
-#define LAYOUT_6x7( \
-                        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, L36,  R30, R31, R32, R33, R34, R35, R36, \
-                        L40, L41, L42, L43, L44, L45,            R41, R42, R43, R44, R45, R46, \
-                        L50, L51, L52, L53, L54,                      R52, R53, R54, R55, R56, \
-                                                 L65, L66,  R60, R61,                          \
-                                                      L64,  R62,                               \
-                                            L63, L62, L61,  R65, R64, R63                      \
-                        ) { \
-        { L00, L10, L20, L30, L40,   L50,   KC_NO }, \
-        { L01, L11, L21, L31, L41,   L51,   L61   }, \
-        { L02, L12, L22, L32, L42,   L52,   L62   }, \
-        { L03, L13, L23, L33, L43,   L53,   L63   }, \
-        { L04, L14, L24, L34, L44,   L54,   L64   }, \
-        { L05, L15, L25, L35, L45,   KC_NO, L65   }, \
-        { L06, L16, L26, L36, KC_NO, KC_NO, L66   }, \
-        { R00, R10, R20, R30, KC_NO, KC_NO, R60   }, \
-        { R01, R11, R21, R31, R41,   KC_NO, R61   }, \
-        { R02, R12, R22, R32, R42,   R52,   R62   }, \
-        { R03, R13, R23, R33, R43,   R53,   R63   }, \
-        { R04, R14, R24, R34, R44,   R54,   R64   }, \
-        { R05, R15, R25, R35, R45,   R55,   R65   },\
-        { R06, R16, R26, R36, R46,   R56,   KC_NO } \
-    }
diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json
index ee519b01f6..a280cb9ed8 100644
--- a/keyboards/bajjak/info.json
+++ b/keyboards/bajjak/info.json
@@ -13,27 +13,113 @@
     "layouts": {
         "LAYOUT_6x7": {
             "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},
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "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},
-            {"x":9.5, "y":1.25},            {"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": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 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":6.5, "y":2.25},
-            {"x":9.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": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.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":3.25},
-            {"x":9.5, "y":3.25},            {"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": [7, 1], "x": 9.5, "y": 1.25},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
 
-            {"x":0, "y":4.375, "w":1.5},    {"x":1.5, "y":4.375},   {"x":2.5, "y":4.125},   {"x":3.5, "y":4},       {"x":4.5, "y":4.125},   {"x":5.5, "y":4.25},
-            {"x":10.5, "y":4.25},           {"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, "w":1.5},
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [6, 2], "x": 6.5, "y": 2.25},
 
-            {"x":0, "y":5.375, "w":1.5},    {"x":1.5, "y":5.375},   {"x":2.5, "y":5.125},   {"x":3.5, "y":5},       {"x":4.5, "y":5.125},
-            {"x":11.5, "y":5.125},          {"x":12.5, "y":5},      {"x":13.5, "y":5.125},  {"x":14.5, "y":5.375},  {"x":15.5, "y":5.375, "w":1.5},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
 
-                                            {"x":6, "y":6}, {"x":7, "y":6},      {"x":9, "y":6}, {"x":10, "y":6},
-                                                            {"x":7, "y":7},      {"x":9, "y":7},
-              {"x":5, "y":7, "h":2}, {"x":6, "y":7, "h":2}, {"x":7, "y":8},      {"x":9, "y":8}, {"x":10, "y":7, "h":2}, {"x":11, "y":7, "h":2}
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 3.25},
+
+                {"matrix": [7, 3], "x": 9.5, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [0, 4], "x": 0, "y": 4.375, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+                {"matrix": [5, 4], "x": 5.5, "y": 4.25},
+
+                {"matrix": [8, 4], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375, "w": 1.5},
+
+                {"matrix": [0, 5], "x": 0, "y": 5.375, "w": 1.5},
+                {"matrix": [1, 5], "x": 1.5, "y": 5.375},
+                {"matrix": [2, 5], "x": 2.5, "y": 5.125},
+                {"matrix": [3, 5], "x": 3.5, "y": 5},
+                {"matrix": [4, 5], "x": 4.5, "y": 5.125},
+
+                {"matrix": [9, 5], "x": 11.5, "y": 5.125},
+                {"matrix": [10, 5], "x": 12.5, "y": 5},
+                {"matrix": [11, 5], "x": 13.5, "y": 5.125},
+                {"matrix": [12, 5], "x": 14.5, "y": 5.375},
+                {"matrix": [13, 5], "x": 15.5, "y": 5.375, "w": 1.5},
+
+                {"matrix": [5, 6], "x": 6, "y": 6},
+                {"matrix": [6, 6], "x": 7, "y": 6},
+
+                {"matrix": [7, 6], "x": 9, "y": 6},
+                {"matrix": [8, 6], "x": 10, "y": 6},
+
+                {"matrix": [4, 6], "x": 7, "y": 7},
+
+                {"matrix": [9, 6], "x": 9, "y": 7},
+
+                {"matrix": [3, 6], "x": 5, "y": 7, "h": 2},
+                {"matrix": [2, 6], "x": 6, "y": 7, "h": 2},
+                {"matrix": [1, 6], "x": 7, "y": 8},
+
+                {"matrix": [12, 6], "x": 9, "y": 8},
+                {"matrix": [11, 6], "x": 10, "y": 7, "h": 2},
+                {"matrix": [10, 6], "x": 11, "y": 7, "h": 2}
             ]
         }
     }