diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-12-31 08:33:49 -0800 |
|---|---|---|
| committer | Joel Challis <git@zvecr.com> | 2019-12-31 16:33:49 +0000 |
| commit | 7ba6456c0b2e041bb9f97dbed265c5b8b4b12192 (patch) | |
| tree | 4e01ff717ab7d4c1d6d979f5d01ad8d4d841962e /quantum/rgblight.c | |
| parent | a52e55ec09c587ca58a156a6c174d51e0ad228b4 (diff) | |
| download | qmk_firmware-7ba6456c0b2e041bb9f97dbed265c5b8b4b12192.tar.gz qmk_firmware-7ba6456c0b2e041bb9f97dbed265c5b8b4b12192.zip | |
Use White channel on RGBW LEDs (#7678)
* Use White channel on RGBW LEDs
Co-authored-by: kwerdenker <sebastian.spindler@gmail.com>
* Manually apply white channel to array
* Move where convert_rgb_to_rgbw is called
* Fix type for rgbw led struct
* Add changes to Ergodox EZ
can revert if deemed necessary
* Revert "Add changes to Ergodox EZ"
This reverts commit aa44db198d40d758ca10470eb94615513592d1dd.
* Revert "Fix type for rgbw led struct"
This reverts commit c5c744cba040201cc0d124400773cf13f8a2cf22.
* Revert "Move where convert_rgb_to_rgbw is called"
This reverts commit cd7f17caf6dd30731c54b3be54490fe4519444f9.
* Revert changes and fix up functions
* Enable white channel for Ergodox EZ as well
* Only run conversion of rgblight is enabled
Co-authored-by: kwerdenker <sebastian.spindler@gmail.com>
Diffstat (limited to 'quantum/rgblight.c')
| -rw-r--r-- | quantum/rgblight.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/quantum/rgblight.c b/quantum/rgblight.c index 7949bb688..141dc2e7b 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c | |||
| @@ -611,6 +611,7 @@ void rgblight_set(void) { | |||
| 611 | # endif | 611 | # endif |
| 612 | } | 612 | } |
| 613 | } | 613 | } |
| 614 | |||
| 614 | # ifdef RGBLIGHT_LED_MAP | 615 | # ifdef RGBLIGHT_LED_MAP |
| 615 | LED_TYPE led0[RGBLED_NUM]; | 616 | LED_TYPE led0[RGBLED_NUM]; |
| 616 | for (uint8_t i = 0; i < RGBLED_NUM; i++) { | 617 | for (uint8_t i = 0; i < RGBLED_NUM; i++) { |
| @@ -620,7 +621,13 @@ void rgblight_set(void) { | |||
| 620 | # else | 621 | # else |
| 621 | start_led = led + clipping_start_pos; | 622 | start_led = led + clipping_start_pos; |
| 622 | # endif | 623 | # endif |
| 623 | ws2812_setleds(start_led, num_leds); | 624 | |
| 625 | #ifdef RGBW | ||
| 626 | for (uint8_t i = 0; i < num_leds; i++) { | ||
| 627 | convert_rgb_to_rgbw(&start_led[i]); | ||
| 628 | } | ||
| 629 | #endif | ||
| 630 | ws2812_setleds(start_led, num_leds); | ||
| 624 | } | 631 | } |
| 625 | #endif | 632 | #endif |
| 626 | 633 | ||
