Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						5b688a09ec
					
				
					 14 changed files with 25 additions and 19 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
 | 
			
		||||
#    if !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
 | 
			
		||||
#    if defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
 | 
			
		||||
 | 
			
		||||
#        ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
 | 
			
		||||
LED_MATRIX_EFFECT(SOLID_REACTIVE_WIDE)
 | 
			
		||||
| 
						 | 
				
			
			@ -30,5 +30,5 @@ bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) {
 | 
			
		|||
#            endif
 | 
			
		||||
 | 
			
		||||
#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
 | 
			
		||||
#    endif     // !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
 | 
			
		||||
#    endif     // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
 | 
			
		||||
#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue