Updating/fixing configuration

- Had to fix the swoop rules.mk
- Update the common RGBMatrix Config
This commit is contained in:
Victor 2024-04-23 19:46:37 -05:00
parent cc59e08fd6
commit 0e317305c3
Failed to generate hash of commit
3 changed files with 16 additions and 13 deletions

View file

@ -1,5 +1,5 @@
# override userspace defaults # override userspace defaults
RGB_MATRIX_ENABLE = ws2812 RGB_MATRIX_ENABLE = yes
OLED_ENABLE = yes OLED_ENABLE = yes
# override keyboard defaults # override keyboard defaults
@ -7,3 +7,4 @@ OLED_ENABLE = yes
ENCODER_ENABLE = yes ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes ENCODER_MAP_ENABLE = yes
CONVERT_TO = blok CONVERT_TO = blok
RGB_MATRIX_DRIVER = ws2812

View file

@ -17,14 +17,14 @@ Explore These
//Clear variables we plan to use that might be set elsewhere //Clear variables we plan to use that might be set elsewhere
#undef RGB_DISABLE_WHEN_USB_SUSPENDED #undef RGB_MATRIX_SLEEP
#undef RGB_MATRIX_DEFAULT_HUE #undef RGB_MATRIX_DEFAULT_HUE
#undef RGB_MATRIX_DEFAULT_SAT #undef RGB_MATRIX_DEFAULT_SAT
#undef RGB_MATRIX_DEFAULT_VAL #undef RGB_MATRIX_DEFAULT_VAL
#undef RGB_MATRIX_DEFAULT_SPD #undef RGB_MATRIX_DEFAULT_SPD
#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
#undef RGB_MATRIX_FRAMEBUFFER_EFFECTS //#undef RGB_MATRIX_FRAMEBUFFER_EFFECTS
#undef RGB_MATRIX_KEYPRESSES //#undef RGB_MATRIX_KEYPRESSES
#undef RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS #undef RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS
#undef RGB_MATRIX_TYPING_HEATMAP_SPREAD #undef RGB_MATRIX_TYPING_HEATMAP_SPREAD
#undef RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT #undef RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT
@ -56,6 +56,7 @@ Explore These
#undef ENABLE_RGB_MATRIX_DUAL_BEACON #undef ENABLE_RGB_MATRIX_DUAL_BEACON
#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
#undef ENABLE_RGB_MATRIX_FLOWER_BLOOMING
#undef ENABLE_RGB_MATRIX_RAINDROPS #undef ENABLE_RGB_MATRIX_RAINDROPS
#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
#undef ENABLE_RGB_MATRIX_HUE_BREATHING #undef ENABLE_RGB_MATRIX_HUE_BREATHING
@ -64,6 +65,10 @@ Explore These
#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
#undef ENABLE_RGB_MATRIX_PIXEL_FLOW #undef ENABLE_RGB_MATRIX_PIXEL_FLOW
#undef ENABLE_RGB_MATRIX_PIXEL_RAIN #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
#undef ENABLE_RGB_MATRIX_STARLIGHT
#undef ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
#undef ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT
#undef ENABLE_RGB_MATRIX_RIVERFLOW
//These modes also require the RGB_MATRIX_FRAMEBUFFER_EFFECTS define to be available. //These modes also require the RGB_MATRIX_FRAMEBUFFER_EFFECTS define to be available.
#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
@ -89,8 +94,8 @@ Explore These
//Set common configuration for all keyboards //Set common configuration for all keyboards
#define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_SLEEP
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS //#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_DEFAULT_HUE 4 #define RGB_MATRIX_DEFAULT_HUE 4
#define RGB_MATRIX_DEFAULT_SAT 79 #define RGB_MATRIX_DEFAULT_SAT 79
@ -100,8 +105,9 @@ Explore These
//Set per keyboard configuration //Set per keyboard configuration
#if defined(KEYBOARD_bastardkb_charybdis_3x5) || defined(KEYBOARD_dztech_dz60rgb_v2_1) || defined(KEYBOARD_bluebell_swoop) #if defined(KEYBOARD_bastardkb_charybdis_3x5) || defined(KEYBOARD_dztech_dz60rgb_v2_1) || defined(KEYBOARD_bluebell_swoop)
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS //# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGB_MATRIX_KEYPRESSES //# define RGB_MATRIX_KEYPRESSES
//no extra defines required //no extra defines required
# define ENABLE_RGB_MATRIX_BREATHING # define ENABLE_RGB_MATRIX_BREATHING
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL

View file

@ -52,10 +52,6 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
SRC += features/rgbmatrix.c SRC += features/rgbmatrix.c
endif endif
ifeq ($(strip $(RGB_MATRIX_ENABLE)), ws2812)
SRC += features/rgbmatrix.c
endif
ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
SRC += features/mouse.c SRC += features/mouse.c
endif endif