Merge remote-tracking branch 'qmk/master' into merge-2023-12-16

This commit is contained in:
Ilya Zhuravlev 2023-12-16 10:48:34 -06:00
commit 66574eb854
6566 changed files with 124240 additions and 243032 deletions

View file

@ -20,14 +20,12 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
/* RGB Matrix config */
#define DRIVER_ADDR_1 0b1011111
#define DRIVER_ADDR_2 0b1010000
#define DRIVER_COUNT 2
#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_VCC_VCC
#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_GND
#define DRIVER_1_LED_TOTAL 63
#define DRIVER_2_LED_TOTAL 64

View file

@ -18,7 +18,7 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | G location