diff options
| author | Patrick Stadler <patrick.stadler@gmail.com> | 2021-07-22 08:46:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 23:46:12 -0700 |
| commit | fb9a254a432e307e82c9dce45e1aba2cf21fa339 (patch) | |
| tree | e4fc4e5464764d421d89ad0e6189a77e03d68851 /quantum/rgblight/rgblight.c | |
| parent | 85128302c83b7d8b2525f371c96b46ae79aac801 (diff) | |
| download | qmk_firmware-fb9a254a432e307e82c9dce45e1aba2cf21fa339.tar.gz qmk_firmware-fb9a254a432e307e82c9dce45e1aba2cf21fa339.zip | |
Retain brightness with lighting layers (#13025)
Add guard `RGBLIGHT_LAYERS_RETAIN_VAL` to retain the currently used val
when applying lighting layers.
Diffstat (limited to 'quantum/rgblight/rgblight.c')
| -rw-r--r-- | quantum/rgblight/rgblight.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c index 54face173..373dc08d3 100644 --- a/quantum/rgblight/rgblight.c +++ b/quantum/rgblight/rgblight.c | |||
| @@ -694,6 +694,9 @@ bool rgblight_get_layer_state(uint8_t layer) { | |||
| 694 | 694 | ||
| 695 | // Write any enabled LED layers into the buffer | 695 | // Write any enabled LED layers into the buffer |
| 696 | static void rgblight_layers_write(void) { | 696 | static void rgblight_layers_write(void) { |
| 697 | # ifdef RGBLIGHT_LAYERS_RETAIN_VAL | ||
| 698 | uint8_t current_val = rgblight_get_val(); | ||
| 699 | # endif | ||
| 697 | uint8_t i = 0; | 700 | uint8_t i = 0; |
| 698 | // For each layer | 701 | // For each layer |
| 699 | for (const rgblight_segment_t *const *layer_ptr = rgblight_layers; i < RGBLIGHT_MAX_LAYERS; layer_ptr++, i++) { | 702 | for (const rgblight_segment_t *const *layer_ptr = rgblight_layers; i < RGBLIGHT_MAX_LAYERS; layer_ptr++, i++) { |
| @@ -714,7 +717,11 @@ static void rgblight_layers_write(void) { | |||
| 714 | // Write segment.count LEDs | 717 | // Write segment.count LEDs |
| 715 | LED_TYPE *const limit = &led[MIN(segment.index + segment.count, RGBLED_NUM)]; | 718 | LED_TYPE *const limit = &led[MIN(segment.index + segment.count, RGBLED_NUM)]; |
| 716 | for (LED_TYPE *led_ptr = &led[segment.index]; led_ptr < limit; led_ptr++) { | 719 | for (LED_TYPE *led_ptr = &led[segment.index]; led_ptr < limit; led_ptr++) { |
| 720 | # ifdef RGBLIGHT_LAYERS_RETAIN_VAL | ||
| 721 | sethsv(segment.hue, segment.sat, current_val, led_ptr); | ||
| 722 | # else | ||
| 717 | sethsv(segment.hue, segment.sat, segment.val, led_ptr); | 723 | sethsv(segment.hue, segment.sat, segment.val, led_ptr); |
| 724 | # endif | ||
| 718 | } | 725 | } |
| 719 | segment_ptr++; | 726 | segment_ptr++; |
| 720 | } | 727 | } |
