summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-16 02:00:50 +0000
committerQMK Bot <hello@qmk.fm>2021-10-16 02:00:50 +0000
commit36fc46ead7e9c3231b1223eb7945152aab705993 (patch)
treeadcad853cee9721dc873f3e351c33980c6730688 /users
parent83e978da1fba4cfbb76dc22e05aa656dba8c1c3e (diff)
parent8bb1fd04d4d4501a7bc1312e10d1fa639851fd8f (diff)
downloadqmk_firmware-36fc46ead7e9c3231b1223eb7945152aab705993.tar.gz
qmk_firmware-36fc46ead7e9c3231b1223eb7945152aab705993.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users')
-rw-r--r--users/stanrc85/rgblight_layers_osa.c4
-rw-r--r--users/stanrc85/rules.mk1
2 files changed, 3 insertions, 2 deletions
diff --git a/users/stanrc85/rgblight_layers_osa.c b/users/stanrc85/rgblight_layers_osa.c
index 59366fa34a..aff96c9699 100644
--- a/users/stanrc85/rgblight_layers_osa.c
+++ b/users/stanrc85/rgblight_layers_osa.c
@@ -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(
{2, 2, HSV_GREEN},
{6, 2, HSV_GREEN}
-);
+);
const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
{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) {
- //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(C6, middle);
writePin(B6, bottom);
diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk
index cafda97b1a..d17f2df007 100644
--- a/users/stanrc85/rules.mk
+++ b/users/stanrc85/rules.mk
@@ -26,6 +26,7 @@ endif
ifeq ($(strip $(KEYBOARD)), tkc/osav2)
SRC += rgblight_layers_osa.c
VELOCIKEY_ENABLE=yes
+ SRC += rgb_timeout.c
endif
ifeq ($(strip $(KEYBOARD)), boardsource/the_mark)
RGB_MATRIX_ENABLE = yes