merge changes from master

This commit is contained in:
Carey 2020-10-20 21:47:49 -05:00
parent 26057c0200
commit 6aae667826

View file

@ -13,6 +13,15 @@ config USB_DEVICE_PRODUCT
config BT_DEVICE_NAME config BT_DEVICE_NAME
default ZMK_KEYBOARD_NAME default ZMK_KEYBOARD_NAME
config USB_DEVICE_VID
default 0x1D50
config USB_DEVICE_PID
default 0x615E
config USB_DEVICE_MANUFACTURER
default "ZMK Project"
menu "HID Output Types" menu "HID Output Types"
config ZMK_USB config ZMK_USB
@ -187,6 +196,10 @@ config ZMK_RGB_UNDERGLOW
if ZMK_RGB_UNDERGLOW if ZMK_RGB_UNDERGLOW
# This default value cuts down on tons of excess .conf files, if you're using GPIO, manually disable this
config SPI
default y
config ZMK_RGB_UNDERGLOW_HUE_STEP config ZMK_RGB_UNDERGLOW_HUE_STEP
int "RGB underglow hue step in degrees of 360" int "RGB underglow hue step in degrees of 360"
default 10 default 10
@ -199,6 +212,30 @@ config ZMK_RGB_UNDERGLOW_BRT_STEP
int "RGB underglow brightness step in percent" int "RGB underglow brightness step in percent"
default 10 default 10
config ZMK_RGB_UNDERGLOW_HUE_START
int "RGB underglow start hue value from 0-359"
default 0
config ZMK_RGB_UNDERGLOW_SAT_START
int "RGB underglow start saturations value from 0-100"
default 100
config ZMK_RGB_UNDERGLOW_BRT_START
int "RGB underglow start brightness value from 0-100"
default 100
config ZMK_RGB_UNDERGLOW_SPD_START
int "RGB underglow start animation speed value from 1-5"
default 3
config ZMK_RGB_UNDERGLOW_EFF_START
int "RGB underglow start effect int value related to the effect enum list"
default 0
config ZMK_RGB_UNDERGLOW_ON_START
bool "Whether RGB underglow starts on by default"
default y
#ZMK_RGB_UNDERGLOW #ZMK_RGB_UNDERGLOW
endif endif