Clean up RGB LED type (#21859)
This commit is contained in:
		
							parent
							
								
									1e3095f9cc
								
							
						
					
					
						commit
						41bd4e35a0
					
				
					 63 changed files with 222 additions and 243 deletions
				
			
		| 
						 | 
				
			
			@ -322,7 +322,7 @@ void housekeeping_task_kb(void)
 | 
			
		|||
    } else if (rgb_state.state == CAPS_ALERT) {
 | 
			
		||||
        if (rgb_state.alert) {
 | 
			
		||||
            is31fl3731_set_color_all(ALERM_LED_R, ALERM_LED_G, ALERM_LED_B);
 | 
			
		||||
            LED_TYPE leds[4];
 | 
			
		||||
            rgb_led_t leds[4];
 | 
			
		||||
            for (int i = 0; i < 4; i++) {
 | 
			
		||||
                leds[i].r = ALERM_LED_G;
 | 
			
		||||
                leds[i].g = ALERM_LED_R;
 | 
			
		||||
| 
						 | 
				
			
			@ -331,7 +331,7 @@ void housekeeping_task_kb(void)
 | 
			
		|||
            ws2812_setleds(leds, 4);
 | 
			
		||||
        } else {
 | 
			
		||||
            is31fl3731_set_color_all(0, 0, 0);
 | 
			
		||||
            LED_TYPE leds[4] = {0};
 | 
			
		||||
            rgb_led_t leds[4] = {0};
 | 
			
		||||
            ws2812_setleds(leds, 4);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -349,14 +349,14 @@ void housekeeping_task_kb(void)
 | 
			
		|||
    housekeeping_task_user();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
 | 
			
		||||
void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
 | 
			
		||||
{
 | 
			
		||||
    if (rgb_state.state != NORMAL) return;
 | 
			
		||||
 | 
			
		||||
    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
 | 
			
		||||
        is31fl3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
 | 
			
		||||
    }
 | 
			
		||||
    LED_TYPE leds[4];
 | 
			
		||||
    rgb_led_t leds[4];
 | 
			
		||||
    for (int i = 0; i < 4; i++) {
 | 
			
		||||
        leds[i].r = start_led[RGB_MATRIX_LED_COUNT+i].g;
 | 
			
		||||
        leds[i].g = start_led[RGB_MATRIX_LED_COUNT+i].r;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -320,7 +320,7 @@ void housekeeping_task_kb(void)
 | 
			
		|||
        self_testing();
 | 
			
		||||
    } else if (rgb_state.state == CAPS_ALERT) {
 | 
			
		||||
        //gold 0xFF, 0xD9, 0x00
 | 
			
		||||
        LED_TYPE led = {
 | 
			
		||||
        rgb_led_t led = {
 | 
			
		||||
            .r = 0xFF,
 | 
			
		||||
            //.g = 0xD9,
 | 
			
		||||
            .g = 0xA5,
 | 
			
		||||
| 
						 | 
				
			
			@ -351,7 +351,7 @@ void housekeeping_task_kb(void)
 | 
			
		|||
    housekeeping_task_user();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
 | 
			
		||||
void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
 | 
			
		||||
{
 | 
			
		||||
    if (rgb_state.state != NORMAL) return;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -22,7 +22,7 @@
 | 
			
		|||
 | 
			
		||||
static bool alert = false;
 | 
			
		||||
static bool backup = false;
 | 
			
		||||
static LED_TYPE caps_led;
 | 
			
		||||
static rgb_led_t caps_led;
 | 
			
		||||
static uint16_t last_ticks = 0;
 | 
			
		||||
 | 
			
		||||
#define ALERT_INTERVAL      500
 | 
			
		||||
| 
						 | 
				
			
			@ -66,7 +66,7 @@ void housekeeping_task_kb(void)
 | 
			
		|||
    housekeeping_task_user();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
 | 
			
		||||
void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
 | 
			
		||||
{
 | 
			
		||||
    start_led[2].r = start_led[0].r;
 | 
			
		||||
    start_led[2].g = start_led[0].g;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue