Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix starlight RGB animation to observe rgb on/off state & indicators #23855

Closed
wants to merge 1 commit into from
Closed

Fix starlight RGB animation to observe rgb on/off state & indicators #23855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions quantum/rgb_matrix/animations/starlight_anim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ RGB_MATRIX_EFFECT(STARLIGHT)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS

void set_starlight_color(int 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);
HSV hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
Expand All @@ -11,20 +12,19 @@ void set_starlight_color(int i, effect_params_t* params) {
}

bool STARLIGHT(effect_params_t* params) {
RGB_MATRIX_USE_LIMITS(led_min, led_max);
if (!params->init) {
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
int rand_led = rand() % RGB_MATRIX_LED_COUNT;
set_starlight_color(rand_led, params);
}
return false;
}

RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (int i = led_min; i < led_max; i++) {
set_starlight_color(i, params);
} else {
for (int i = led_min; i < led_max; i++) {
set_starlight_color(i, params);
}
}
return rgb_matrix_check_finished_leds(led_max);
}

# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT
#endif // ENABLE_RGB_MATRIX_STARLIGHT
14 changes: 7 additions & 7 deletions quantum/rgb_matrix/animations/starlight_dual_hue_anim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ RGB_MATRIX_EFFECT(STARLIGHT_DUAL_HUE)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS

void set_starlight_dual_hue_color(int 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);
HSV hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
Expand All @@ -12,20 +13,19 @@ void set_starlight_dual_hue_color(int i, effect_params_t* params) {
}

bool STARLIGHT_DUAL_HUE(effect_params_t* params) {
RGB_MATRIX_USE_LIMITS(led_min, led_max);
if (!params->init) {
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
int rand_led = rand() % RGB_MATRIX_LED_COUNT;
set_starlight_dual_hue_color(rand_led, params);
}
return false;
}

RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (int i = led_min; i < led_max; i++) {
set_starlight_dual_hue_color(i, params);
} else {
for (int i = led_min; i < led_max; i++) {
set_starlight_dual_hue_color(i, params);
}
}
return rgb_matrix_check_finished_leds(led_max);
}

# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
14 changes: 7 additions & 7 deletions quantum/rgb_matrix/animations/starlight_dual_sat_anim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ RGB_MATRIX_EFFECT(STARLIGHT_DUAL_SAT)
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS

void set_starlight_dual_sat_color(int 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);
HSV hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
Expand All @@ -12,20 +13,19 @@ void set_starlight_dual_sat_color(int i, effect_params_t* params) {
}

bool STARLIGHT_DUAL_SAT(effect_params_t* params) {
RGB_MATRIX_USE_LIMITS(led_min, led_max);
if (!params->init) {
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
int rand_led = rand() % RGB_MATRIX_LED_COUNT;
set_starlight_dual_sat_color(rand_led, params);
}
return false;
}

RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (int i = led_min; i < led_max; i++) {
set_starlight_dual_sat_color(i, params);
} else {
for (int i = led_min; i < led_max; i++) {
set_starlight_dual_sat_color(i, params);
}
}
return rgb_matrix_check_finished_leds(led_max);
}

# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT
Loading