Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid repeated calls to rgblight_set() in tight succession when setting lighting layers #18338

Merged
merged 8 commits into from
Nov 10, 2022
Merged

Avoid repeated calls to rgblight_set() in tight succession when setting lighting layers #18338

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1430fc2
avoid repeated calls to rgblight_set() in corner case
spidey3 Sep 11, 2022
c3ceb75
fix another case where rgblight_set() is called indirectly
spidey3 Sep 11, 2022
81ab613
simplify, and hopefully fix splits too
spidey3 Sep 11, 2022
bcb20d1
don't change where we set split sync bits
spidey3 Sep 18, 2022
5700a52
format
spidey3 Sep 18, 2022
aaaec4d
deferred_set_layer_state shouldn't be global
spidey3 Sep 18, 2022
606d2e0
Merge branch 'develop' into defer_layer_rgblight_set
spidey3 Oct 15, 2022
747c2a9
Merge branch 'develop' into defer_layer_rgblight_set
spidey3 Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions quantum/rgblight/rgblight.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ LED_TYPE led[RGBLED_NUM];

#ifdef RGBLIGHT_LAYERS
rgblight_segment_t const *const *rgblight_layers = NULL;

static bool deferred_set_layer_state = false;
#endif

rgblight_ranges_t rgblight_ranges = {0, RGBLED_NUM, 0, RGBLED_NUM, RGBLED_NUM};
Expand Down Expand Up @@ -748,17 +750,13 @@ void rgblight_set_layer_state(uint8_t layer, bool enabled) {
rgblight_status.enabled_layer_mask &= ~mask;
}
RGBLIGHT_SPLIT_SET_CHANGE_LAYERS;
// Static modes don't have a ticker running to update the LEDs
if (rgblight_status.timer_enabled == false) {
rgblight_mode_noeeprom(rgblight_config.mode);
}

# ifdef RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
// If not enabled, then nothing else will actually set the LEDs...
if (!rgblight_config.enable) {
rgblight_set();
}
# endif
// Calling rgblight_set() here (directly or indirectly) could
// potentially cause timing issues when there are multiple
// successive calls to rgblight_set_layer_state(). Instead,
// set a flag and do it the next time rgblight_task() runs.

deferred_set_layer_state = true;
}

bool rgblight_get_layer_state(uint8_t layer) {
Expand Down Expand Up @@ -1154,8 +1152,26 @@ void rgblight_task(void) {
}
}

# ifdef RGBLIGHT_LAYER_BLINK
# ifdef RGBLIGHT_LAYERS
# ifdef RGBLIGHT_LAYER_BLINK
rgblight_blink_layer_repeat_helper();
# endif

if (deferred_set_layer_state) {
deferred_set_layer_state = false;

// Static modes don't have a ticker running to update the LEDs
if (rgblight_status.timer_enabled == false) {
rgblight_mode_noeeprom(rgblight_config.mode);
}

# ifdef RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
// If not enabled, then nothing else will actually set the LEDs...
if (!rgblight_config.enable) {
rgblight_set();
}
# endif
}
# endif
}

Expand Down