Rename LAYOUT macros identifier that contained the keyboard name (q…

…mk#19657)
freznel10 · Jan 26, 2023 · 19ecd69 · 19ecd69
1 parent 3823046
commit 19ecd69
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 25 deletions.
diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.h b/keyboards/bastardkb/charybdis/3x5/3x5.h
@@ -21,7 +21,7 @@
 #include "charybdis.h"
 
 // clang-format off
-#define LAYOUT_charybdis_3x5( \
+#define LAYOUT(  \
  k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
  k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
  k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \

diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json
@@ -5,8 +5,11 @@
  "pid": "0x1832",
  "vid": "0xA8F8"
  },
+ "layout_aliases": {
+ "LAYOUT_charybdis_3x5": "LAYOUT"
+ },
  "layouts": {
- "LAYOUT_charybdis_3x5": {
+ "LAYOUT": {
  "layout": [
  { "label": "L00", "x": 0, "y": 0 },
  { "label": "L01", "x": 1, "y": 0 },

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
@@ -156,10 +156,14 @@
 # define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 
 // Slow swirl at startup.
+# undef RGB_MATRIX_DEFAULT_SPD
 # define RGB_MATRIX_DEFAULT_SPD 32
 
 // Startup values.
+# undef RGB_MATRIX_DEFAULT_HUE
 # define RGB_MATRIX_DEFAULT_HUE 0
+# undef RGB_MATRIX_DEFAULT_SAT
 # define RGB_MATRIX_DEFAULT_SAT 255
+# undef RGB_MATRIX_DEFAULT_VAL
 # define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
@@ -182,7 +182,7 @@ enum charybdis_keymap_bstiq_layers {
  __VA_ARGS__
 #define MOUSE_MOD(...) _MOUSE_MOD(__VA_ARGS__)
 
-#define LAYOUT_wrapper(...) LAYOUT_charybdis_3x5(__VA_ARGS__)
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [LAYER_BASE] = LAYOUT_wrapper(

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ enum charybdis_keymap_layers {
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [LAYER_BASE] = LAYOUT_charybdis_3x5(
+ [LAYER_BASE] = LAYOUT(
  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // ╰───────────────────────────╯ ╰──────────────────╯
  ),
 
- [LAYER_LOWER] = LAYOUT_charybdis_3x5(
+ [LAYER_LOWER] = LAYOUT(
  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
  RGB_TOG, KC_MNXT, KC_MPLY, KC_MPRV, XXXXXXX, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC,
  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // ╰───────────────────────────╯ ╰──────────────────╯
  ),
 
- [LAYER_RAISE] = LAYOUT_charybdis_3x5(
+ [LAYER_RAISE] = LAYOUT(
  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX,
  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
@@ -200,7 +200,7 @@ static uint16_t auto_pointer_layer_timer = 0;
  __VA_ARGS__
 #define POINTER_MOD(...) _POINTER_MOD(__VA_ARGS__)
 
-#define LAYOUT_wrapper(...) LAYOUT_charybdis_3x5(__VA_ARGS__)
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [LAYER_BASE] = LAYOUT_wrapper(

diff --git a/keyboards/bastardkb/charybdis/3x6/3x6.h b/keyboards/bastardkb/charybdis/3x6/3x6.h
@@ -20,7 +20,7 @@
 #include "charybdis.h"
 
 // clang-format off
-#define LAYOUT_charybdis_3x6( \
+#define LAYOUT(  \
  k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \
  k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \
  k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \

diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json
@@ -3,8 +3,11 @@
  "usb": {
  "pid": "0x1834"
  },
+ "layout_aliases": {
+ "LAYOUT_charybdis_3x6": "LAYOUT"
+ },
  "layouts": {
- "LAYOUT_charybdis_3x6": {
+ "LAYOUT": {
  "layout": [
  { "label": "L00", "x": 0, "y": 0 },
  { "label": "L01", "x": 1, "y": 0 },

diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum charybdis_keymap_layers {
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [LAYER_BASE] = LAYOUT_charybdis_3x6(
+ [LAYER_BASE] = LAYOUT(
  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
  KC_LGUI, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RGUI,
  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // ╰───────────────────────────╯ ╰──────────────────╯
  ),
 
- [LAYER_LOWER] = LAYOUT_charybdis_3x6(
+ [LAYER_LOWER] = LAYOUT(
  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
  XXXXXXX, RGB_TOG, KC_MNXT, KC_MPLY, KC_MPRV, XXXXXXX, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, XXXXXXX,
  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // ╰───────────────────────────╯ ╰──────────────────╯
  ),
 
- [LAYER_RAISE] = LAYOUT_charybdis_3x6(
+ [LAYER_RAISE] = LAYOUT(
  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX,
  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤

diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ static uint16_t auto_pointer_layer_timer = 0;
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [LAYER_BASE] = LAYOUT_charybdis_3x6(
+ [LAYER_BASE] = LAYOUT(
  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
  KC_LGUI, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RGUI,
  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // ╰───────────────────────────╯ ╰──────────────────╯
  ),
 
- [LAYER_LOWER] = LAYOUT_charybdis_3x6(
+ [LAYER_LOWER] = LAYOUT(
  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
  XXXXXXX, RGB_TOG, KC_MNXT, KC_MPLY, KC_MPRV, XXXXXXX, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, XXXXXXX,
  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // ╰───────────────────────────╯ ╰──────────────────╯
  ),
 
- [LAYER_RAISE] = LAYOUT_charybdis_3x6(
+ [LAYER_RAISE] = LAYOUT(
  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX,
  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // ╰───────────────────────────╯ ╰──────────────────╯
  ),
 
- [LAYER_POINTER] = LAYOUT_charybdis_3x6(
+ [LAYER_POINTER] = LAYOUT(
  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤

diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.h b/keyboards/bastardkb/charybdis/4x6/4x6.h
@@ -21,7 +21,7 @@
 #include "charybdis.h"
 
 // clang-format off
-#define LAYOUT_charybdis_4x6( \
+#define LAYOUT(  \
  k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
  k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
  k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \

diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json
@@ -5,8 +5,11 @@
  "pid": "0x1833",
  "vid": "0xA8F8"
  },
+ "layout_aliases": {
+ "LAYOUT_charybdis_4x6": "LAYOUT"
+ },
  "layouts": {
- "LAYOUT_charybdis_4x6": {
+ "LAYOUT": {
  "layout": [
  { "label": "L00", "x": 0, "y": 0 },
  { "label": "L01", "x": 1, "y": 0 },

diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum charybdis_keymap_layers {
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [LAYER_BASE] = LAYOUT_charybdis_4x6(
+ [LAYER_BASE] = LAYOUT(
  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
  KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // ╰───────────────────────────╯ ╰──────────────────╯
  ),
 
- [LAYER_LOWER] = LAYOUT_charybdis_4x6(
+ [LAYER_LOWER] = LAYOUT(
  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
  KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS,
  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // ╰───────────────────────────╯ ╰──────────────────╯
  ),
 
- [LAYER_RAISE] = LAYOUT_charybdis_4x6(
+ [LAYER_RAISE] = LAYOUT(
  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
  KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤