summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-06-03 18:40:18 +0000
committerQMK Bot <hello@qmk.fm>2021-06-03 18:40:18 +0000
commit17f51fa9df84ce48cd8c3d8cc9a52011bc5c771a (patch)
tree9c8643fd8c8d221ee9301ba024ee637d0aec51c5
parenta6f030fb42e16de594a8456efa49c3abad167a46 (diff)
parent6eb18a6ccb064c368a420fa574dd03b05cf7ca56 (diff)
downloadqmk_firmware-17f51fa9df84ce48cd8c3d8cc9a52011bc5c771a.tar.gz
qmk_firmware-17f51fa9df84ce48cd8c3d8cc9a52011bc5c771a.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--layouts/community/split_3x6_3/bcat/config.h9
-rw-r--r--layouts/community/split_3x6_3/bcat/rules.mk7
2 files changed, 2 insertions, 14 deletions
diff --git a/layouts/community/split_3x6_3/bcat/config.h b/layouts/community/split_3x6_3/bcat/config.h
index e177f0ffcb..b8743429cf 100644
--- a/layouts/community/split_3x6_3/bcat/config.h
+++ b/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
diff --git a/layouts/community/split_3x6_3/bcat/rules.mk b/layouts/community/split_3x6_3/bcat/rules.mk
index caf6ec7ece..5ee614b192 100644
--- a/layouts/community/split_3x6_3/bcat/rules.mk
+++ b/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