Merge remote-tracking branch 'origin/master' into develop

users/stanrc85/rules.mk

@@ -28,22 +28,16 @@ ifeq ($(strip $(KEYBOARD)), tkc/osav2)
   VELOCIKEY_ENABLE=yes
   SRC += rgb_timeout.c
 endif
-ifeq ($(strip $(KEYBOARD)), boardsource/the_mark)
-  RGB_MATRIX_ENABLE = yes
-  RGBLIGHT_ENABLE = no
-endif
 ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
   BACKLIGHT_ENABLE = yes
   RGB_MATRIX_ENABLE = yes
   RGBLIGHT_ENABLE = no
   SRC += rgb_layers.c
 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)
   SRC += rgb_layers.c
 endif
+ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/standard_led/arm/rev4/stm32f303)
+  SRC += rgb_timeout.c
+  SRC += layer_rgb.c
+endif