Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						25f1c242f8
					
				
					 3 changed files with 75 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -2,7 +2,6 @@ TAP_DANCE_ENABLE = yes
 | 
			
		|||
EXTRAKEY_ENABLE = yes
 | 
			
		||||
BACKLIGHT_ENABLE = no
 | 
			
		||||
COMMAND_ENABLE = no
 | 
			
		||||
BOOTMAGIC_ENABLE = no
 | 
			
		||||
MOUSEKEY_ENABLE = no
 | 
			
		||||
AUDIO_ENABLE = no
 | 
			
		||||
CONSOLE_ENABLE = no
 | 
			
		||||
| 
						 | 
				
			
			@ -31,4 +30,9 @@ endif
 | 
			
		|||
ifeq ($(strip $(KEYBOARD)), boardsource/the_mark)
 | 
			
		||||
  RGB_MATRIX_ENABLE = yes
 | 
			
		||||
  RGBLIGHT_ENABLE = no
 | 
			
		||||
endif
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
 | 
			
		||||
  BACKLIGHT_ENABLE = yes
 | 
			
		||||
  RGB_MATRIX_ENABLE = yes
 | 
			
		||||
  RGBLIGHT_ENABLE = no
 | 
			
		||||
endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue