Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename LAYOUT macros identifier that contained the keyboard name #19657

Merged
merged 5 commits into from
Jan 26, 2023
Merged

Rename LAYOUT macros identifier that contained the keyboard name #19657

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0686e6
Renamed `LAYOUT` macros that contained the keyboard name
0xcharly Jan 22, 2023
63113a4
Address PR comments
0xcharly Jan 22, 2023
eee8221
Add unused `LAYOUT_charybdis_3x6` alias
0xcharly Jan 22, 2023
ea20de9
Add missing `layout_aliases` in the `info.json` files
0xcharly Jan 24, 2023
dafdd7f
Apply suggestions from code review
zvecr Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion keyboards/bastardkb/charybdis/3x5/3x5.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand All @@ -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

zvecr marked this conversation as resolved.
Show resolved Hide resolved
/**
* \brief Compatibility layout with the split_3x5_3 community layout.
*
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"vid": "0xA8F8"
},
"layouts": {
0xcharly marked this conversation as resolved.
Show resolved Hide resolved
"LAYOUT_charybdis_3x5": {
"LAYOUT": {
"layout": [
{ "label": "L00", "x": 0, "y": 0 },
{ "label": "L01", "x": 1, "y": 0 },
Expand Down
4 changes: 4 additions & 0 deletions keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
// ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
Expand All @@ -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,
// ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
Expand All @@ -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,
// ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
9 changes: 8 additions & 1 deletion keyboards/bastardkb/charybdis/3x6/3x6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "charybdis.h"

// clang-format off
#define LAYOUT_charybdis_3x6( \
#define LAYOUT( \
0xcharly marked this conversation as resolved.
Show resolved Hide resolved
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, \
Expand All @@ -37,6 +37,13 @@
{ KC_NO, k71, KC_NO, k73, KC_NO, KC_NO }, \
}

/**
* Alias for backward compatibility with some keymaps.
*
* Prefer using `LAYOUT` for new keymaps.
*/
#define LAYOUT_charybdis_3x6 LAYOUT

zvecr marked this conversation as resolved.
Show resolved Hide resolved
/**
* \brief Compatibility layout with the split_3x5_6 community layout.
*
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x6/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"pid": "0x1834"
},
"layouts": {
"LAYOUT_charybdis_3x6": {
"LAYOUT": {
"layout": [
{ "label": "L00", "x": 0, "y": 0 },
{ "label": "L01", "x": 1, "y": 0 },
Expand Down
6 changes: 3 additions & 3 deletions keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
Expand All @@ -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,
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
Expand All @@ -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,
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
Expand Down
8 changes: 4 additions & 4 deletions keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
Expand All @@ -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,
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
Expand All @@ -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,
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
Expand All @@ -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,
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
Expand Down
9 changes: 8 additions & 1 deletion keyboards/bastardkb/charybdis/4x6/4x6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand All @@ -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
zvecr marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/4x6/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"vid": "0xA8F8"
},
"layouts": {
"LAYOUT_charybdis_4x6": {
"LAYOUT": {
"layout": [
{ "label": "L00", "x": 0, "y": 0 },
{ "label": "L01", "x": 1, "y": 0 },
Expand Down
6 changes: 3 additions & 3 deletions keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
Expand All @@ -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,
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
Expand All @@ -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,
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
Expand Down
Loading