Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
41977a6010
6 changed files with 3 additions and 3 deletions
|
@ -21,7 +21,6 @@
|
||||||
#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
|
#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
|
||||||
|
|
||||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
||||||
#define RGB_MATRIX_DEFAULT_VAL 100
|
|
||||||
#define RGB_MATRIX_KEYPRESSES
|
#define RGB_MATRIX_KEYPRESSES
|
||||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||||
|
|
||||||
|
|
|
@ -105,6 +105,7 @@
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "is31fl3733",
|
"driver": "is31fl3733",
|
||||||
|
"max_brightness": 191,
|
||||||
"animations": {
|
"animations": {
|
||||||
"alphas_mods": true,
|
"alphas_mods": true,
|
||||||
"gradient_up_down": true,
|
"gradient_up_down": true,
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
|
#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
|
||||||
|
|
||||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
||||||
#define RGB_MATRIX_DEFAULT_VAL 100
|
|
||||||
#define RGB_MATRIX_KEYPRESSES
|
#define RGB_MATRIX_KEYPRESSES
|
||||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||||
|
|
||||||
|
|
|
@ -125,6 +125,7 @@
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "is31fl3733",
|
"driver": "is31fl3733",
|
||||||
|
"max_brightness": 191,
|
||||||
"animations": {
|
"animations": {
|
||||||
"alphas_mods": true,
|
"alphas_mods": true,
|
||||||
"gradient_up_down": true,
|
"gradient_up_down": true,
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
|
#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
|
||||||
|
|
||||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
||||||
#define RGB_MATRIX_DEFAULT_VAL 100
|
|
||||||
#define RGB_MATRIX_KEYPRESSES
|
#define RGB_MATRIX_KEYPRESSES
|
||||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||||
|
|
||||||
|
|
|
@ -133,6 +133,7 @@
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "is31fl3733",
|
"driver": "is31fl3733",
|
||||||
|
"max_brightness": 191,
|
||||||
"animations": {
|
"animations": {
|
||||||
"alphas_mods": true,
|
"alphas_mods": true,
|
||||||
"gradient_up_down": true,
|
"gradient_up_down": true,
|
||||||
|
|
Loading…
Reference in a new issue