Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						d9add95037
					
				
					 2 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -67,7 +67,7 @@ const led_point_t k_led_matrix_center = LED_MATRIX_CENTER;
 | 
			
		|||
#    define LED_DISABLE_TIMEOUT 0
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if LED_DISABLE_WHEN_USB_SUSPENDED == false
 | 
			
		||||
#if LED_DISABLE_WHEN_USB_SUSPENDED != 1
 | 
			
		||||
#    undef LED_DISABLE_WHEN_USB_SUSPENDED
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -67,7 +67,7 @@ __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv
 | 
			
		|||
#    define RGB_DISABLE_TIMEOUT 0
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if RGB_DISABLE_WHEN_USB_SUSPENDED == false
 | 
			
		||||
#if RGB_DISABLE_WHEN_USB_SUSPENDED != 1
 | 
			
		||||
#    undef RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue