diff options
| author | Ryan | 2024-10-06 10:01:07 +0200 |
|---|---|---|
| committer | GitHub | 2024-10-06 10:01:07 +0200 |
| commit | 208ebf54a905ce6e4e563a6811eca8c8dc8b17e1 (patch) | |
| tree | 7bb6a8bdb5a641263c39236d0b655825ac37307b /keyboards/matrix/abelx | |
| parent | 43e82ed5c72b7386ca91d1bd363ee092f77c1b9a (diff) | |
WS2812 API rework (#24364)
* 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>
Diffstat (limited to 'keyboards/matrix/abelx')
| -rw-r--r-- | keyboards/matrix/abelx/abelx.c | 45 | ||||
| -rw-r--r-- | keyboards/matrix/abelx/config.h | 1 |
2 files changed, 24 insertions, 22 deletions
diff --git a/keyboards/matrix/abelx/abelx.c b/keyboards/matrix/abelx/abelx.c index ee7ffde134..9058bf6e2f 100644 --- a/keyboards/matrix/abelx/abelx.c +++ b/keyboards/matrix/abelx/abelx.c @@ -41,20 +41,6 @@ uint8_t read_pin(uint16_t pin) return (data & (1<<GET_PIN(pin))) ? 1 : 0; } -void matrix_init_kb(void) { -#ifdef RGBLIGHT_ENABLE - aw9523b_init(AW9523B_ADDR); -#endif - matrix_init_user(); -} - - -void housekeeping_task_kb(void) { -#ifdef RGBLIGHT_ENABLE - aw9523b_update_pwm_buffers(AW9523B_ADDR); -#endif -} - #ifdef RGBLIGHT_ENABLE #include "rgblight.h" #include "ws2812.h" @@ -67,20 +53,35 @@ const aw9523b_led g_aw9523b_leds[AW9523B_RGB_NUM] = { {AW9523B_P07_PWM, AW9523B_P06_PWM, AW9523B_P05_PWM}, }; -void setleds_custom(rgb_led_t *start_led, uint16_t num_leds) -{ - uint8_t num = num_leds < AW9523B_RGB_NUM ? num_leds : AW9523B_RGB_NUM; +void init_custom(void) { + aw9523b_init(AW9523B_ADDR); + ws2812_init(); +} - ws2812_setleds(start_led, num); +void set_color_custom(int index, uint8_t red, uint8_t green, uint8_t blue) { + if (index < AW9523B_RGB_NUM) { + aw9523b_set_color(index, red, green, blue); + } else { + ws2812_set_color(index - AW9523B_RGB_NUM, red, green, blue); + } +} - for (int i = 0; i < num; i++) { - aw9523b_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b); +void set_color_all_custom(uint8_t red, uint8_t green, uint8_t blue) { + for (int i = 0; i < RGBLIGHT_LED_COUNT; i++) { + set_color_custom(i, red, green, blue); } } +void flush_custom(void) { + aw9523b_update_pwm_buffers(AW9523B_ADDR); + ws2812_flush(); +} + const rgblight_driver_t rgblight_driver = { - .init = ws2812_init, - .setleds = setleds_custom, + .init = init_custom, + .set_color = set_color_custom, + .set_color_all = set_color_all_custom, + .flush = flush_custom, }; #endif diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h index 63b8202146..bd552d11a2 100644 --- a/keyboards/matrix/abelx/config.h +++ b/keyboards/matrix/abelx/config.h @@ -89,5 +89,6 @@ #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 #define AW9523B_RGB_NUM 4 +#define WS2812_LED_COUNT 5 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE |