Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
36fc46ead7
2 changed files with 3 additions and 2 deletions
|
@ -11,7 +11,7 @@ const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||||
const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||||
{2, 2, HSV_GREEN},
|
{2, 2, HSV_GREEN},
|
||||||
{6, 2, HSV_GREEN}
|
{6, 2, HSV_GREEN}
|
||||||
);
|
);
|
||||||
|
|
||||||
const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||||
{2, 2, HSV_BLUE},
|
{2, 2, HSV_BLUE},
|
||||||
|
@ -60,7 +60,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool led_update_user(led_t led_state) {
|
bool led_update_user(led_t led_state) {
|
||||||
//rgblight_set_layer_state(0, led_state.caps_lock);
|
rgblight_set_layer_state(0, led_state.caps_lock);
|
||||||
writePin(C7, led_state.caps_lock);
|
writePin(C7, led_state.caps_lock);
|
||||||
writePin(C6, middle);
|
writePin(C6, middle);
|
||||||
writePin(B6, bottom);
|
writePin(B6, bottom);
|
||||||
|
|
|
@ -26,6 +26,7 @@ endif
|
||||||
ifeq ($(strip $(KEYBOARD)), tkc/osav2)
|
ifeq ($(strip $(KEYBOARD)), tkc/osav2)
|
||||||
SRC += rgblight_layers_osa.c
|
SRC += rgblight_layers_osa.c
|
||||||
VELOCIKEY_ENABLE=yes
|
VELOCIKEY_ENABLE=yes
|
||||||
|
SRC += rgb_timeout.c
|
||||||
endif
|
endif
|
||||||
ifeq ($(strip $(KEYBOARD)), boardsource/the_mark)
|
ifeq ($(strip $(KEYBOARD)), boardsource/the_mark)
|
||||||
RGB_MATRIX_ENABLE = yes
|
RGB_MATRIX_ENABLE = yes
|
||||||
|
|
Loading…
Reference in a new issue