bandominedoni, Drashna's method is applied to encoder_update_kb. (#15287)
* Drashna's method is applied to rotary encoder rotation detection. rgb_matrix_user.inc -> rgb_matrix_kb.inc. * Disabled some RGB MATRIX effects to shrink the firmware size. * via # of layers changed from 5 to 4.
This commit is contained in:
		
							parent
							
								
									07465c0ebb
								
							
						
					
					
						commit
						4e077250d5
					
				
					 9 changed files with 143 additions and 169 deletions
				
			
		| 
						 | 
				
			
			@ -133,120 +133,54 @@
 | 
			
		|||
//  Enable suspend mode.
 | 
			
		||||
#   define RGB_DISABLE_WHEN_USB_SUSPENDED true
 | 
			
		||||
 | 
			
		||||
// //  enable below to shrink the firmware size ( -1974 bytes )
 | 
			
		||||
// #    define REDUCE_RGB_MATRIX_EFFECTS
 | 
			
		||||
 | 
			
		||||
//  enable below to shrink the firmware size ( -1574 bytes )
 | 
			
		||||
// #    define REDUCE_RGB_MATRIX_EFFECTS_2
 | 
			
		||||
 | 
			
		||||
// #    ifdef AUDIO_ENABLE
 | 
			
		||||
#    ifdef CONSOLE_ENABLE
 | 
			
		||||
#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
 | 
			
		||||
#    else
 | 
			
		||||
#   ifdef CONSOLE_ENABLE
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
 | 
			
		||||
#   else
 | 
			
		||||
// #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_PINWHEEL_SAT
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
 | 
			
		||||
// #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_FRACTAL
 | 
			
		||||
#        define ENABLE_RGB_MATRIX_PIXEL_RAIN
 | 
			
		||||
 | 
			
		||||
#        if !defined(REDUCE_RGB_MATRIX_EFFECTS) && !defined(VIA_ENABLE)
 | 
			
		||||
// #       ifdef REDUCE_RGB_MATRIX_EFFECTS
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_DUAL_BEACON
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
 | 
			
		||||
#        endif
 | 
			
		||||
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_HUE_BREATHING
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_HUE_WAVE
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_FRACTAL
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_PIXEL_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
 | 
			
		||||
 | 
			
		||||
#        if !defined(REDUCE_RGB_MATRIX_EFFECTS_2) && !defined(VIA_ENABLE)
 | 
			
		||||
// #       ifdef REDUCE_RGB_MATRIX_EFFECTS_2
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_BAND_VAL
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_CYCLE_ALL
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_RAINBOW_BEACON
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_MULTISPLASH
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | 
			
		||||
 | 
			
		||||
#        endif
 | 
			
		||||
#            define ENABLE_RGB_MATRIX_SOLID_REACTIVE
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_SPLASH
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 | 
			
		||||
#    endif  // AUDIO_ENABLE
 | 
			
		||||
 | 
			
		||||
// #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_FRACTAL
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 | 
			
		||||
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_BREATHING
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_BAND_SAT
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
 | 
			
		||||
// #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
 | 
			
		||||
 | 
			
		||||
#       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_MULTICROSS
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_SPLASH
 | 
			
		||||
#       define ENABLE_RGB_MATRIX_SOLID_SPLASH
 | 
			
		||||
//  RAINDROPS don't match well with layer LED indicator (oc) using rgb_matrix_set_color().
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_RAINDROPS
 | 
			
		||||
// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
 | 
			
		||||
//  Recommendend not to use these.
 | 
			
		||||
#       ifndef VIA_ENABLE
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_BAND_VAL
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_CYCLE_ALL
 | 
			
		||||
#           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_HUE_BREATHING
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_HUE_PENDULUM
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_HUE_WAVE
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_MULTISPLASH
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | 
			
		||||
#           define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
 | 
			
		||||
#       endif
 | 
			
		||||
#   endif  // CONSOLE_ENABLE
 | 
			
		||||
#endif  // RGB_MATRIX_ENABLE
 | 
			
		||||
 | 
			
		||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 | 
			
		||||
| 
						 | 
				
			
			@ -330,4 +264,7 @@
 | 
			
		|||
#   define ENCODERS_PAD_B_RIGHT { F4 }
 | 
			
		||||
#   define ENCODER_RESOLUTION 4
 | 
			
		||||
#   define TAP_CODE_DELAY 10
 | 
			
		||||
#   define ENCODERS 2
 | 
			
		||||
#   define ENCODERS_CW_KEY  { {4, 5}, {6, 5} }
 | 
			
		||||
#   define ENCODERS_CCW_KEY { {3, 5}, {5, 5} }
 | 
			
		||||
#endif  // ENCODER_ENABLE
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue