diff options
| -rw-r--r-- | quantum/rgb_matrix_animations/hue_breathing_anim.h | 44 | ||||
| -rw-r--r-- | quantum/rgb_matrix_animations/hue_pendulum_anim.h | 34 | ||||
| -rw-r--r-- | quantum/rgb_matrix_animations/hue_wave_anim.h | 34 | 
3 files changed, 56 insertions, 56 deletions
| diff --git a/quantum/rgb_matrix_animations/hue_breathing_anim.h b/quantum/rgb_matrix_animations/hue_breathing_anim.h index 37a6293c70..54dea958af 100644 --- a/quantum/rgb_matrix_animations/hue_breathing_anim.h +++ b/quantum/rgb_matrix_animations/hue_breathing_anim.h @@ -1,22 +1,22 @@ -#ifndef DISABLE_RGB_MATRIX_HUE_BREATHING
 -RGB_MATRIX_EFFECT(HUE_BREATHING)
 -#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 -
 -// Change huedelta to adjust range of hue change. 0-255.
 -// Hue Breathing - All LED's light up
 -bool HUE_BREATHING(effect_params_t* params) {
 -    RGB_MATRIX_USE_LIMITS(led_min, led_max);
 -    uint8_t  huedelta = 12;
 -    HSV      hsv      = rgb_matrix_config.hsv;
 -    uint16_t time     = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
 -    hsv.h             = hsv.h + scale8(abs8(sin8(time) - 128) * 2, huedelta);
 -    RGB rgb           = hsv_to_rgb(hsv);
 -    for (uint8_t i = led_min; i < led_max; i++) {
 -        RGB_MATRIX_TEST_LED_FLAGS();
 -        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
 -    }
 -    return led_max < DRIVER_LED_TOTAL;
 -}
 -
 -#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 -#endif      // DISABLE_RGB_HUE_BREATHING
 +#ifndef DISABLE_RGB_MATRIX_HUE_BREATHING +RGB_MATRIX_EFFECT(HUE_BREATHING) +#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS + +// Change huedelta to adjust range of hue change. 0-255. +// Hue Breathing - All LED's light up +bool HUE_BREATHING(effect_params_t* params) { +    RGB_MATRIX_USE_LIMITS(led_min, led_max); +    uint8_t  huedelta = 12; +    HSV      hsv      = rgb_matrix_config.hsv; +    uint16_t time     = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8); +    hsv.h             = hsv.h + scale8(abs8(sin8(time) - 128) * 2, huedelta); +    RGB rgb           = hsv_to_rgb(hsv); +    for (uint8_t i = led_min; i < led_max; i++) { +        RGB_MATRIX_TEST_LED_FLAGS(); +        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); +    } +    return led_max < DRIVER_LED_TOTAL; +} + +#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS +#endif      // DISABLE_RGB_HUE_BREATHING diff --git a/quantum/rgb_matrix_animations/hue_pendulum_anim.h b/quantum/rgb_matrix_animations/hue_pendulum_anim.h index 37db649c18..2d8d36174f 100644 --- a/quantum/rgb_matrix_animations/hue_pendulum_anim.h +++ b/quantum/rgb_matrix_animations/hue_pendulum_anim.h @@ -1,17 +1,17 @@ -#ifndef DISABLE_RGB_MATRIX_HUE_PENDULUM
 -RGB_MATRIX_EFFECT(HUE_PENDULUM)
 -#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 -
 -// Change huedelta to adjust range of hue change. 0-255.
 -// Looks better with a low value and slow speed for subtle change.
 -// Hue Pendulum - color changes in a wave to the right before reversing direction
 -static HSV HUE_PENDULUM_math(HSV hsv, uint8_t i, uint8_t time) {
 -    uint8_t huedelta = 12;
 -    hsv.h            = hsv.h + scale8(abs8(sin8(time) + (g_led_config.point[i].x) - 128) * 2, huedelta);
 -    return hsv;
 -}
 -
 -bool HUE_PENDULUM(effect_params_t* params) { return effect_runner_i(params, &HUE_PENDULUM_math); }
 -
 -#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 -#endif      // DISABLE_RGB_HUE_PENDULUM
 +#ifndef DISABLE_RGB_MATRIX_HUE_PENDULUM +RGB_MATRIX_EFFECT(HUE_PENDULUM) +#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS + +// Change huedelta to adjust range of hue change. 0-255. +// Looks better with a low value and slow speed for subtle change. +// Hue Pendulum - color changes in a wave to the right before reversing direction +static HSV HUE_PENDULUM_math(HSV hsv, uint8_t i, uint8_t time) { +    uint8_t huedelta = 12; +    hsv.h            = hsv.h + scale8(abs8(sin8(time) + (g_led_config.point[i].x) - 128) * 2, huedelta); +    return hsv; +} + +bool HUE_PENDULUM(effect_params_t* params) { return effect_runner_i(params, &HUE_PENDULUM_math); } + +#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS +#endif      // DISABLE_RGB_HUE_PENDULUM diff --git a/quantum/rgb_matrix_animations/hue_wave_anim.h b/quantum/rgb_matrix_animations/hue_wave_anim.h index 1d4af5af43..fd9026fc90 100644 --- a/quantum/rgb_matrix_animations/hue_wave_anim.h +++ b/quantum/rgb_matrix_animations/hue_wave_anim.h @@ -1,17 +1,17 @@ -#ifndef DISABLE_RGB_MATRIX_HUE_WAVE
 -RGB_MATRIX_EFFECT(HUE_WAVE)
 -#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 -
 -// Change huedelta to adjust range of hue change. 0-255.
 -// Looks better with a low value and slow speed for subtle change.
 -// Hue Wave - color changes in a wave to the right
 -static HSV HUE_WAVE_math(HSV hsv, uint8_t i, uint8_t time) {
 -    uint8_t huedelta = 24;
 -    hsv.h            = hsv.h + scale8(abs8(g_led_config.point[i].x - time), huedelta);
 -    return hsv;
 -}
 -
 -bool HUE_WAVE(effect_params_t* params) { return effect_runner_i(params, &HUE_WAVE_math); }
 -
 -#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 -#endif      // DISABLE_RGB_HUE_WAVE
 +#ifndef DISABLE_RGB_MATRIX_HUE_WAVE +RGB_MATRIX_EFFECT(HUE_WAVE) +#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS + +// Change huedelta to adjust range of hue change. 0-255. +// Looks better with a low value and slow speed for subtle change. +// Hue Wave - color changes in a wave to the right +static HSV HUE_WAVE_math(HSV hsv, uint8_t i, uint8_t time) { +    uint8_t huedelta = 24; +    hsv.h            = hsv.h + scale8(abs8(g_led_config.point[i].x - time), huedelta); +    return hsv; +} + +bool HUE_WAVE(effect_params_t* params) { return effect_runner_i(params, &HUE_WAVE_math); } + +#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS +#endif      // DISABLE_RGB_HUE_WAVE | 
