mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-07-17 13:12:08 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
8531ab7619
@ -4,6 +4,7 @@ RGB_MATRIX_EFFECT(SOLID_REACTIVE)
|
|||||||
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
|
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
|
||||||
|
|
||||||
static hsv_t SOLID_REACTIVE_math(hsv_t hsv, uint16_t offset) {
|
static hsv_t SOLID_REACTIVE_math(hsv_t hsv, uint16_t offset) {
|
||||||
|
if (offset > 255) offset = 255;
|
||||||
# ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
|
# ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
|
||||||
hsv.h = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 8) >> 4);
|
hsv.h = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 8) >> 4);
|
||||||
# endif
|
# endif
|
||||||
|
@ -4,6 +4,7 @@ RGB_MATRIX_EFFECT(SOLID_REACTIVE_SIMPLE)
|
|||||||
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
|
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
|
||||||
|
|
||||||
static hsv_t SOLID_REACTIVE_SIMPLE_math(hsv_t hsv, uint16_t offset) {
|
static hsv_t SOLID_REACTIVE_SIMPLE_math(hsv_t hsv, uint16_t offset) {
|
||||||
|
if (offset > 255) offset = 255;
|
||||||
# ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
|
# ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
|
||||||
hsv.h = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 8) >> 4);
|
hsv.h = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 8) >> 4);
|
||||||
# endif
|
# endif
|
||||||
|
Loading…
Reference in New Issue
Block a user