Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
1837d98425
1 changed files with 2 additions and 2 deletions
|
@ -479,7 +479,7 @@ MATRIX_LOOP_END:
|
|||
|
||||
#ifdef OLED_ENABLE
|
||||
oled_task();
|
||||
# ifndef OLED_DISABLE_TIMEOUT
|
||||
# if OLED_TIMEOUT > 0
|
||||
// Wake up oled if user is using those fabulous keys or spinning those encoders!
|
||||
# ifdef ENCODER_ENABLE
|
||||
if (matrix_changed || encoders_changed) oled_on();
|
||||
|
@ -491,7 +491,7 @@ MATRIX_LOOP_END:
|
|||
|
||||
#ifdef ST7565_ENABLE
|
||||
st7565_task();
|
||||
# ifndef ST7565_DISABLE_TIMEOUT
|
||||
# if ST7565_TIMEOUT > 0
|
||||
// Wake up display if user is using those fabulous keys or spinning those encoders!
|
||||
# ifdef ENCODER_ENABLE
|
||||
if (matrix_changed || encoders_changed) st7565_on();
|
||||
|
|
Loading…
Reference in a new issue