Change RGB_MATRIX_STARTUP_* defines to RGB_MATRIX_DEFAULT_* (#19079)
This commit is contained in:
parent
ad7b095da6
commit
e12ca14af8
196 changed files with 373 additions and 377 deletions
|
|
@ -798,11 +798,11 @@ These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master
|
|||
#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_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
|
||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
|
||||
#define RGB_MATRIX_STARTUP_HUE 0 // Sets the default hue value, if none has been set
|
||||
#define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set
|
||||
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
|
||||
#define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
|
||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
|
||||
#define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set
|
||||
#define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
|
||||
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
|
||||
#define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
|
||||
#define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
|
||||
#define RGB_MATRIX_SPLIT { X, Y } // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
|
||||
// If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define RGB_DI_PIN B2
|
||||
#define RGB_MATRIX_LED_COUNT 2
|
||||
#define RGB_MATRIX_KEYPRESSES
|
||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE
|
||||
#define RGB_MATRIX_STARTUP_HUE 90
|
||||
#define RGB_MATRIX_STARTUP_SPD 20
|
||||
#define RGB_MATRIX_STARTUP_VAL 128
|
||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE
|
||||
#define RGB_MATRIX_DEFAULT_HUE 90
|
||||
#define RGB_MATRIX_DEFAULT_SPD 20
|
||||
#define RGB_MATRIX_DEFAULT_VAL 128
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define RGB_MATRIX_LED_COUNT 62
|
||||
#define ISSI_PWM_FREQUENCY 0b010
|
||||
|
||||
#define RGB_MATRIX_STARTUP_VAL 80
|
||||
#define RGB_MATRIX_DEFAULT_VAL 80
|
||||
#define RGB_MATRIX_KEYPRESSES
|
||||
|
||||
// RGB Matrix Animation modes. Explicitly enabled
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
|
||||
#define WS2812_DMA_CHANNEL 6
|
||||
|
||||
#define RGB_MATRIX_STARTUP_VAL 60
|
||||
#define RGB_MATRIX_DEFAULT_VAL 60
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
#define RGB_MATRIX_KEYPRESSES
|
||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
|
||||
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
||||
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
||||
|
|
|
|||
|
|
@ -48,11 +48,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
|
||||
#define ISSI_DRIVER_TOTAL RGB_MATRIX_LED_COUNT
|
||||
|
||||
#define RGB_MATRIX_STARTUP_VAL 80
|
||||
#define RGB_MATRIX_DEFAULT_VAL 80
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
#define RGB_MATRIX_KEYPRESSES
|
||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_HUE_WAVE
|
||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_HUE_WAVE
|
||||
|
||||
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
||||
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
|
||||
#define WS2812_DMA_CHANNEL 6
|
||||
|
||||
#define RGB_MATRIX_STARTUP_VAL 60
|
||||
#define RGB_MATRIX_DEFAULT_VAL 60
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
#define RGB_MATRIX_KEYPRESSES
|
||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
|
||||
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
||||
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
|
||||
#define WS2812_DMA_CHANNEL 6
|
||||
|
||||
#define RGB_MATRIX_STARTUP_VAL 60
|
||||
#define RGB_MATRIX_DEFAULT_VAL 60
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
#define RGB_MATRIX_KEYPRESSES
|
||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
|
||||
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
||||
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
||||
#define RGB_MATRIX_LED_PROCESS_LIMIT 21
|
||||
#define RGB_MATRIX_LED_FLUSH_LIMIT 16
|
||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 20
|
||||
#define RGB_MATRIX_KEYPRESSES
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@
|
|||
#define ISSI_DRIVER_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
|
||||
#define RGB_MATRIX_LED_COUNT ISSI_DRIVER_TOTAL
|
||||
|
||||
#define RGB_MATRIX_STARTUP_VAL 80
|
||||
#define RGB_MATRIX_DEFAULT_VAL 80
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
#define RGB_MATRIX_KEYPRESSES
|
||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
|
||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
|
||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
|
||||
|
||||
// RGB Matrix Animation modes. Explicitly enabled
|
||||
// For full list of effects, see:
|
||||
|
|
|
|||
|
|
@ -58,10 +58,10 @@
|
|||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED true
|
||||
#define RGB_MATRIX_LED_COUNT 96
|
||||
#define RGB_MATRIX_STARTUP_HUE 170
|
||||
#define RGB_MATRIX_STARTUP_SAT 255
|
||||
#define RGB_MATRIX_DEFAULT_HUE 170
|
||||
#define RGB_MATRIX_DEFAULT_SAT 255
|
||||
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
|
||||
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
|
||||
#define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue
|
||||
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
# define LED_HITS_TO_REMEMBER 10
|
||||
|
||||
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
|
||||
# define RGB_MATRIX_STARTUP_SPD 127
|
||||
# define RGB_MATRIX_DEFAULT_SPD 127
|
||||
// the above brighness setting has no effect on rgb_matrix_set_color().
|
||||
// Use darker colors instead.
|
||||
/* RGB darker COLORS */
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ void eeconfig_init_user(void) { // EEPROM is getting reset!
|
|||
my_init();
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_enable();
|
||||
rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
|
||||
rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
|
||||
rgb_matrix_sethsv(HSV_BLUE);
|
||||
|
||||
rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ void eeconfig_init_user(void) { // EEPROM is getting reset!
|
|||
my_init();
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_enable();
|
||||
rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
|
||||
rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
|
||||
rgb_matrix_sethsv(HSV_BLUE);
|
||||
|
||||
rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ void eeconfig_init_user(void) { // EEPROM is getting reset!
|
|||
my_init();
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_enable();
|
||||
rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
|
||||
rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
|
||||
rgb_matrix_sethsv(HSV_BLUE);
|
||||
|
||||
rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
|
||||
|
|
|
|||
|
|
@ -153,14 +153,13 @@
|
|||
|
||||
// Rainbow swirl as startup mode.
|
||||
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
|
||||
// Slow swirl at startup.
|
||||
# define RGB_MATRIX_STARTUP_SPD 32
|
||||
# define RGB_MATRIX_DEFAULT_SPD 32
|
||||
|
||||
// Startup values.
|
||||
# define RGB_MATRIX_STARTUP_HUE 0
|
||||
# define RGB_MATRIX_STARTUP_SAT 255
|
||||
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
|
||||
# define RGB_MATRIX_DEFAULT_HUE 0
|
||||
# define RGB_MATRIX_DEFAULT_SAT 255
|
||||
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ void matrix_scan_user(void) {
|
|||
auto_pointer_layer_timer = 0;
|
||||
layer_off(LAYER_POINTER);
|
||||
# ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_DEFAULT_MODE);
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ void matrix_scan_user(void) {
|
|||
auto_pointer_layer_timer = 0;
|
||||
layer_off(LAYER_POINTER);
|
||||
# ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_DEFAULT_MODE);
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ void matrix_scan_user(void) {
|
|||
auto_pointer_layer_timer = 0;
|
||||
layer_off(LAYER_POINTER);
|
||||
# ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_DEFAULT_MODE);
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,17 +40,16 @@
|
|||
# define RGB_MATRIX_KEYPRESSES
|
||||
|
||||
// Startup values.
|
||||
# define RGB_MATRIX_STARTUP_HUE 0
|
||||
# define RGB_MATRIX_STARTUP_SAT 255
|
||||
# define RGB_MATRIX_STARTUP_VAL 64
|
||||
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
|
||||
# define RGB_MATRIX_DEFAULT_HUE 0
|
||||
# define RGB_MATRIX_DEFAULT_SAT 255
|
||||
# define RGB_MATRIX_DEFAULT_VAL 64
|
||||
|
||||
// Rainbow swirl as startup mode.
|
||||
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
|
||||
// Slow swirl at startup.
|
||||
# define RGB_MATRIX_STARTUP_SPD 32
|
||||
# define RGB_MATRIX_DEFAULT_SPD 32
|
||||
|
||||
# ifndef __arm__
|
||||
// Disable control of RGB matrix by keycodes (must use firmware implementation
|
||||
|
|
|
|||
|
|
@ -140,14 +140,13 @@
|
|||
|
||||
// Rainbow swirl as startup mode.
|
||||
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
|
||||
// Slow swirl at startup.
|
||||
# define RGB_MATRIX_STARTUP_SPD 32
|
||||
# define RGB_MATRIX_DEFAULT_SPD 32
|
||||
|
||||
// Startup values.
|
||||
# define RGB_MATRIX_STARTUP_HUE 0
|
||||
# define RGB_MATRIX_STARTUP_SAT 255
|
||||
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
|
||||
# define RGB_MATRIX_DEFAULT_HUE 0
|
||||
# define RGB_MATRIX_DEFAULT_SAT 255
|
||||
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue