drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Rework RGBLight driver system (#22529)

Browse source
This commit is contained in:
Ryan 2023-12-05 22:49:14 +11:00 • committed by GitHub
parent 2acb426b8e
commit 17f36a21bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 125 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

33
quantum/rgblight/rgblight.c
View file

@ -900,12 +900,6 @@ void rgblight_wakeup(void) {
#endif
__attribute__((weak)) void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds) {
ws2812_setleds(start_led, num_leds);
}
#ifndef RGBLIGHT_CUSTOM
void rgblight_set(void) {
rgb_led_t *start_led;
uint8_t num_leds = rgblight_ranges.clipping_num_leds;
@ -915,42 +909,41 @@ void rgblight_set(void) {
led[i].r = 0;
led[i].g = 0;
led[i].b = 0;
# ifdef RGBW
#ifdef RGBW
led[i].w = 0;
# endif
#endif
}
}
# ifdef RGBLIGHT_LAYERS
#ifdef RGBLIGHT_LAYERS
if (rgblight_layers != NULL
# if !defined(RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF)
# if !defined(RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF)
&& rgblight_config.enable
# elif defined(RGBLIGHT_SLEEP)
# elif defined(RGBLIGHT_SLEEP)
&& !is_suspended
# endif
# endif
) {
rgblight_layers_write();
}
# endif
#endif
# ifdef RGBLIGHT_LED_MAP
#ifdef RGBLIGHT_LED_MAP
rgb_led_t led0[RGBLED_NUM];
for (uint8_t i = 0; i < RGBLED_NUM; i++) {
led0[i] = led[pgm_read_byte(&led_map[i])];
}
start_led = led0 + rgblight_ranges.clipping_start_pos;
# else
#else
start_led = led + rgblight_ranges.clipping_start_pos;
# endif
#endif
# ifdef RGBW
#ifdef RGBW
for (uint8_t i = 0; i < num_leds; i++) {
convert_rgb_to_rgbw(&start_led[i]);
}
# endif
rgblight_call_driver(start_led, num_leds);
}
#endif
rgblight_driver.setleds(start_led, num_leds);
}
#ifdef RGBLIGHT_SPLIT
/* for split keyboard master side */

1
quantum/rgblight/rgblight.h
View file

@ -160,6 +160,7 @@ enum RGBLIGHT_EFFECT_MODE {
#include <stdint.h>
#include <stdbool.h>
#include "rgblight_drivers.h"
#include "progmem.h"
#include "eeconfig.h"
#include "ws2812.h"

20
quantum/rgblight/rgblight_drivers.c Normal file
View file

@ -0,0 +1,20 @@
// Copyright 2023 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#include "rgblight_drivers.h"
#if defined(RGBLIGHT_WS2812)
# include "ws2812.h"
const rgblight_driver_t rgblight_driver = {
.setleds = ws2812_setleds,
};
#elif defined(RGBLIGHT_APA102)
# include "apa102.h"
const rgblight_driver_t rgblight_driver = {
.setleds = apa102_setleds,
};
#endif

13
quantum/rgblight/rgblight_drivers.h Normal file
View file

@ -0,0 +1,13 @@
// Copyright 2023 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include <stdint.h>
#include "color.h"
typedef struct {
void (*setleds)(rgb_led_t *ledarray, uint16_t number_of_leds);
} rgblight_driver_t;
extern const rgblight_driver_t rgblight_driver;