diff options
| author | QMK Bot <hello@qmk.fm> | 2022-04-21 16:34:10 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-04-21 16:34:10 +0000 |
| commit | bcb7e471d5f2f341f8ffbb26b0ebfd4da58cd2bb (patch) | |
| tree | 2a0fa6421efb6eae796cb70cda189de73ef973ee /quantum | |
| parent | f3ce93fe004da7027ecc244e17626dffc8758294 (diff) | |
| parent | 1e389c7904e42df36d8a2f64b315b83f70aa9b60 (diff) | |
| download | qmk_firmware-bcb7e471d5f2f341f8ffbb26b0ebfd4da58cd2bb.tar.gz qmk_firmware-bcb7e471d5f2f341f8ffbb26b0ebfd4da58cd2bb.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/rgblight/rgblight.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c index dc5757cb00..cc856a0e86 100644 --- a/quantum/rgblight/rgblight.c +++ b/quantum/rgblight/rgblight.c @@ -844,18 +844,19 @@ void rgblight_unblink_all_but_layer(uint8_t layer) { void rgblight_blink_layer_repeat_helper(void) { if (_blinking_layer_mask != 0 && timer_expired(sync_timer_read(), _repeat_timer)) { for (uint8_t layer = 0; layer < RGBLIGHT_MAX_LAYERS; layer++) { - if ((_blinking_layer_mask & (rgblight_layer_mask_t)1 << layer) != 0 && _times_remaining > 0) { + if ((_blinking_layer_mask & (rgblight_layer_mask_t)1 << layer) != 0) { if (_times_remaining % 2 == 1) { rgblight_set_layer_state(layer, false); } else { rgblight_set_layer_state(layer, true); } - _times_remaining--; - _repeat_timer = sync_timer_read() + _dur; } } + _times_remaining--; if (_times_remaining <= 0) { _blinking_layer_mask = 0; + } else { + _repeat_timer = sync_timer_read() + _dur; } } } |