ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WS2812 API rework (#24364)

Browse source 
* Begin WS2812 API rework

* Move RGBW conversion, clean up color.h, fix RGBW for AVR bitbang

* Formatting & update PS2AVRGB I2C driver (untested)

* Tested ARM bitbang RGB+RGBW

* Tested ARM SPI RGB - RGBW not working

* Tested ARM PWM RGB+RGBW

* Tested RP2040 PIO driver RGB+RGBW

* Update RGBLight

* Formatting

* Fix BM60HSRGB rev2

* Fix oddforge/vea

* Fix 1k and XD002 RGBLite

* Fix model_m/mschwingen

* Fix handwired/promethium

* Rename `WS2812_LED_TOTAL` for BM60HSRGB

* Fix work_louder boards

* Fix dawn60

* Fix rgbkb/pan

* Fix neson_design/700e and n6

* Fix ergodox_ez/shine

* ergodox_ez/shine: invert indices for left half

* Fix matrix/abelx

* Fix matrix/m20add

* Remove custom rgblight driver for matrix/noah - should be done with lighting layers

* Fix LED indexes for RGBLight split

* Rename `convert_rgb_to_rgbw()` to `ws2812_rgb_to_rgbw()`

* Update WS2812 API docs

* `ergodox_ez/shine`: simplify LED index calculation

* LED/RGB Matrix: Add weak function for LED index resolution

* Bandaid fix for RGB Matrix splits not using WS2812

* `steelseries/prime_plus`: redo custom RGBLight driver

* Update keyboards/steelseries/prime_plus/rgblight_custom.c

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>

---------

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
This commit is contained in:
Ryan 2024-10-06 19:01:07 +11:00 • committed by GitHub
parent 43e82ed5c7
commit 208ebf54a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
61 changed files with 649 additions and 672 deletions
Download patch file Download diff file Expand all files Collapse all files

18
keyboards/wilba_tech/wt_rgb_backlight.c
View file

@ -60,7 +60,6 @@
#if defined(RGB_BACKLIGHT_DAWN60)
#include "ws2812.h"
rgb_led_t g_ws2812_leds[WS2812_LED_TOTAL];
#endif
#include "progmem.h"
@ -1011,6 +1010,9 @@ void backlight_update_pwm_buffers(void)
driver = 0;
}
#else
#if defined(RGB_BACKLIGHT_DAWN60)
ws2812_flush();
#endif
is31fl3731_update_pwm_buffers( 0 );
is31fl3731_update_pwm_buffers( 1 );
is31fl3731_update_led_control_registers( 0 );
@ -1037,10 +1039,7 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
if( index < IS31FL3731_LED_COUNT ) {
is31fl3731_set_color( index, red, green, blue );
} else {
g_ws2812_leds[index - IS31FL3731_LED_COUNT].r = red;
g_ws2812_leds[index - IS31FL3731_LED_COUNT].g = green;
g_ws2812_leds[index - IS31FL3731_LED_COUNT].b = blue;
ws2812_setleds(g_ws2812_leds, WS2812_LED_TOTAL);
ws2812_set_color( index - IS31FL3731_LED_COUNT, red, green, blue );
}
#else
is31fl3731_set_color( index, red, green, blue );
@ -1075,12 +1074,7 @@ void backlight_set_color_all( uint8_t red, uint8_t green, uint8_t blue )
}
#elif defined(RGB_BACKLIGHT_DAWN60)
is31fl3731_set_color_all( red, green, blue );
for (uint8_t i = 0; i < WS2812_LED_TOTAL; i++) {
g_ws2812_leds[i].r = red;
g_ws2812_leds[i].g = green;
g_ws2812_leds[i].b = blue;
}
ws2812_setleds(g_ws2812_leds, WS2812_LED_TOTAL);
ws2812_set_color_all( red, green, blue );
#else
is31fl3731_set_color_all( red, green, blue );
#endif
@ -1325,7 +1319,7 @@ void backlight_effect_alphas_mods(void)
}
}
#if defined(RGB_BACKLIGHT_DAWN60)
for (int i = 0; i < WS2812_LED_TOTAL; i++) {
for (int i = 0; i < WS2812_LED_COUNT; i++) {
if ((RGB_UNDERGLOW_ALPHA_TOP_START <= i && i <= RGB_UNDERGLOW_ALPHA_TOP_END) ||
(RGB_UNDERGLOW_ALPHA_BOT_START <= i && i <= RGB_UNDERGLOW_ALPHA_BOT_END)) {
backlight_set_color(i + IS31FL3731_LED_COUNT, rgb1.r, rgb1.g, rgb1.b);