From da81e5c7cd700cdb3ecd750ae8044f514fb65ca2 Mon Sep 17 00:00:00 2001
From: JayceFayne <13365789+JayceFayne@users.noreply.github.com>
Date: Thu, 9 Sep 2021 03:34:34 +0200
Subject: [PATCH 1/2] `OLED TIMEOUT 0` and `OLED_DISABLE_TIMEOUT` should behave
 the same (#14302)

---
 quantum/keyboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 473306c65dc..6cfbee3e0b9 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();

From f3bef84dace5d1d938f9d02be644bf421a4a3de1 Mon Sep 17 00:00:00 2001
From: JayceFayne <13365789+JayceFayne@users.noreply.github.com>
Date: Thu, 9 Sep 2021 03:34:49 +0200
Subject: [PATCH 2/2] `ST7565_TIMEOUT 0` and `ST7565_DISABLE_TIMEOUT` should
 behave the same (#14315)

---
 quantum/keyboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 6cfbee3e0b9..b98fc64e453 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -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();