gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-22 03:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Starlight matrix effects

Browse Source 
* Improved effect to update LED index within led_min and led_max limits
* Check for LED flags
This commit is contained in:
フィルターペーパー 2024-10-25 09:16:00 +08:00
parent d316331ab1
commit a40a6c5a7d
3 changed files with 56 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
quantum/rgb_matrix/animations/starlight_anim.h
View File

@ -2,7 +2,9 @@
RGB_MATRIX_EFFECT(STARLIGHT) RGB_MATRIX_EFFECT(STARLIGHT)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
void set_starlight_color(uint8_t i, effect_params_t* params) { static void set_starlight_color(uint8_t i, effect_params_t* params) {
if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8); uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
hsv_t hsv = rgb_matrix_config.hsv; hsv_t hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v); hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
@ -11,21 +13,26 @@ void set_starlight_color(uint8_t i, effect_params_t* params) {
} }
bool STARLIGHT(effect_params_t* params) { bool STARLIGHT(effect_params_t* params) {
if (!params->init) { static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
uint8_t rand_led = random8_max(RGB_MATRIX_LED_COUNT); // Periodic trigger for LED change
set_starlight_color(rand_led, params); if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0)) {
} index = random8_max(RGB_MATRIX_LED_COUNT);
return false;
} }
RGB_MATRIX_USE_LIMITS(led_min, led_max); RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (uint8_t i = led_min; i < led_max; i++) { if (params->init) {
RGB_MATRIX_TEST_LED_FLAGS(); for (uint8_t i = led_min; i < led_max; i++) {
set_starlight_color(i, params); set_starlight_color(i, params);
}
}
// Change LED once and set index out of range till next trigger
else if (led_min <= index && index < led_max) {
set_starlight_color(index, params);
index = RGB_MATRIX_LED_COUNT + 1;
} }
return rgb_matrix_check_finished_leds(led_max); return rgb_matrix_check_finished_leds(led_max);
} }
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT #endif // ENABLE_RGB_MATRIX_STARLIGHT

31
quantum/rgb_matrix/animations/starlight_dual_hue_anim.h
View File

@ -2,31 +2,38 @@
RGB_MATRIX_EFFECT(STARLIGHT_DUAL_HUE) RGB_MATRIX_EFFECT(STARLIGHT_DUAL_HUE)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
void set_starlight_dual_hue_color(uint8_t i, effect_params_t* params) { static void set_starlight_dual_hue_color(uint8_t i, effect_params_t* params) {
if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8); uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
hsv_t hsv = rgb_matrix_config.hsv; hsv_t hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v); hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
hsv.h = hsv.h + random8_max((30 + 1 - -30) + -30); hsv.h = hsv.h + random8_max(31);
rgb_t rgb = 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); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
} }
bool STARLIGHT_DUAL_HUE(effect_params_t* params) { bool STARLIGHT_DUAL_HUE(effect_params_t* params) {
if (!params->init) { static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
uint8_t rand_led = random8_max(RGB_MATRIX_LED_COUNT); // Periodic trigger for LED change
set_starlight_dual_hue_color(rand_led, params); if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0)) {
} index = random8_max(RGB_MATRIX_LED_COUNT);
return false;
} }
RGB_MATRIX_USE_LIMITS(led_min, led_max); RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (uint8_t i = led_min; i < led_max; i++) { if (params->init) {
RGB_MATRIX_TEST_LED_FLAGS(); for (uint8_t i = led_min; i < led_max; i++) {
set_starlight_dual_hue_color(i, params); set_starlight_dual_hue_color(i, params);
}
}
// Change LED once and set index out of range till next trigger
else if (led_min <= index && index < led_max) {
set_starlight_dual_hue_color(index, params);
index = RGB_MATRIX_LED_COUNT + 1;
} }
return rgb_matrix_check_finished_leds(led_max); return rgb_matrix_check_finished_leds(led_max);
} }
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE #endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE

31
quantum/rgb_matrix/animations/starlight_dual_sat_anim.h
View File

@ -2,31 +2,38 @@
RGB_MATRIX_EFFECT(STARLIGHT_DUAL_SAT) RGB_MATRIX_EFFECT(STARLIGHT_DUAL_SAT)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
void set_starlight_dual_sat_color(uint8_t i, effect_params_t* params) { static void set_starlight_dual_sat_color(uint8_t i, effect_params_t* params) {
if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8); uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
hsv_t hsv = rgb_matrix_config.hsv; hsv_t hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v); hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
hsv.s = hsv.s + random8_max((30 + 1 - -30) + -30); hsv.s = hsv.s + random8_max(31);
rgb_t rgb = 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); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
} }
bool STARLIGHT_DUAL_SAT(effect_params_t* params) { bool STARLIGHT_DUAL_SAT(effect_params_t* params) {
if (!params->init) { static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
uint8_t rand_led = random8_max(RGB_MATRIX_LED_COUNT); // Periodic trigger for LED change
set_starlight_dual_sat_color(rand_led, params); if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0)) {
} index = random8_max(RGB_MATRIX_LED_COUNT);
return false;
} }
RGB_MATRIX_USE_LIMITS(led_min, led_max); RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (uint8_t i = led_min; i < led_max; i++) { if (params->init) {
RGB_MATRIX_TEST_LED_FLAGS(); for (uint8_t i = led_min; i < led_max; i++) {
set_starlight_dual_sat_color(i, params); set_starlight_dual_sat_color(i, params);
}
}
// Change LED once and set index out of range till next trigger
else if (led_min <= index && index < led_max) {
set_starlight_dual_sat_color(index, params);
index = RGB_MATRIX_LED_COUNT + 1;
} }
return rgb_matrix_check_finished_leds(led_max); return rgb_matrix_check_finished_leds(led_max);
} }
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT #endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT