diff options
| author | QMK Bot <hello@qmk.fm> | 2021-09-09 01:35:09 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-09-09 01:35:09 +0000 |
| commit | 1837d98425006611f70691a19689e0a970c981ae (patch) | |
| tree | 2dcf7dc32e67eaebf29db15fb3a77d055dc2d2e0 | |
| parent | d961d8df834876215e56bed52e89565f70768c0d (diff) | |
| parent | f3bef84dace5d1d938f9d02be644bf421a4a3de1 (diff) | |
| download | qmk_firmware-1837d98425006611f70691a19689e0a970c981ae.tar.gz qmk_firmware-1837d98425006611f70691a19689e0a970c981ae.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | quantum/keyboard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quantum/keyboard.c b/quantum/keyboard.c index 473306c65..b98fc64e4 100644 --- a/quantum/keyboard.c +++ b/quantum/keyboard.c | |||
| @@ -479,7 +479,7 @@ MATRIX_LOOP_END: | |||
| 479 | 479 | ||
| 480 | #ifdef OLED_ENABLE | 480 | #ifdef OLED_ENABLE |
| 481 | oled_task(); | 481 | oled_task(); |
| 482 | # ifndef OLED_DISABLE_TIMEOUT | 482 | # if OLED_TIMEOUT > 0 |
| 483 | // Wake up oled if user is using those fabulous keys or spinning those encoders! | 483 | // Wake up oled if user is using those fabulous keys or spinning those encoders! |
| 484 | # ifdef ENCODER_ENABLE | 484 | # ifdef ENCODER_ENABLE |
| 485 | if (matrix_changed || encoders_changed) oled_on(); | 485 | if (matrix_changed || encoders_changed) oled_on(); |
| @@ -491,7 +491,7 @@ MATRIX_LOOP_END: | |||
| 491 | 491 | ||
| 492 | #ifdef ST7565_ENABLE | 492 | #ifdef ST7565_ENABLE |
| 493 | st7565_task(); | 493 | st7565_task(); |
| 494 | # ifndef ST7565_DISABLE_TIMEOUT | 494 | # if ST7565_TIMEOUT > 0 |
| 495 | // Wake up display if user is using those fabulous keys or spinning those encoders! | 495 | // Wake up display if user is using those fabulous keys or spinning those encoders! |
| 496 | # ifdef ENCODER_ENABLE | 496 | # ifdef ENCODER_ENABLE |
| 497 | if (matrix_changed || encoders_changed) st7565_on(); | 497 | if (matrix_changed || encoders_changed) st7565_on(); |