Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
17f51fa9df
2 changed files with 2 additions and 14 deletions
|
@ -16,16 +16,9 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#if defined(KEYBOARD_crkbd_rev1_common) || defined(KEYBOARD_crkbd_rev1_legacy)
|
#if defined(KEYBOARD_crkbd_rev1)
|
||||||
# define EE_HANDS
|
# 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)
|
# if defined(RGB_MATRIX_ENABLE)
|
||||||
/* Limit max RGB LED current to avoid tripping controller fuse. */
|
/* Limit max RGB LED current to avoid tripping controller fuse. */
|
||||||
# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||||
|
|
|
@ -1,9 +1,4 @@
|
||||||
ifeq ($(strip $(KEYBOARD)), crkbd/rev1/common)
|
ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
|
||||||
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)
|
|
||||||
BOOTLOADER = atmel-dfu # Elite-C
|
BOOTLOADER = atmel-dfu # Elite-C
|
||||||
|
|
||||||
RGB_MATRIX_ENABLE = yes # per-key RGB and underglow
|
RGB_MATRIX_ENABLE = yes # per-key RGB and underglow
|
||||||
|
|
Loading…
Reference in a new issue