From 3f937a62762a81484d2e4b91a21e8ab6cad30eae Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 18 Nov 2021 19:27:03 -0600
Subject: [PATCH] brightness before backlight

---
 Marlin/src/lcd/tft/touch.cpp           | 12 ++++++++----
 Marlin/src/lcd/touch/touch_buttons.cpp | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index 94f402176051e..7f506c4fac0d9 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -287,15 +287,19 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
 #if HAS_TOUCH_SLEEP
 
   void Touch::sleepTimeout() {
-    #if PIN_EXISTS(TFT_BACKLIGHT)
-      TERN(HAS_LCD_BRIGHTNESS, ui.set_brightness(0), OUT_WRITE(TFT_BACKLIGHT_PIN, LOW));
+    #if HAS_LCD_BRIGHTNESS
+      ui.set_brightness(0);
+    #elif PIN_EXISTS(TFT_BACKLIGHT)
+      WRITE(TFT_BACKLIGHT_PIN, LOW);
     #endif
     next_sleep_ms = TSLP_SLEEPING;
   }
   void Touch::wakeUp() {
     if (isSleeping()) {
-      #if PIN_EXISTS(TFT_BACKLIGHT)
-        TERN(HAS_LCD_BRIGHTNESS, ui.set_brightness(ui.brightness), WRITE(TFT_BACKLIGHT_PIN, HIGH));
+      #if HAS_LCD_BRIGHTNESS
+        ui.set_brightness(0);
+      #elif PIN_EXISTS(TFT_BACKLIGHT)
+        WRITE(TFT_BACKLIGHT_PIN, HIGH);
       #endif
     }
     next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP);
diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
index 2658999156422..2c0bea3919170 100644
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -115,15 +115,19 @@ uint8_t TouchButtons::read_buttons() {
 #if HAS_TOUCH_SLEEP
 
   void TouchButtons::sleepTimeout() {
-    #if PIN_EXISTS(TFT_BACKLIGHT)
-      TERN(HAS_LCD_BRIGHTNESS, ui.set_brightness(0), OUT_WRITE(TFT_BACKLIGHT_PIN, LOW));
+    #if HAS_LCD_BRIGHTNESS
+      ui.set_brightness(0);
+    #elif PIN_EXISTS(TFT_BACKLIGHT)
+      WRITE(TFT_BACKLIGHT_PIN, LOW);
     #endif
     next_sleep_ms = TSLP_SLEEPING;
   }
   void TouchButtons::wakeUp() {
     if (isSleeping()) {
-      #if PIN_EXISTS(TFT_BACKLIGHT)
-        TERN(HAS_LCD_BRIGHTNESS, ui.set_brightness(ui.brightness), WRITE(TFT_BACKLIGHT_PIN, HIGH));
+      #if HAS_LCD_BRIGHTNESS
+        ui.set_brightness(0);
+      #elif PIN_EXISTS(TFT_BACKLIGHT)
+        WRITE(TFT_BACKLIGHT_PIN, HIGH);
       #endif
     }
     next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP);