split_3x5_3 layout support (#9624)

* Add split_3x5_3 support to Minidox

* Add split_3x5_3 support to Miniaxe

* Add LAYOUT_mini to Centromere

This layout macro removes the need or KC_NO keycodes in the keymap.

* Add split_3x5_3 support to Centromere

* Add split_3x5_3 support to suihankey split

* Add LAYOUT_mini to centromere/info.json

* Add LAYOUT_mini to crkbd

* Add split_3x5_3 support to crkbd

* Change mini layout names

* Rename main layouts for split_3x6_3 keyboards

* Use split_3x5_3 macro for remaining keyboards

* Update relevant info.json files

* Fix suihankey/split/alpha macro

* Add layout aliases for suihankey

4 files changed, 72 insertions, 8 deletions

diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json
index d7f6309043..34b3e95b94 100644
--- a/keyboards/crkbd/info.json
+++ b/keyboards/crkbd/info.json
@@ -5,7 +5,7 @@
   "width": 15,
   "height": 4.7,
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_split_3x6_3": {
       "layout": [
         {"label":"Esc", "x":0, "y":0.3},
         {"label":"Q", "x":1, "y":0.3},
@@ -57,6 +57,53 @@
         {"label":"Raise", "x":9, "y":3.7},
         {"label":"Alt / KC_HAEN", "x":10, "y":3.7}
       ]
+    },
+    "LAYOUT_split_3x5_3": {
+      "layout": [
+        {"label":"Q", "x":0, "y":0.3},
+        {"label":"W", "x":1, "y":0.1},
+        {"label":"E", "x":2, "y":0},
+        {"label":"R", "x":3, "y":0.1},
+        {"label":"T", "x":4, "y":0.2},
+
+        {"label":"Y", "x":8, "y":0.2},
+        {"label":"U", "x":9, "y":0.1},
+        {"label":"I", "x":10, "y":0},
+        {"label":"O", "x":11, "y":0.1},
+        {"label":"P", "x":12, "y":0.3},
+
+        {"label":"A", "x":0, "y":1.3},
+        {"label":"S", "x":1, "y":1.1},
+        {"label":"D", "x":2, "y":1},
+        {"label":"F", "x":3, "y":1.1},
+        {"label":"G", "x":4, "y":1.2},
+
+        {"label":"H", "x":8, "y":1.2},
+        {"label":"J", "x":9, "y":1.1},
+        {"label":"K", "x":10, "y":1},
+        {"label":"L", "x":11, "y":1.1},
+        {"label":";", "x":12, "y":1.3},
+
+        {"label":"Z", "x":0, "y":2.3},
+        {"label":"X", "x":1, "y":2.1},
+        {"label":"C", "x":2, "y":2},
+        {"label":"V", "x":3, "y":2.1},
+        {"label":"B", "x":4, "y":2.2},
+
+        {"label":"N", "x":8, "y":2.2},
+        {"label":"M", "x":9, "y":2.1},
+        {"label":",", "x":10, "y":2},
+        {"label":".", "x":11, "y":2.1},
+        {"label":"/", "x":12, "y":2.3},
+
+        {"label":"GUI / KC_HANJ", "x":3, "y":3.7},
+        {"label":"Lower", "x":4, "y":3.7},
+        {"label":"Space", "x":5, "y":3.2, "h":1.5},
+
+        {"label":"Enter", "x":7, "y":3.2, "h":1.5},
+        {"label":"Raise", "x":8, "y":3.7},
+        {"label":"Alt / KC_HAEN", "x":9, "y":3.7}
+      ]
     }
   }
 }
diff --git a/keyboards/crkbd/keymaps/default/keymap.c b/keyboards/crkbd/keymaps/default/keymap.c
index 446e3281e4..4dd0be8992 100644
--- a/keyboards/crkbd/keymaps/default/keymap.c
+++ b/keyboards/crkbd/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ enum macro_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT( \
+  [_QWERTY] = LAYOUT_split_3x6_3( \
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   ),
 
-  [_LOWER] = LAYOUT( \
+  [_LOWER] = LAYOUT_split_3x6_3( \
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
        KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                       //`--------------------------'  `--------------------------'
     ),
 
-  [_RAISE] = LAYOUT( \
+  [_RAISE] = LAYOUT_split_3x6_3( \
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
        KC_ESC, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                       //`--------------------------'  `--------------------------'
   ),
 
-  [_ADJUST] = LAYOUT( \
+  [_ADJUST] = LAYOUT_split_3x6_3( \
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
         RESET,  RGBRST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h
index 6580d73fe3..2244b87f17 100644
--- a/keyboards/crkbd/rev1/rev1.h
+++ b/keyboards/crkbd/rev1/rev1.h
@@ -22,7 +22,7 @@
 #endif
 
 // clang-format off
-#define LAYOUT( \
+#define LAYOUT_split_3x6_3( \
   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, \
@@ -39,6 +39,23 @@
     { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
   }
 
+#define LAYOUT_split_3x5_3( \
+  L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
+  L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
+  L20, L21, L22, L23, L24,           R20, R21, R22, R23, R24, \
+                 L30, L31, L32, R30, R31, R32 \
+  ) \
+  { \
+    { KC_NO, L00, L01, L02, L03, L04 }, \
+    { KC_NO, L10, L11, L12, L13, L14 }, \
+    { KC_NO, L20, L21, L22, L23, L24 }, \
+    { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
+    { KC_NO, R04, R03, R02, R01, R00 }, \
+    { KC_NO, R14, R13, R12, R11, R10 }, \
+    { KC_NO, R24, R23, R22, R21, R20 }, \
+    { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
+  }
+
 #define LAYOUT_kc( \
   L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
   L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
@@ -53,4 +70,4 @@
   )
 // clang-format on
 
-#define LAYOUT_split_3x6_3 LAYOUT
+#define LAYOUT LAYOUT_split_3x6_3
diff --git a/keyboards/crkbd/rev1/rules.mk b/keyboards/crkbd/rev1/rules.mk
index a921e60308..21cee6bcf7 100644
--- a/keyboards/crkbd/rev1/rules.mk
+++ b/keyboards/crkbd/rev1/rules.mk
@@ -2,4 +2,4 @@ SRC += 	matrix.c \
 		split_util.c \
 		split_scomm.c
 
-LAYOUTS = split_3x6_3
+LAYOUTS = split_3x5_3 split_3x6_3