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.

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

New RGB Animations - 4 "Starlight" Animation Variations #22212

Merged
merged 10 commits into from
Nov 26, 2023
Prev Previous commit
Next Next commit
clang-format
feat: starlight rgb animations
  • Loading branch information
hbbit-dev committed Oct 6, 2023
commit ce0f8ca010ae133b879b040edf34f93bc32e1b01
152 changes: 0 additions & 152 deletions keyboards/moonlander/config.h

This file was deleted.

73 changes: 0 additions & 73 deletions keyboards/moonlander/keymaps/default/keymap.c

This file was deleted.

12 changes: 6 additions & 6 deletions quantum/rgb_matrix/animations/starlight_anim.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#ifdef ENABLE_RGB_MATRIX_STARLIGHT
RGB_MATRIX_EFFECT(STARLIGHT)
#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS

void set_starlight_color(int i, effect_params_t* params) {
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);
RGB rgb = hsv_to_rgb(hsv);
HSV hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
RGB rgb = hsv_to_rgb(hsv);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}

Expand All @@ -26,5 +26,5 @@ bool STARLIGHT(effect_params_t* params) {
return rgb_matrix_check_finished_leds(led_max);
}

#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT
14 changes: 7 additions & 7 deletions quantum/rgb_matrix/animations/starlight_dual_hue_anim.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#ifdef ENABLE_RGB_MATRIX_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(int i, effect_params_t* params) {
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);
hsv.h = hsv.h + (rand() % (30 + 1 - -30) + -30);
RGB rgb = hsv_to_rgb(hsv);
HSV hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
hsv.h = hsv.h + (rand() % (30 + 1 - -30) + -30);
RGB rgb = hsv_to_rgb(hsv);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}

Expand All @@ -27,5 +27,5 @@ bool STARLIGHT_DUAL_HUE(effect_params_t* params) {
return rgb_matrix_check_finished_leds(led_max);
}

#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
13 changes: 6 additions & 7 deletions quantum/rgb_matrix/animations/starlight_dual_sat_anim.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ RGB_MATRIX_EFFECT(STARLIGHT_DUAL_SAT)

void set_starlight_dual_sat_color(int i, effect_params_t* params) {
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);
hsv.s = hsv.s + (rand() % (30 + 1 - -30) + -30);
RGB rgb = hsv_to_rgb(hsv);
HSV hsv = rgb_matrix_config.hsv;
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
hsv.s = hsv.s + (rand() % (30 + 1 - -30) + -30);
RGB rgb = hsv_to_rgb(hsv);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}

Expand All @@ -27,6 +27,5 @@ bool STARLIGHT_DUAL_SAT(effect_params_t* params) {
return rgb_matrix_check_finished_leds(led_max);
}


# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT
14 changes: 7 additions & 7 deletions quantum/rgb_matrix/animations/starlight_smooth_anim.h
hbbit-dev marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#ifdef ENABLE_RGB_MATRIX_STARLIGHT_SMOOTH
RGB_MATRIX_EFFECT(STAR_LIGHT_SMOOTH)
#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS

//inspired by @PleasureTek's Massdrop Alt LED animation
// inspired by @PleasureTek's Massdrop Alt LED animation

bool STAR_LIGHT_SMOOTH(effect_params_t* params) {
RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (uint8_t i = led_min; i < led_max; i++) {
HSV hsv = rgb_matrix_config.hsv;
HSV hsv = rgb_matrix_config.hsv;
uint16_t time = scale16by8(g_rgb_timer + (i * 315), rgb_matrix_config.speed / 8);
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
RGB_MATRIX_TEST_LED_FLAGS();
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}

return rgb_matrix_check_finished_leds(led_max);
}

#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_SMOOTH
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#endif // ENABLE_RGB_MATRIX_STARLIGHT_SMOOTH