megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-09-09 01:35:09 +00:00
parent d961d8df83 f3bef84dac
commit 1837d98425
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
quantum/keyboard.c
View file

@ -479,7 +479,7 @@ MATRIX_LOOP_END:
#ifdef OLED_ENABLE #ifdef OLED_ENABLE
oled_task(); oled_task();
# ifndef OLED_DISABLE_TIMEOUT # if OLED_TIMEOUT > 0
// Wake up oled if user is using those fabulous keys or spinning those encoders! // Wake up oled if user is using those fabulous keys or spinning those encoders!
# ifdef ENCODER_ENABLE # ifdef ENCODER_ENABLE
if (matrix_changed || encoders_changed) oled_on(); if (matrix_changed || encoders_changed) oled_on();
@ -491,7 +491,7 @@ MATRIX_LOOP_END:
#ifdef ST7565_ENABLE #ifdef ST7565_ENABLE
st7565_task(); st7565_task();
# ifndef ST7565_DISABLE_TIMEOUT # if ST7565_TIMEOUT > 0
// Wake up display if user is using those fabulous keys or spinning those encoders! // Wake up display if user is using those fabulous keys or spinning those encoders!
# ifdef ENCODER_ENABLE # ifdef ENCODER_ENABLE
if (matrix_changed || encoders_changed) st7565_on(); if (matrix_changed || encoders_changed) st7565_on();