Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		@@ -28,22 +28,16 @@ ifeq ($(strip $(KEYBOARD)), tkc/osav2)
 | 
				
			|||||||
  VELOCIKEY_ENABLE=yes
 | 
					  VELOCIKEY_ENABLE=yes
 | 
				
			||||||
  SRC += rgb_timeout.c
 | 
					  SRC += rgb_timeout.c
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
ifeq ($(strip $(KEYBOARD)), boardsource/the_mark)
 | 
					 | 
				
			||||||
  RGB_MATRIX_ENABLE = yes
 | 
					 | 
				
			||||||
  RGBLIGHT_ENABLE = no
 | 
					 | 
				
			||||||
endif
 | 
					 | 
				
			||||||
ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
 | 
					ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
 | 
				
			||||||
  BACKLIGHT_ENABLE = yes
 | 
					  BACKLIGHT_ENABLE = yes
 | 
				
			||||||
  RGB_MATRIX_ENABLE = yes
 | 
					  RGB_MATRIX_ENABLE = yes
 | 
				
			||||||
  RGBLIGHT_ENABLE = no
 | 
					  RGBLIGHT_ENABLE = no
 | 
				
			||||||
  SRC += rgb_layers.c
 | 
					  SRC += rgb_layers.c
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
ifeq ($(strip $(KEYBOARD)), tkc/portico)
 | 
					 | 
				
			||||||
  SRC += rgb_timeout.c
 | 
					 | 
				
			||||||
endif
 | 
					 | 
				
			||||||
ifeq ($(strip $(KEYBOARD)), kiwikey/wanderland)
 | 
					 | 
				
			||||||
  SRC += rgb_timeout.c
 | 
					 | 
				
			||||||
endif
 | 
					 | 
				
			||||||
ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/rgb_led/rev2)
 | 
					ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/rgb_led/rev2)
 | 
				
			||||||
  SRC += rgb_layers.c
 | 
					  SRC += rgb_layers.c
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/standard_led/arm/rev4/stm32f303)
 | 
				
			||||||
 | 
					  SRC += rgb_timeout.c
 | 
				
			||||||
 | 
					  SRC += layer_rgb.c
 | 
				
			||||||
 | 
					endif
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user