From d1fa591b49da0d817e53d08fc61b1984fa186608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=83=BC=E3=83=9A?= =?UTF-8?q?=E3=83=BC=E3=83=91=E3=83=BC?= <76888457+filterpaper@users.noreply.github.com> Date: Sat, 26 Oct 2024 19:53:44 +0800 Subject: [PATCH 1/2] Update Raindrops effect to respect LED range limits Improved effect to update LED index within `led_min` and `led_max` limits --- .../rgb_matrix/animations/raindrops_anim.h | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/quantum/rgb_matrix/animations/raindrops_anim.h b/quantum/rgb_matrix/animations/raindrops_anim.h index a682156da24..d5ba9d3637f 100644 --- a/quantum/rgb_matrix/animations/raindrops_anim.h +++ b/quantum/rgb_matrix/animations/raindrops_anim.h @@ -2,35 +2,40 @@ RGB_MATRIX_EFFECT(RAINDROPS) # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS -static void raindrops_set_color(int i, effect_params_t* params) { - if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return; - hsv_t hsv = {0, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v}; - +static rgb_t raindrops_set_color(hsv_t hsv) { // Take the shortest path between hues - int16_t deltaH = ((rgb_matrix_config.hsv.h + 180) % 360 - rgb_matrix_config.hsv.h) / 4; + int16_t deltaH = ((hsv.h + 180) % 360 - hsv.h) / 4; if (deltaH > 127) { deltaH -= 256; } else if (deltaH < -127) { deltaH += 256; } - hsv.h = rgb_matrix_config.hsv.h + (deltaH * (random8() & 0x03)); - rgb_t rgb = rgb_matrix_hsv_to_rgb(hsv); - rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); + hsv.h += (deltaH * random8_max(3)); + return rgb_matrix_hsv_to_rgb(hsv); } bool RAINDROPS(effect_params_t* params) { + static uint16_t idx = 0; + static rgb_t rgb = {0}; + + if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { + idx = random8_max(RGB_MATRIX_LED_COUNT); + rgb = raindrops_set_color(rgb_matrix_config.hsv); + } + RGB_MATRIX_USE_LIMITS(led_min, led_max); - if (!params->init) { - // Change one LED every tick, make sure speed is not 0 - if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { - raindrops_set_color(random8_max(RGB_MATRIX_LED_COUNT), params); - } - } else { - for (int i = led_min; i < led_max; i++) { - raindrops_set_color(i, params); + if (params->init) { + for (uint8_t i = led_min; i < led_max; i++) { + RGB_MATRIX_TEST_LED_FLAGS(); + rgb = raindrops_set_color(rgb_matrix_config.hsv); + rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } } + // Change one LED every tick + else if (led_min <= idx && idx < led_max && HAS_ANY_FLAGS(g_led_config.flags[idx], params->flags)) { + rgb_matrix_set_color(idx, rgb.r, rgb.g, rgb.b); + } return rgb_matrix_check_finished_leds(led_max); } From 105e83bbe34f96bb18e4b520884bdbfae8fbf22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=83=BC=E3=83=9A?= =?UTF-8?q?=E3=83=BC=E3=83=91=E3=83=BC?= <76888457+filterpaper@users.noreply.github.com> Date: Sun, 27 Oct 2024 18:30:50 +0800 Subject: [PATCH 2/2] Remove static RGB variable Set index out of range after trigger --- .../rgb_matrix/animations/raindrops_anim.h | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/quantum/rgb_matrix/animations/raindrops_anim.h b/quantum/rgb_matrix/animations/raindrops_anim.h index d5ba9d3637f..d4f79adb560 100644 --- a/quantum/rgb_matrix/animations/raindrops_anim.h +++ b/quantum/rgb_matrix/animations/raindrops_anim.h @@ -2,7 +2,10 @@ RGB_MATRIX_EFFECT(RAINDROPS) # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS -static rgb_t raindrops_set_color(hsv_t hsv) { +static void raindrops_set_color(uint8_t i, effect_params_t* params) { + if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return; + hsv_t hsv = rgb_matrix_config.hsv; + // Take the shortest path between hues int16_t deltaH = ((hsv.h + 180) % 360 - hsv.h) / 4; if (deltaH > 127) { @@ -12,29 +15,28 @@ static rgb_t raindrops_set_color(hsv_t hsv) { } hsv.h += (deltaH * random8_max(3)); - return rgb_matrix_hsv_to_rgb(hsv); + rgb_t rgb = rgb_matrix_hsv_to_rgb(hsv); + rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } bool RAINDROPS(effect_params_t* params) { - static uint16_t idx = 0; - static rgb_t rgb = {0}; + static uint16_t index = RGB_MATRIX_LED_COUNT + 1; - if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) { - idx = random8_max(RGB_MATRIX_LED_COUNT); - rgb = raindrops_set_color(rgb_matrix_config.hsv); + // Periodic trigger for LED change + if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0)) { + index = random8_max(RGB_MATRIX_LED_COUNT); } RGB_MATRIX_USE_LIMITS(led_min, led_max); if (params->init) { for (uint8_t i = led_min; i < led_max; i++) { - RGB_MATRIX_TEST_LED_FLAGS(); - rgb = raindrops_set_color(rgb_matrix_config.hsv); - rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); + raindrops_set_color(i, params); } } - // Change one LED every tick - else if (led_min <= idx && idx < led_max && HAS_ANY_FLAGS(g_led_config.flags[idx], params->flags)) { - rgb_matrix_set_color(idx, rgb.r, rgb.g, rgb.b); + // Change LED once and set index out of range till next trigger + else if (led_min <= index && index < led_max) { + raindrops_set_color(index, params); + index = RGB_MATRIX_LED_COUNT + 1; } return rgb_matrix_check_finished_leds(led_max); }