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
				
			
		| 
						 | 
				
			
			@ -19,6 +19,6 @@
 | 
			
		|||
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
 | 
			
		||||
#define RGBLIGHT_DEFAULT_SAT 0
 | 
			
		||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
			
		||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,5 +2,5 @@
 | 
			
		|||
// SPDX-License-Identifier: GPL-2.0-or-later
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
#define RGB_MATRIX_STARTUP_SPD 0
 | 
			
		||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
#define RGB_MATRIX_DEFAULT_SPD 0
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -52,11 +52,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
    #define RGBLIGHT_VAL_STEP 17             // The number of steps to increment the brightness by (default 17)
 | 
			
		||||
 | 
			
		||||
    // Startup values, when none have been set
 | 
			
		||||
    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default effect mode, if none has been set (was RGB_MATRIX_SOLID_COLOR)
 | 
			
		||||
    #define RGB_MATRIX_STARTUP_HUE 24                         // 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 127                        // 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_SOLID_REACTIVE // Sets the default effect mode, if none has been set (was RGB_MATRIX_SOLID_COLOR)
 | 
			
		||||
    #define RGB_MATRIX_DEFAULT_HUE 24                         // 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 127                        // 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
 | 
			
		||||
 | 
			
		||||
    // Uncomment any #undef line below to turn OFF any default enabled RGB background effect (enabled in keyboards/gmmk/pro/config.h).
 | 
			
		||||
    #undef ENABLE_RGB_MATRIX_ALPHAS_MODS                      // Solid color (seems redundant; seems same as RGB_MATRIX_SOLID_COLOR?)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,7 +28,7 @@
 | 
			
		|||
#define TAPPING_TERM 180
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
    #define RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,7 +20,7 @@
 | 
			
		|||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
    #define RGB_MATRIX_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
 | 
			
		||||
 | 
			
		||||
// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
 | 
			
		||||
// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state
 | 
			
		||||
    #define RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,7 +26,7 @@
 | 
			
		|||
 | 
			
		||||
/* RGB Matrix Features */
 | 
			
		||||
#define RGB_MATRIX_KEYPRESSES
 | 
			
		||||
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED true
 | 
			
		||||
 | 
			
		||||
/* RGB Matrix Framebuffer Config */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,7 +17,7 @@
 | 
			
		|||
#pragma once
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
#    define RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -22,7 +22,7 @@
 | 
			
		|||
// At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best.
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
 | 
			
		||||
// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
 | 
			
		||||
// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state
 | 
			
		||||
    #define RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -52,11 +52,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
    #define RGBLIGHT_VAL_STEP 17             // The number of steps to increment the brightness by (default 17)
 | 
			
		||||
 | 
			
		||||
    // Startup values, when none have been set
 | 
			
		||||
    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default effect mode, if none has been set (was RGB_MATRIX_SOLID_COLOR)
 | 
			
		||||
    #define RGB_MATRIX_STARTUP_HUE 24                         // 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 127                        // 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_SOLID_REACTIVE // Sets the default effect mode, if none has been set (was RGB_MATRIX_SOLID_COLOR)
 | 
			
		||||
    #define RGB_MATRIX_DEFAULT_HUE 24                         // 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 127                        // 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
 | 
			
		||||
 | 
			
		||||
    // Uncomment any #undef line below to turn OFF any default enabled RGB background effect (enabled in keyboards/gmmk/pro/config.h).
 | 
			
		||||
    #undef ENABLE_RGB_MATRIX_ALPHAS_MODS                      // Solid color (seems redundant; seems same as RGB_MATRIX_SOLID_COLOR?)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,7 +28,7 @@
 | 
			
		|||
#define TAPPING_TERM 180
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
#    define RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,7 +4,7 @@
 | 
			
		|||
#pragma once
 | 
			
		||||
 | 
			
		||||
#if defined(RGB_MATRIX_ENABLE)
 | 
			
		||||
    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
     // number of milliseconds to wait until turning off RGB automatically
 | 
			
		||||
    #define RGB_MATRIX_TIMEOUT 300000 // 300 seconds / 5 min
 | 
			
		||||
    // start fading out before getting disabled
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue