From fcd7ffda3c6044671a01b31447461a214c65de00 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Thu, 15 Aug 2024 02:21:50 +0200
Subject: [PATCH] fix(bw): initial wait delay in SPI LCD (#5433)

---
 radio/src/targets/taranis/lcd_driver_aspi.cpp | 9 ++++-----
 radio/src/targets/taranis/lcd_driver_spi.cpp  | 8 +++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/radio/src/targets/taranis/lcd_driver_aspi.cpp b/radio/src/targets/taranis/lcd_driver_aspi.cpp
index 7d100c4d2..c8d8b5175 100644
--- a/radio/src/targets/taranis/lcd_driver_aspi.cpp
+++ b/radio/src/targets/taranis/lcd_driver_aspi.cpp
@@ -24,7 +24,9 @@
 
 #include "board.h"
 #include "lcd.h"
+
 #include "hal/abnormal_reboot.h"
+#include "timers_driver.h"
 
 #if !defined(BOOT)
 #include "myeeprom.h"
@@ -274,11 +276,8 @@ void lcdInitFinish()
   */
 
   if (!WAS_RESET_BY_WATCHDOG_OR_SOFTWARE()) {
-#if !defined(BOOT)
-    while (g_tmr10ms < (RESET_WAIT_DELAY_MS/10)); // Wait measured from the power-on
-#else
-    delay_ms(RESET_WAIT_DELAY_MS);
-#endif
+    // wait measured from the power-on
+    while (timersGetMsTick() < RESET_WAIT_DELAY_MS);
   }
   
   lcdStart();
diff --git a/radio/src/targets/taranis/lcd_driver_spi.cpp b/radio/src/targets/taranis/lcd_driver_spi.cpp
index 5b5d99991..fd8dcbf6e 100644
--- a/radio/src/targets/taranis/lcd_driver_spi.cpp
+++ b/radio/src/targets/taranis/lcd_driver_spi.cpp
@@ -29,6 +29,7 @@
 #include "lcd.h"
 
 #include "hal/abnormal_reboot.h"
+#include "timers_driver.h"
 
 #if !defined(BOOT)
   #include "edgetx.h"
@@ -388,11 +389,8 @@ void lcdInitFinish()
   */
 
   if (LCD_DELAY_NEEDED()) {
-#if !defined(BOOT)
-    while (g_tmr10ms < (RESET_WAIT_DELAY_MS / 10)); // wait measured from the power-on
-#else
-    delay_ms(RESET_WAIT_DELAY_MS);
-#endif
+    // wait measured from the power-on
+    while (timersGetMsTick() < RESET_WAIT_DELAY_MS);
   }
 
   lcdStart();