Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
489c5ff4a2
3 changed files with 45 additions and 45 deletions
|
@ -71,47 +71,47 @@
|
||||||
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
|
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
|
||||||
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||||
|
|
||||||
#define RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue
|
#define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue
|
||||||
#define RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes
|
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes
|
||||||
#define RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right, speed controls how much gradient changes
|
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right, speed controls how much gradient changes
|
||||||
#define RGB_MATRIX_BREATHING // Single hue brightness cycling animation
|
#define ENABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation
|
||||||
#define RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right
|
#define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right
|
||||||
#define RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right
|
#define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right
|
||||||
#define RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation
|
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation
|
||||||
#define RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness
|
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness
|
||||||
#define RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation
|
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation
|
||||||
#define RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness
|
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness
|
||||||
#define RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient
|
#define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient
|
||||||
#define RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right
|
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right
|
||||||
#define RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom
|
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom
|
||||||
#define RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in
|
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in
|
||||||
#define RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in
|
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in
|
||||||
#define RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right
|
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right
|
||||||
#define RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard
|
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard
|
||||||
#define RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard
|
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard
|
||||||
#define RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard
|
#define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard
|
||||||
#define RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
|
#define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
|
||||||
#define RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard
|
#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard
|
||||||
#define RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue
|
#define ENABLE_RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue
|
||||||
#define RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation
|
#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation
|
||||||
#define RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back
|
#define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back
|
||||||
#define RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left
|
#define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left
|
||||||
#define RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right
|
#define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right
|
||||||
#define RGB_MATRIX_PIXEL_FRACTAL // Single hue fractal filled keys pulsing horizontally out to edges
|
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // Single hue fractal filled keys pulsing horizontally out to edges
|
||||||
#define RGB_MATRIX_PIXEL_RAIN // Randomly light keys with random hues
|
#define ENABLE_RGB_MATRIX_PIXEL_RAIN // Randomly light keys with random hues
|
||||||
#define RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
|
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
|
||||||
#define RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation
|
#define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation
|
||||||
#define RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out
|
||||||
#define RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue
|
||||||
#define RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out
|
||||||
#define RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out
|
||||||
#define RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out
|
||||||
#define RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
|
||||||
#define RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out
|
||||||
#define RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
|
||||||
#define RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out
|
#define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out
|
||||||
#define RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
|
#define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
|
||||||
#define RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
|
#define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
|
||||||
#define RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
|
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
|
||||||
|
|
||||||
#endif
|
#endif
|
|
@ -1,4 +1,3 @@
|
||||||
VIA_ENABLE = yes
|
VIA_ENABLE = yes
|
||||||
LTO_ENABLE = yes
|
|
||||||
|
|
||||||
SRC += encoder_actions.c
|
SRC += encoder_actions.c
|
|
@ -15,8 +15,9 @@ COMMAND_ENABLE = no # Commands for debug and configuration
|
||||||
NKRO_ENABLE = yes # Enable N-Key Rollover
|
NKRO_ENABLE = yes # Enable N-Key Rollover
|
||||||
BACKLIGHT_ENABLE = no # Keyboard backlight functionality
|
BACKLIGHT_ENABLE = no # Keyboard backlight functionality
|
||||||
RGBLIGHT_ENABLE = no # Keyboard RGB underglow
|
RGBLIGHT_ENABLE = no # Keyboard RGB underglow
|
||||||
RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects
|
|
||||||
RGB_MATRIX_DRIVER = WS2812
|
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
|
RGB_MATRIX_ENABLE = yes
|
||||||
|
RGB_MATRIX_DRIVER = WS2812
|
||||||
|
LTO_ENABLE = yes
|
||||||
DYNAMIC_MACRO_ENABLE = yes
|
DYNAMIC_MACRO_ENABLE = yes
|
||||||
ENCODER_ENABLE = yes
|
ENCODER_ENABLE = yes
|
Loading…
Reference in a new issue