🐛 Fix STM32 delay, double reset in FSMC TFT init (#22584)

MarlinFirmware · Aug 19, 2021 · bb12ebc · bb12ebc
1 parent 2e14bf1
commit bb12ebc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
@@ -36,16 +36,6 @@ LCD_CONTROLLER_TypeDef *TFT_FSMC::LCD;
 
 void TFT_FSMC::Init() {
   uint32_t controllerAddress;
-
-  #if PIN_EXISTS(TFT_RESET)
-    OUT_WRITE(TFT_RESET_PIN, HIGH);
-    HAL_Delay(100);
-  #endif
-
-  #if PIN_EXISTS(TFT_BACKLIGHT)
-    OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
-  #endif
-
   FSMC_NORSRAM_TimingTypeDef Timing, ExtTiming;
 
   uint32_t NSBank = (uint32_t)pinmap_peripheral(digitalPinToPinName(TFT_CS_PIN), PinMap_FSMC_CS);

diff --git a/Marlin/src/lcd/tft_io/tft_io.cpp b/Marlin/src/lcd/tft_io/tft_io.cpp
@@ -65,13 +65,13 @@ if (lcd_id != 0xFFFFFFFF) return;
   #if PIN_EXISTS(TFT_RESET)
     OUT_WRITE(TFT_RESET_PIN, HIGH);
     delay(10);
-    OUT_WRITE(TFT_RESET_PIN, LOW);
+    WRITE(TFT_RESET_PIN, LOW);
     delay(10);
-    OUT_WRITE(TFT_RESET_PIN, HIGH);
+    WRITE(TFT_RESET_PIN, HIGH);
   #endif
 
   #if PIN_EXISTS(TFT_BACKLIGHT)
-    OUT_WRITE(TFT_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT));
+    WRITE(TFT_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT));
   #endif
 
   // io.Init();
@@ -149,7 +149,7 @@ if (lcd_id != 0xFFFFFFFF) return;
   #endif
 
   #if PIN_EXISTS(TFT_BACKLIGHT) && ENABLED(DELAYED_BACKLIGHT_INIT)
-    OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
+    WRITE(TFT_BACKLIGHT_PIN, HIGH);
   #endif
 }