diff options
| author | fauxpark <fauxpark@gmail.com> | 2023-01-30 18:55:36 +1100 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2023-01-30 18:55:36 +1100 |
| commit | ef6505ad7547f9651bddc309bd323d029d1fac64 (patch) | |
| tree | 9e7ece9bbba2123ca04c6f2e76feb774eb6fb38b /keyboards/bastardkb/charybdis/3x5/keymaps/bstiq | |
| parent | 242b80c63ffff022172755da35fb4767d5f837c2 (diff) | |
| parent | 2c878b1b161ae10332fdc4d69f3d1f86d2726c5c (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/bastardkb/charybdis/3x5/keymaps/bstiq')
| -rw-r--r-- | keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h | 4 | ||||
| -rw-r--r-- | keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h index 0d11c53e88..0a2db20561 100644 --- 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 index 2664b531a2..8f02227c01 100644 --- 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( |