sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into develop

Browse Source
This commit is contained in:
fauxpark
2023-01-30 18:55:36 +11:00
parent 242b80c63f 2c878b1b16
commit ef6505ad75
54 changed files with 1313 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
View File

@@ -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
keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
View File

@@ -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(