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 /quantum | |
| parent | d961d8df834876215e56bed52e89565f70768c0d (diff) | |
| parent | f3bef84dace5d1d938f9d02be644bf421a4a3de1 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
| -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 473306c65d..b98fc64e45 100644 --- a/quantum/keyboard.c +++ b/quantum/keyboard.c @@ -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(); |