Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						eedbb9ae64
					
				
					 2 changed files with 107 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -28,16 +28,66 @@
 | 
			
		|||
#define DRIVER_LED_TOTAL 73
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 | 
			
		||||
// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 | 
			
		||||
// #   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_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_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 200 out of 255. If not defined maximum brightness is set to 255
 | 
			
		||||
#    define RGB_MATRIX_HUE_STEP 8
 | 
			
		||||
#    define RGB_MATRIX_SAT_STEP 8
 | 
			
		||||
#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 | 
			
		||||
#    define RGB_MATRIX_VAL_STEP 5
 | 
			
		||||
#    define RGB_MATRIX_SPD_STEP 10
 | 
			
		||||
  #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 | 
			
		||||
//  #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 | 
			
		||||
//  #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
 | 
			
		||||
//  #define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
 | 
			
		||||
//  #define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
 | 
			
		||||
  #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_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 255 // 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 50 // 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_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
 | 
			
		||||
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BREATHING
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BAND_SAT
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BAND_VAL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_ALL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_DUAL_BEACON
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_RAINDROPS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_HUE_BREATHING
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_HUE_WAVE
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_PIXEL_FLOW
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SPLASH
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_MULTISPLASH
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -45,4 +45,49 @@
 | 
			
		|||
//  #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
 | 
			
		||||
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BREATHING
 | 
			
		||||
 //  #define ENABLE_RGB_MATRIX_BAND_SAT
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BAND_VAL
 | 
			
		||||
 //  #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
 | 
			
		||||
//  #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_ALL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
 | 
			
		||||
//  #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_DUAL_BEACON
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
 | 
			
		||||
//  #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_RAINDROPS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
 | 
			
		||||
//  #define ENABLE_RGB_MATRIX_HUE_BREATHING
 | 
			
		||||
//  #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 | 
			
		||||
//  #define ENABLE_RGB_MATRIX_HUE_WAVE
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_PIXEL_FLOW
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SPLASH
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_MULTISPLASH
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 | 
			
		||||
  #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue