mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-03 08:25:11 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
5bdc0b720a
@ -82,7 +82,7 @@ static last_hit_t last_hit_buffer;
|
||||
#endif // LED_MATRIX_KEYREACTIVE_ENABLED
|
||||
|
||||
// split led matrix
|
||||
#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
|
||||
#if defined(LED_MATRIX_SPLIT)
|
||||
const uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;
|
||||
#endif
|
||||
|
||||
@ -147,7 +147,7 @@ void led_matrix_set_value(int index, uint8_t value) {
|
||||
}
|
||||
|
||||
void led_matrix_set_value_all(uint8_t value) {
|
||||
#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
|
||||
#if defined(LED_MATRIX_SPLIT)
|
||||
for (uint8_t i = 0; i < LED_MATRIX_LED_COUNT; i++)
|
||||
led_matrix_set_value(i, value);
|
||||
#else
|
||||
|
@ -84,7 +84,7 @@ static last_hit_t last_hit_buffer;
|
||||
#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
|
||||
|
||||
// split rgb matrix
|
||||
#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
|
||||
#if defined(RGB_MATRIX_SPLIT)
|
||||
const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
|
||||
#endif
|
||||
|
||||
@ -148,7 +148,7 @@ void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
|
||||
}
|
||||
|
||||
void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
|
||||
#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
|
||||
#if defined(RGB_MATRIX_SPLIT)
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++)
|
||||
rgb_matrix_set_color(i, red, green, blue);
|
||||
#else
|
||||
|
@ -164,7 +164,7 @@ static void flush(void) {
|
||||
|
||||
// Set an led in the buffer to a color
|
||||
static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
|
||||
# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
|
||||
# if defined(RGB_MATRIX_SPLIT)
|
||||
const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
|
||||
if (!is_keyboard_left()) {
|
||||
if (i >= k_rgb_matrix_split[0]) {
|
||||
|
Loading…
Reference in New Issue
Block a user