Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
2c5ceccc5a
2 changed files with 4 additions and 4 deletions
|
@ -129,7 +129,7 @@ RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
|
||||||
//----------------------------------------------------------
|
//----------------------------------------------------------
|
||||||
// UI Placeholder, implemented in themes
|
// UI Placeholder, implemented in themes
|
||||||
|
|
||||||
__attribute__((weak)) void draw_ui_user(void) {}
|
__attribute__((weak)) void draw_ui_user(bool force_redraw) {}
|
||||||
|
|
||||||
//----------------------------------------------------------
|
//----------------------------------------------------------
|
||||||
// Housekeeping
|
// Housekeeping
|
||||||
|
@ -223,7 +223,7 @@ void housekeeping_task_kb(void) {
|
||||||
|
|
||||||
// Draw the UI
|
// Draw the UI
|
||||||
if (kb_state.lcd_power) {
|
if (kb_state.lcd_power) {
|
||||||
draw_ui_user();
|
draw_ui_user(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Go into low-scan interrupt-based mode if we haven't had any matrix activity in the last 250 milliseconds
|
// Go into low-scan interrupt-based mode if we haven't had any matrix activity in the last 250 milliseconds
|
||||||
|
|
|
@ -89,8 +89,8 @@ void keyboard_post_init_display(void) {
|
||||||
|
|
||||||
//----------------------------------------------------------
|
//----------------------------------------------------------
|
||||||
// UI Drawing
|
// UI Drawing
|
||||||
void draw_ui_user(void) {
|
void draw_ui_user(bool force_redraw) {
|
||||||
bool hue_redraw = false;
|
bool hue_redraw = force_redraw;
|
||||||
static uint16_t last_hue = 0xFFFF;
|
static uint16_t last_hue = 0xFFFF;
|
||||||
#if defined(RGB_MATRIX_ENABLE)
|
#if defined(RGB_MATRIX_ENABLE)
|
||||||
uint16_t curr_hue = rgb_matrix_get_hue();
|
uint16_t curr_hue = rgb_matrix_get_hue();
|
||||||
|
|
Loading…
Reference in a new issue