Refactor starlight RGB matrix effects (#24202)
* Use unsigned integers * Use lib8tion random8 function * Test for valid LED flags * Use rgb_matrix_hsv_to_rgb function
This commit is contained in:
parent
91f293d0c7
commit
822a4580f4
3 changed files with 17 additions and 14 deletions
|
@ -2,25 +2,26 @@
|
|||
RGB_MATRIX_EFFECT(STARLIGHT)
|
||||
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
|
||||
|
||||
void set_starlight_color(int i, effect_params_t* params) {
|
||||
void set_starlight_color(uint8_t 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);
|
||||
RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
|
||||
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
|
||||
}
|
||||
|
||||
bool STARLIGHT(effect_params_t* params) {
|
||||
if (!params->init) {
|
||||
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
|
||||
int rand_led = rand() % RGB_MATRIX_LED_COUNT;
|
||||
uint8_t rand_led = random8_max(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++) {
|
||||
for (uint8_t i = led_min; i < led_max; i++) {
|
||||
RGB_MATRIX_TEST_LED_FLAGS();
|
||||
set_starlight_color(i, params);
|
||||
}
|
||||
return rgb_matrix_check_finished_leds(led_max);
|
||||
|
|
|
@ -2,26 +2,27 @@
|
|||
RGB_MATRIX_EFFECT(STARLIGHT_DUAL_HUE)
|
||||
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
|
||||
|
||||
void set_starlight_dual_hue_color(int i, effect_params_t* params) {
|
||||
void set_starlight_dual_hue_color(uint8_t 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.h = hsv.h + random8_max((30 + 1 - -30) + -30);
|
||||
RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
|
||||
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
|
||||
}
|
||||
|
||||
bool STARLIGHT_DUAL_HUE(effect_params_t* params) {
|
||||
if (!params->init) {
|
||||
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
|
||||
int rand_led = rand() % RGB_MATRIX_LED_COUNT;
|
||||
uint8_t rand_led = random8_max(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++) {
|
||||
for (uint8_t i = led_min; i < led_max; i++) {
|
||||
RGB_MATRIX_TEST_LED_FLAGS();
|
||||
set_starlight_dual_hue_color(i, params);
|
||||
}
|
||||
return rgb_matrix_check_finished_leds(led_max);
|
||||
|
|
|
@ -2,26 +2,27 @@
|
|||
RGB_MATRIX_EFFECT(STARLIGHT_DUAL_SAT)
|
||||
# ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
|
||||
|
||||
void set_starlight_dual_sat_color(int i, effect_params_t* params) {
|
||||
void set_starlight_dual_sat_color(uint8_t 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.s = hsv.s + random8_max((30 + 1 - -30) + -30);
|
||||
RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
|
||||
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
|
||||
}
|
||||
|
||||
bool STARLIGHT_DUAL_SAT(effect_params_t* params) {
|
||||
if (!params->init) {
|
||||
if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
|
||||
int rand_led = rand() % RGB_MATRIX_LED_COUNT;
|
||||
uint8_t rand_led = random8_max(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++) {
|
||||
for (uint8_t i = led_min; i < led_max; i++) {
|
||||
RGB_MATRIX_TEST_LED_FLAGS();
|
||||
set_starlight_dual_sat_color(i, params);
|
||||
}
|
||||
return rgb_matrix_check_finished_leds(led_max);
|
||||
|
|
Loading…
Reference in a new issue