[Keymap] csc027/keymap-updates (#9420)

3 files changed, 17 insertions, 43 deletions

diff --git a/keyboards/keebio/iris/keymaps/csc027/keymap.c b/keyboards/keebio/iris/keymaps/csc027/keymap.c
index 82a0773914..f81e8f848a 100644
--- a/keyboards/keebio/iris/keymaps/csc027/keymap.c
+++ b/keyboards/keebio/iris/keymaps/csc027/keymap.c
@@ -52,12 +52,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                    _______,  _______,  _______,                   _______,  _______,  _______
     ),
 
-    [_GW] = LAYOUT(
-        KC_Y,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_5,                              KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-        KC_B,    KC_TAB,  KC_T,    KC_W,    KC_4,    KC_R,                              KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-        KC_M,    MC_LSEC, KC_A,    KC_S,    KC_D,    KC_F,                              KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_I,    KC_LCTL, KC_Z,    KC_LALT, KC_V,    KC_SPC,  KC_SPC,          _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  TO(_CS), TO(_QW),
-                                   KC_X,     KC_C,     KC_SPC,                    _______,  KC_M,     KC_B
+    [_GG] = LAYOUT(
+        KC_5,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,                              KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_T,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,                              KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_G,    MC_LSEC, KC_A,    KC_S,    KC_D,    KC_F,                              KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_B,    KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_SPC,  KC_SPC,          _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  TO(_CS), TO(_QW),
+                                   KC_LALT,  KC_V,     KC_SPC,                    _______,  KC_M,     KC_B
     ),
 
     [_CS] = LAYOUT(
diff --git a/keyboards/planck/keymaps/csc027/keymap.c b/keyboards/planck/keymaps/csc027/keymap.c
index e39be03eb0..38e3e07413 100644
--- a/keyboards/planck/keymaps/csc027/keymap.c
+++ b/keyboards/planck/keymaps/csc027/keymap.c
@@ -46,43 +46,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ___________________CONVENIENCE_L4__________________, ___________________CONVENIENCE_R4__________________
     ),
 
-    /* Guild Wars 2 Layer
-     *
-     * ,-----------------------------------------------------------------------.
-     * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |BkSpc|
-     * |-----------------------------------------------------------------------|
-     * | Tab |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  \  |
-     * |-----------------------------------------------------------------------|
-     * |Sf/Ec|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |Enter|
-     * |-----------------------------------------------------------------------|
-     * | Ctl |  Z  | Alt |  X  |  C  |Space|Space|  M  |  B  |  .  |Nxt L|Rst L|
-     * `-----------------------------------------------------------------------'
-     */
-
-    [_GW] = LAYOUT_ortho_4x12(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-        MC_LSEC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT ,
-        KC_LCTL, KC_Z,    KC_LALT, KC_X,    KC_C,    KC_SPC,  KC_SPC,  KC_M,    KC_B,    KC_DOT,  TO(_CS), TO(_QW)
+    [_GG] = LAYOUT_wrapper(
+        ________________General_Game_4x12_L1_______________, ________________General_Game_4x12_R1_______________,
+        ________________General_Game_4x12_L2_______________, ________________General_Game_4x12_R2_______________,
+        ________________General_Game_4x12_L3_______________, ________________General_Game_4x12_R3_______________,
+        ________________General_Game_4x12_L4_______________, ________________General_Game_4x12_R4_______________
     ),
 
-    /* CS:GO Layer
-     *
-     * ,-----------------------------------------------------------------------.
-     * |     |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |BkSpc|
-     * |-----------------------------------------------------------------------|
-     * | Tab |  Q  |  W  |  E  |  R  |  T  |  Y  |  4  |  5  |  6  |     |NmLck|
-     * |-----------------------------------------------------------------------|
-     * |Shift|  A  |  S  |  D  |  F  |  G  |  H  |  1  |  2  |  3  |Enter| Esc |
-     * |-----------------------------------------------------------------------|
-     * | Ctl |  Z  | Alt |  X  |  B  |Space|Space|  0  |  0  |  .  |Nxt L|Rst L|
-     * `-----------------------------------------------------------------------'
-     */
-
-    [_CS] = LAYOUT_ortho_4x12(
-        XXXXXXX, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_P7,   KC_P8,   KC_P9,   KC_0,    KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_P4,   KC_P5,   KC_P6,   XXXXXXX, KC_NLCK,
-        KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_ESC ,
-        KC_LCTL, KC_Z,    KC_LALT, KC_X,    KC_B,    KC_SPC,  KC_SPC,  KC_P0,   KC_P0,   KC_PDOT, TO(_QW), TO(_QW)
+    [_CS] = LAYOUT_wrapper(
+        ___________________CSGO_4x12_L1____________________, ___________________CSGO_4x12_R1____________________,
+        ___________________CSGO_4x12_L2____________________, ___________________CSGO_4x12_R2____________________,
+        ___________________CSGO_4x12_L3____________________, ___________________CSGO_4x12_R3____________________,
+        ___________________CSGO_4x12_L4____________________, ___________________CSGO_4x12_R4____________________
     )
 };
diff --git a/keyboards/planck/keymaps/csc027/rules.mk b/keyboards/planck/keymaps/csc027/rules.mk
index 801031fb1e..cf92d56749 100644
--- a/keyboards/planck/keymaps/csc027/rules.mk
+++ b/keyboards/planck/keymaps/csc027/rules.mk
@@ -2,5 +2,5 @@ BOOTMAGIC_ENABLE = no
 COMMAND_ENABLE = no
 CONSOLE_ENABLE = no
 EXTRAKEY_ENABLE = no
-LTO_ENABLE = yes
+LTO_ENABLE = no
 RGBLIGHT_ENABLE = no