Update Starlight matrix effects (#24521)
This commit is contained in:
		
							parent
							
								
									8157b37438
								
							
						
					
					
						commit
						cf975e2bfa
					
				
					 3 changed files with 56 additions and 35 deletions
				
			
		| 
						 | 
				
			
			@ -2,7 +2,9 @@
 | 
			
		|||
RGB_MATRIX_EFFECT(STARLIGHT)
 | 
			
		||||
#    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);
 | 
			
		||||
    hsv_t    hsv  = rgb_matrix_config.hsv;
 | 
			
		||||
    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) {
 | 
			
		||||
    if (!params->init) {
 | 
			
		||||
        if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
 | 
			
		||||
            uint8_t rand_led = random8_max(RGB_MATRIX_LED_COUNT);
 | 
			
		||||
            set_starlight_color(rand_led, params);
 | 
			
		||||
        }
 | 
			
		||||
        return false;
 | 
			
		||||
    static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
 | 
			
		||||
 | 
			
		||||
    // Periodic trigger for LED change
 | 
			
		||||
    if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0)) {
 | 
			
		||||
        index = random8_max(RGB_MATRIX_LED_COUNT);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    RGB_MATRIX_USE_LIMITS(led_min, led_max);
 | 
			
		||||
    for (uint8_t i = led_min; i < led_max; i++) {
 | 
			
		||||
        RGB_MATRIX_TEST_LED_FLAGS();
 | 
			
		||||
        set_starlight_color(i, params);
 | 
			
		||||
    if (params->init) {
 | 
			
		||||
        for (uint8_t i = led_min; i < led_max; i++) {
 | 
			
		||||
            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);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 | 
			
		||||
#endif     // ENABLE_RGB_MATRIX_STARLIGHT
 | 
			
		||||
#endif     // ENABLE_RGB_MATRIX_STARLIGHT
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,31 +2,38 @@
 | 
			
		|||
RGB_MATRIX_EFFECT(STARLIGHT_DUAL_HUE)
 | 
			
		||||
#    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);
 | 
			
		||||
    hsv_t    hsv  = rgb_matrix_config.hsv;
 | 
			
		||||
    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_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) {
 | 
			
		||||
            uint8_t rand_led = random8_max(RGB_MATRIX_LED_COUNT);
 | 
			
		||||
            set_starlight_dual_hue_color(rand_led, params);
 | 
			
		||||
        }
 | 
			
		||||
        return false;
 | 
			
		||||
    static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
 | 
			
		||||
 | 
			
		||||
    // Periodic trigger for LED change
 | 
			
		||||
    if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0)) {
 | 
			
		||||
        index = random8_max(RGB_MATRIX_LED_COUNT);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    RGB_MATRIX_USE_LIMITS(led_min, led_max);
 | 
			
		||||
    for (uint8_t i = led_min; i < led_max; i++) {
 | 
			
		||||
        RGB_MATRIX_TEST_LED_FLAGS();
 | 
			
		||||
        set_starlight_dual_hue_color(i, params);
 | 
			
		||||
    if (params->init) {
 | 
			
		||||
        for (uint8_t i = led_min; i < led_max; i++) {
 | 
			
		||||
            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);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 | 
			
		||||
#endif     // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
 | 
			
		||||
#endif     // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,31 +2,38 @@
 | 
			
		|||
RGB_MATRIX_EFFECT(STARLIGHT_DUAL_SAT)
 | 
			
		||||
#    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);
 | 
			
		||||
    hsv_t    hsv  = rgb_matrix_config.hsv;
 | 
			
		||||
    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_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) {
 | 
			
		||||
            uint8_t rand_led = random8_max(RGB_MATRIX_LED_COUNT);
 | 
			
		||||
            set_starlight_dual_sat_color(rand_led, params);
 | 
			
		||||
        }
 | 
			
		||||
        return false;
 | 
			
		||||
    static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
 | 
			
		||||
 | 
			
		||||
    // Periodic trigger for LED change
 | 
			
		||||
    if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0)) {
 | 
			
		||||
        index = random8_max(RGB_MATRIX_LED_COUNT);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    RGB_MATRIX_USE_LIMITS(led_min, led_max);
 | 
			
		||||
    for (uint8_t i = led_min; i < led_max; i++) {
 | 
			
		||||
        RGB_MATRIX_TEST_LED_FLAGS();
 | 
			
		||||
        set_starlight_dual_sat_color(i, params);
 | 
			
		||||
    if (params->init) {
 | 
			
		||||
        for (uint8_t i = led_min; i < led_max; i++) {
 | 
			
		||||
            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);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 | 
			
		||||
#endif     // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT
 | 
			
		||||
#endif     // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue