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

layouts/community/split_3x6_3/bcat/config.h

@@ -16,16 +16,9 @@
 
 #pragma once
 
-#if defined(KEYBOARD_crkbd_rev1_common) || defined(KEYBOARD_crkbd_rev1_legacy)
+#if defined(KEYBOARD_crkbd_rev1)
 #    define EE_HANDS
 
-#    if defined(RGBLIGHT_ENABLE)
-/* Configure RGB for underglow only (first six LEDs on each side). */
-#        undef RGBLED_SPLIT
-#        define RGBLED_SPLIT \
-            { 6, 6 }
-#    endif
-
 #    if defined(RGB_MATRIX_ENABLE)
 /* Limit max RGB LED current to avoid tripping controller fuse. */
 #        undef RGB_MATRIX_MAXIMUM_BRIGHTNESS

layouts/community/split_3x6_3/bcat/rules.mk

@@ -1,9 +1,4 @@
-ifeq ($(strip $(KEYBOARD)), crkbd/rev1/common)
-	BOOTLOADER = atmel-dfu  # Elite-C
-
-	# Enable underglow only. (Split Common doesn't support RGB matrix on slave.)
-	RGBLIGHT_ENABLE = yes
-else ifeq ($(strip $(KEYBOARD)), crkbd/rev1/legacy)
+ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
 	BOOTLOADER = atmel-dfu  # Elite-C
 
 	RGB_MATRIX_ENABLE = yes  # per-key RGB and underglow