From 14b4bf5fa5dd8906ea89895470b1ad1f56f1248f Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 10 Feb 2021 16:18:47 +0100
Subject: [PATCH] Add CLOCK_INTERVAL_TIME and ShortTimer IntervalTimer

---
 Firmware/Configuration_adv.h |  6 ++++++
 Firmware/ultralcd.cpp        | 16 +++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h
index 7a9a4929a..8895eef68 100644
--- a/Firmware/Configuration_adv.h
+++ b/Firmware/Configuration_adv.h
@@ -338,6 +338,12 @@ const unsigned int dropsegments=5; //everything with less than this number of st
 // Control heater 0 and heater 1 in parallel.
 //#define HEATERS_PARALLEL
 
+//LCD status clock interval timer to switch between
+// print time
+// remaining print time
+// and time to change/pause/interaction
+#define CLOCK_INTERVAL_TIME 5000
+
 //===========================================================================
 //=============================Buffers           ============================
 //===========================================================================
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 057d7dea9..98f4dccd4 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -673,6 +673,7 @@ void lcdui_print_time(void)
 {
     //if remaining print time estimation is available print it else print elapsed time
     int chars = 0;
+    ShortTimer IntervalTimer;
     if ((PRINTER_ACTIVE) && (starttime != 0))
     {
         uint16_t print_t = 0;
@@ -708,17 +709,18 @@ void lcdui_print_time(void)
         }
         #endif //TMC2130
 
-        if (print_tc != 0)
-        {
-            print_t = print_tc;
-            suff = 'C';
-        }
-        else if (print_tr != 0)
+        if (print_tr != 0)
         {
             print_t = print_tr;
             suff = 'R';
         }
-        else
+        else if (print_tc != 0)
+        {
+            print_t = print_tc;
+            suff = 'C';
+        }
+
+        if (print_tr == 0)
         {
             print_t = _millis() / 60000 - starttime / 60000; 
         }