Address PR comments

Revert changes in keymaps, add alias when needed
qmk · Jan 22, 2023 · 63113a4 · 63113a4
1 parent e0686e6
commit 63113a4
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 25 deletions.
diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.h b/keyboards/bastardkb/charybdis/3x5/3x5.h
@@ -38,6 +38,13 @@
   {   k70, KC_NO,   k72, KC_NO, KC_NO },                \
 }
 
+/**
+ * Alias for backward compatibility with some keymaps.
+ *
+ * Prefer using `LAYOUT` for new keymaps.
+ */
+#define LAYOUT_charybdis_3x5 LAYOUT
+
 /**
  * \brief Compatibility layout with the split_3x5_3 community layout.
  *

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
@@ -18,64 +18,64 @@
 
 #include "drashna.h"
 
-#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
-#define LAYOUT_base( \
+#define LAYOUT_charybdis_3x5_wrapper(...) LAYOUT_charybdis_3x5(__VA_ARGS__)
+#define LAYOUT_charybdis_3x5_base( \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
     K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
     ) \
-    LAYOUT ( \
+    LAYOUT_charybdis_3x5 ( \
        K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A, \
        ALT_T(K11), K12,  K13,     K14,     GUI_T(K15),  LGUI_T(K16),    K17,     K18,     K19, LALT_T(K1A), \
        CTL_T(K21), K22,  K23,     K24,     K25,                K26,     K27,     K28,     K29, RCTL_T(K2A), \
                 LSFT_T(KC_GRV), KC_SPC,  BK_LWER,              DL_RAIS, RSFT_T(KC_ENT) \
     )
-#define LAYOUT_base_wrapper(...)       LAYOUT_base(__VA_ARGS__)
+#define LAYOUT_charybdis_3x5_base_wrapper(...)       LAYOUT_charybdis_3x5_base(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
+    [_DEFAULT_LAYER_1] = LAYOUT_charybdis_3x5_base_wrapper(
         _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
         _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
         _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
     ),
 
-    [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
+    [_DEFAULT_LAYER_2] = LAYOUT_charybdis_3x5_base_wrapper(
         ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
         ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
         ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
     ),
-    [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
+    [_DEFAULT_LAYER_3] = LAYOUT_charybdis_3x5_base_wrapper(
         _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
         _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
         _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
     ),
 
-    [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
+    [_DEFAULT_LAYER_4] = LAYOUT_charybdis_3x5_base_wrapper(
         _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
         _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
         _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
     ),
 
-    [_MOUSE] = LAYOUT(
+    [_MOUSE] = LAYOUT_charybdis_3x5(
         _______, _______, _______, _______, _______,    KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD,
         _______, _______, _______, _______, _______,    KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6,
         _______, _______, _______, _______, _______,    KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______,
                           _______, SNIPING, _______,    _______, _______
     ),
-    [_LOWER] = LAYOUT_wrapper(
+    [_LOWER] = LAYOUT_charybdis_3x5_wrapper(
         _________________LOWER_L1__________________,    _________________LOWER_R1__________________,
         _________________LOWER_L2__________________,    _________________LOWER_R2__________________,
         _________________LOWER_L3__________________,    _________________LOWER_R3__________________,
                           _______, _______, _______,    _______, AUTO_CTN
     ),
-    [_RAISE] = LAYOUT_wrapper(
+    [_RAISE] = LAYOUT_charybdis_3x5_wrapper(
         _________________RAISE_L1__________________,    _________________RAISE_R1__________________,
         _________________RAISE_L2__________________,    _________________RAISE_R2__________________,
         _________________RAISE_L3__________________,    _________________RAISE_R3__________________,
                           QK_RBT,  _______, _______,    _______, _______
     ),
-    [_ADJUST] = LAYOUT_wrapper(
+    [_ADJUST] = LAYOUT_charybdis_3x5_wrapper(
         _________________ADJUST_L1_________________,    _________________ADJUST_R1_________________,
         _________________ADJUST_L2_________________,    _________________ADJUST_R2_________________,
         _________________ADJUST_L3_________________,    _________________ADJUST_R3_________________,

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h
@@ -11,7 +11,7 @@ K10,   K11,   K12,   K13,   K14,          K15,   K16,   K17,   K18,   K19, \
 K20,   K21,   K22,   K23,   K24,          K25,   K26,   K27,   K28,   K29, \
 N30,   N31,   K32,   K33,   K34,          K35,   K36,   K37,   N38,   N39 \
 ) \
-LAYOUT( \
+LAYOUT_charybdis_3x5( \
 K00,   K01,   K02,   K03,   K04,          K05,   K06,   K07,   K08,   K09, \
 K10,   K11,   K12,   K13,   K14,          K15,   K16,   K17,   K18,   K19, \
 K20,   K21,   K22,   K23,   K24,          K25,   K26,   K27,   K28,   K29, \

diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.h b/keyboards/bastardkb/charybdis/4x6/4x6.h
@@ -42,3 +42,10 @@
   { KC_NO,   k91, KC_NO,   k93, KC_NO,   k95 },                   \
 }
 // clang-format on
+
+/**
+ * Alias for backward compatibility with some keymaps.
+ *
+ * Prefer using `LAYOUT` for new keymaps.
+ */
+#define LAYOUT_charybdis_4x6 LAYOUT
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
@@ -16,13 +16,13 @@
  */
 #include "drashna.h"
 
-#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
-#define LAYOUT_base( \
+#define LAYOUT_charybdis_4x6_wrapper(...) LAYOUT_charybdis_4x6(__VA_ARGS__)
+#define LAYOUT_charybdis_4x6_base( \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
     K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
-  LAYOUT_wrapper( \
+  LAYOUT_charybdis_4x6_wrapper( \
      KC_ESC,  ________________NUMBER_LEFT________________,            ________________NUMBER_RIGHT_______________, UC_CLUE, \
      SH_TT,   K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A,     SH_TT, \
      LALT_T(KC_TAB), K11, K12,  K13,     K14,     K15,                K16,     K17,     K18,     K19,     K1A,     RALT_T(K1B), \
@@ -31,7 +31,7 @@
                                            KC_SPC, BK_LWER,     DL_RAIS \
     )
 
-#define LAYOUT_base_wrapper(...)       LAYOUT_base(__VA_ARGS__)
+#define LAYOUT_base_wrapper(...)       LAYOUT_charybdis_4x6_base(__VA_ARGS__)
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -58,31 +58,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
     ),
 
-    [_GAMEPAD] = LAYOUT(
+    [_GAMEPAD] = LAYOUT_charybdis_4x6(
         KC_ESC,  KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,       _______, _______, _______, _______, _______, _______,
         KC_F1,   KC_K,    KC_Q,    KC_W,    KC_E,    KC_R,       _______, _______, _______, _______, _______, _______,
         KC_TAB,  KC_G,    KC_A,    KC_S,    KC_D,    KC_F,       _______, _______, _______, _______, _______, _______,
         KC_LCTL, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_H,       _______, _______, _______, _______, _______, _______,
                                    KC_V,    _______, _______,    _______, TG_GAME,
                                            KC_SPC, KC_H,          _______
     ),
-    [_DIABLO] = LAYOUT(
+    [_DIABLO] = LAYOUT_charybdis_4x6(
         KC_ESC,  KC_V,    KC_D,    KC_LALT, KC_NO,   KC_NO,      KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,
         KC_TAB,  KC_S,    KC_I,    KC_F,    KC_M,    KC_T,       _______, _______, _______, _______, _______, _______,
         KC_Q,    KC_1,    KC_2,    KC_3,    KC_4,    KC_G,       _______, _______, _______, _______, _______, _______,
         KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z,       _______, _______, _______, _______, _______, _______,
                                    KC_G,    _______, _______,    TO(_DIABLOII), TG_DBLO,
                                            KC_LSFT, KC_LCTL,      _______
     ),
-    [_DIABLOII] = LAYOUT(
+    [_DIABLOII] = LAYOUT_charybdis_4x6(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_GRV,     _______, _______, _______, _______, _______, _______,
         KC_TAB,  KC_A,    KC_T,    KC_Q,    KC_I,    KC_M,       _______, _______, _______, _______, _______, _______,
         KC_S,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      _______, _______, _______, _______, _______, _______,
         KC_LCTL, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,     _______, _______, _______, _______, _______, _______,
                            KC_DIABLO_CLEAR, _______, _______,    _______, TG(_DIABLOII),
                                SFT_T(KC_SPACE),  ALT_T(KC_Q),      _______
     ),
-    [_MOUSE] = LAYOUT(
+    [_MOUSE] = LAYOUT_charybdis_4x6(
         _______, _______, _______, _______, _______, _______,   _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, _______,
         _______, _______, _______, _______, _______, _______,   KC_WH_U, _______, _______, _______, _______, DRGSCRL,
         _______, _______, _______, _______, _______, _______,   KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                            _______, _______,     _______
     ),
 
-    [_LOWER] = LAYOUT_wrapper(
+    [_LOWER] = LAYOUT_charybdis_4x6_wrapper(
         KC_F12,  _________________FUNC_LEFT_________________,    _________________FUNC_RIGHT________________, KC_F11,
         _______, _________________LOWER_L1__________________,    _________________LOWER_R1__________________, _______,
         _______, _________________LOWER_L2__________________,    _________________LOWER_R2__________________, KC_PIPE,
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                            _______, _______,      _______
     ),
 
-    [_RAISE] = LAYOUT_wrapper(
+    [_RAISE] = LAYOUT_charybdis_4x6_wrapper(
         KC_F12,  _________________FUNC_LEFT_________________,    _________________FUNC_RIGHT________________, KC_F11,
         KC_GRV,  _________________RAISE_L1__________________,    _________________RAISE_R1__________________, _______,
         _______, _________________RAISE_L2__________________,    _________________RAISE_R2__________________, KC_BSLS,
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                            _______, _______,      _______
     ),
 
-    [_ADJUST] = LAYOUT_wrapper(
+    [_ADJUST] = LAYOUT_charybdis_4x6_wrapper(
         QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_SUPER, KC_NOMODE,KC_COMIC,KC_REGIONAL,TG_GAME,TG_DBLO, QK_BOOT,
         VRSN,    _________________ADJUST_L1_________________,    _________________ADJUST_R1_________________, EE_CLR,
         KEYLOCK, _________________ADJUST_L2_________________,    _________________ADJUST_R2_________________, TG_MODS,

diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/config.h
@@ -13,7 +13,7 @@
      K20, K21, K22, K23, K24,                K25, K26, K27, K28, K29, \
      N30, N31, K32, K33, K34,                K35, K36, K37, N38, N39 \
 ) \
-LAYOUT( \
+LAYOUT_charybdis_4x6( \
 XXX, XXX, XXX, XXX, XXX, XXX,                XXX, XXX, XXX, XXX, XXX, XXX, \
 XXX, K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, XXX, \
 XXX, K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, XXX, \