forked from forks/qmk_firmware
Update more DRIVER_LED_TOTAL
defines to RGB_MATRIX_LED_COUNT
(#19089)
This commit is contained in:
parent
5dabc1b387
commit
81a6407dca
|
@ -62,7 +62,7 @@
|
||||||
/* RGB matrix support. */
|
/* RGB matrix support. */
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
# define SPLIT_TRANSPORT_MIRROR
|
# define SPLIT_TRANSPORT_MIRROR
|
||||||
# define DRIVER_LED_TOTAL RGBLED_NUM
|
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
|
||||||
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
|
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
|
||||||
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
|
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
|
||||||
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
|
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
|
||||||
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||||
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||||
// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
|
// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
|
||||||
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
|
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
|
||||||
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
||||||
# define RGB_MATRIX_HUE_STEP 8
|
# define RGB_MATRIX_HUE_STEP 8
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
|
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
|
||||||
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||||
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||||
// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
|
// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
|
||||||
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
|
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
|
||||||
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
||||||
# define RGB_MATRIX_HUE_STEP 8
|
# define RGB_MATRIX_HUE_STEP 8
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
|
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
|
||||||
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||||
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||||
// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
|
// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
|
||||||
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
|
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
|
||||||
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
||||||
# define RGB_MATRIX_HUE_STEP 8
|
# define RGB_MATRIX_HUE_STEP 8
|
||||||
|
|
|
@ -16,8 +16,6 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
# define RGBLED_NUM 54 // Number of LEDs
|
|
||||||
# define DRIVER_LED_TOTAL RGBLED_NUM
|
|
||||||
# define RGB_MATRIX_SPLIT \
|
# define RGB_MATRIX_SPLIT \
|
||||||
{ 27, 27 }
|
{ 27, 27 }
|
||||||
//# define SPLIT_TRANSPORT_MIRROR
|
//# define SPLIT_TRANSPORT_MIRROR
|
||||||
|
@ -26,7 +24,7 @@
|
||||||
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
|
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
|
||||||
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||||
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||||
// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
|
// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
|
||||||
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
|
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
|
||||||
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
|
||||||
# define RGB_MATRIX_HUE_STEP 8
|
# define RGB_MATRIX_HUE_STEP 8
|
||||||
|
|
|
@ -61,7 +61,7 @@
|
||||||
#define RGB_MATRIX_VAL_STEP 8
|
#define RGB_MATRIX_VAL_STEP 8
|
||||||
#define RGB_MATRIX_SPD_STEP 10
|
#define RGB_MATRIX_SPD_STEP 10
|
||||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||||
#define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
|
#define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
|
||||||
#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
|
#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
|
||||||
|
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
|
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
|
||||||
|
|
|
@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
#ifdef UNDERGLOW_DISABLE
|
#ifdef UNDERGLOW_DISABLE
|
||||||
void keyboard_pre_init_user(void) {
|
void keyboard_pre_init_user(void) {
|
||||||
|
|
||||||
for (int key_id = 0; key_id < DRIVER_LED_TOTAL; key_id++ ) {
|
for (int key_id = 0; key_id < RGB_MATRIX_LED_COUNT; key_id++ ) {
|
||||||
if (g_led_config.flags[key_id] == LED_FLAG_UNDERGLOW) {
|
if (g_led_config.flags[key_id] == LED_FLAG_UNDERGLOW) {
|
||||||
g_led_config.flags[key_id] = LED_FLAG_NONE;
|
g_led_config.flags[key_id] = LED_FLAG_NONE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,5 +15,4 @@
|
||||||
|
|
||||||
// RGB configuration
|
// RGB configuration
|
||||||
#define RGB_MATRIX_LED_COUNT 40
|
#define RGB_MATRIX_LED_COUNT 40
|
||||||
#define RGBLED_NUM 40 // TBD: Once convergence with these defines occurs, remove.
|
#define RGBLED_NUM 40
|
||||||
#define DRIVER_LED_TOTAL 40 // TBD: Once convergence with these defines occurs, remove.
|
|
||||||
|
|
|
@ -21,8 +21,7 @@
|
||||||
|
|
||||||
|
|
||||||
// #define RGB_DI_PIN D1
|
// #define RGB_DI_PIN D1
|
||||||
#define DRIVER_LED_TOTAL 16
|
#define RGB_MATRIX_LED_COUNT 16
|
||||||
#define RGB_MATRIX_LED_COUNT DRIVER_LED_TOTAL
|
|
||||||
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
|
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
|
||||||
#define RGB_MATRIX_DISABLE_KEYCODES
|
#define RGB_MATRIX_DISABLE_KEYCODES
|
||||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
|
|
||||||
# define RGB_DI_PIN B4
|
# define RGB_DI_PIN B4
|
||||||
# define RGBLED_NUM 1
|
# define RGBLED_NUM 1
|
||||||
# define DRIVER_LED_TOTAL RGBLED_NUM
|
|
||||||
# define RGBLIGHT_EFFECT_BREATHING
|
# define RGBLIGHT_EFFECT_BREATHING
|
||||||
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||||
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
|
|
||||||
# define RGB_DI_PIN A8
|
# define RGB_DI_PIN A8
|
||||||
# define RGBLED_NUM 12
|
# define RGBLED_NUM 12
|
||||||
# define DRIVER_LED_TOTAL RGBLED_NUM
|
|
||||||
# define RGBLIGHT_SLEEP
|
# define RGBLIGHT_SLEEP
|
||||||
# define RGBLIGHT_VAL_STEP 5
|
# define RGBLIGHT_VAL_STEP 5
|
||||||
# define RGBLIGHT_LIMIT_VAL 200
|
# define RGBLIGHT_LIMIT_VAL 200
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
|
|
||||||
# define RGB_DI_PIN A7
|
# define RGB_DI_PIN A7
|
||||||
# define RGBLED_NUM 4
|
# define RGBLED_NUM 4
|
||||||
# define DRIVER_LED_TOTAL RGBLED_NUM
|
|
||||||
# define RGBLIGHT_LIMIT_VAL 180
|
# define RGBLIGHT_LIMIT_VAL 180
|
||||||
|
|
||||||
# define RGBLIGHT_EFFECT_BREATHING
|
# define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
|
|
||||||
# define RGB_DI_PIN B5
|
# define RGB_DI_PIN B5
|
||||||
# define RGBLED_NUM 1
|
# define RGBLED_NUM 1
|
||||||
# define DRIVER_LED_TOTAL RGBLED_NUM
|
|
||||||
|
|
||||||
# define RGBLIGHT_LAYERS
|
# define RGBLIGHT_LAYERS
|
||||||
# define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
|
# define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
|
||||||
|
|
Loading…
Reference in a new issue