mirrors/qmk_firmware
1
0
Fork 1
mirror of https://github.com/qmk/qmk_firmware synced 2024-11-13 07:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move where convert_rgb_to_rgbw is called

Browse source
This commit is contained in:
Drashna Jael're 2019-12-25 14:55:45 -08:00
parent 578bf44204
commit cd7f17caf6
No known key found for this signature in database
GPG key ID: DBA1FD3A860D1B11
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
quantum/rgblight.c
View file

@ -601,8 +601,8 @@ void rgblight_set(void) {
LED_TYPE *start_led; LED_TYPE *start_led;
uint16_t num_leds = clipping_num_leds; uint16_t num_leds = clipping_num_leds;
if (!rgblight_config.enable) { for (uint8_t i = effect_start_pos; i < effect_end_pos; i++) {
for (uint8_t i = effect_start_pos; i < effect_end_pos; i++) { if (!rgblight_config.enable) {
led[i].r = 0; led[i].r = 0;
led[i].g = 0; led[i].g = 0;
led[i].b = 0; led[i].b = 0;
@ -610,10 +610,13 @@ void rgblight_set(void) {
led[i].w = 0; led[i].w = 0;
# endif # endif
} }
# ifdef RGBW
else {
convert_rgb_to_rgbw(led[i]);
}
#endif
} }
# ifdef RGBLIGHT_LED_MAP # ifdef RGBLIGHT_LED_MAP
LED_TYPE led0[RGBLED_NUM]; LED_TYPE led0[RGBLED_NUM];
for (uint8_t i = 0; i < RGBLED_NUM; i++) { for (uint8_t i = 0; i < RGBLED_NUM; i++) {
@ -623,13 +626,7 @@ void rgblight_set(void) {
# else # else
start_led = led + clipping_start_pos; start_led = led + clipping_start_pos;
# endif # endif
ws2812_setleds(start_led, num_leds);
#ifdef RGBW
for (uint8_t i = 0; i < num_leds; i++) {
convert_rgb_to_rgbw(start_led[i]);
}
#endif
ws2812_setleds(start_led, num_leds);
} }
#endif #endif