progress display followup

Marlin/Configuration_adv.h

@@ -1434,24 +1434,26 @@
 
 #endif // HAS_DISPLAY || DWIN_LCD_PROUI
 
-// Add the G-code 'M73' to set / report the current job progress
+// Add 'M73' to set print job progress, overriding Marlin's built-in estimate
 //#define SET_PROGRESS_MANUALLY
 #if ENABLED(SET_PROGRESS_MANUALLY)
-  //#define SET_PROGRESS_PERCENT          // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
-  //#define SET_REMAINING_TIME            // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
+  #define SET_PROGRESS_PERCENT            // Add 'P' parameter to set percentage done
+  //#define SET_REMAINING_TIME            // Add 'R' parameter to set remaining time
   //#define SET_INTERACTION_TIME          // Add 'C' parameter to set time until next filament change or other user interaction
-  #if ENABLED(SET_INTERACTION_TIME)
-    #define SHOW_INTERACTION_TIME         // Display time until next user interaction ('C' = filament change)
+  //#define M73_REPORT                    // Report M73 values to host
+  #if BOTH(M73_REPORT, SDDUPPORT)
+    #define M73_REPORT_SD_ONLY            // Report only when printing from SD
   #endif
-  //#define M73_REPORT                    // Report progress to host with 'M73'
 #endif
 
-// LCD Print Progress options, multiple can be rotated depending on screen layout
+// LCD Print Progress options. Multiple times may be displayed in turn.
 #if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
   #define SHOW_PROGRESS_PERCENT           // Show print progress percentage (doesn't affect progress bar)
   #define SHOW_ELAPSED_TIME               // Display elapsed printing time (prefix 'E')
   //#define SHOW_REMAINING_TIME           // Display estimated time to completion (prefix 'R')
-
+  #if ENABLED(SET_INTERACTION_TIME)
+    #define SHOW_INTERACTION_TIME         // Display time until next user interaction ('C' = filament change)
+  #endif
   //#define PRINT_PROGRESS_SHOW_DECIMALS  // Show/report progress with decimal digits, not all UIs support this
 
   #if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)

Marlin/src/gcode/lcd/M73.cpp

@@ -79,19 +79,19 @@ void GcodeSuite::M73() {
   #endif
 
   #if ENABLED(M73_REPORT)
-  {
-    SERIAL_ECHO_MSG(
-        TERN(M73_REPORT_PRUSA, "M73 Percent done: ", "Progress: ")
-      , TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui.get_progress_percent())
-      #if ENABLED(SET_REMAINING_TIME)
-        , TERN(M73_REPORT_PRUSA, "; Print time remaining in mins: ", "%; Time left: "), ui.remaining_time / 60
-      #endif
-      #if ENABLED(SET_INTERACTION_TIME)
-        , TERN(M73_REPORT_PRUSA, "; Change in mins: ", "m; Change: "), ui.interaction_time / 60
-      #endif
-      , TERN(M73_REPORT_PRUSA, ";", "m")
-    );
-  }
+    if (TERN1(M73_REPORT_SD_ONLY, IS_SD_PRINTING)) {
+      SERIAL_ECHO_MSG(
+          TERN(M73_REPORT_PRUSA, "M73 Percent done: ", "Progress: ")
+        , TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui.get_progress_percent())
+        #if ENABLED(SET_REMAINING_TIME)
+          , TERN(M73_REPORT_PRUSA, "; Print time remaining in mins: ", "%; Time left: "), ui.remaining_time / 60
+        #endif
+        #if ENABLED(SET_INTERACTION_TIME)
+          , TERN(M73_REPORT_PRUSA, "; Change in mins: ", "m; Change: "), ui.interaction_time / 60
+        #endif
+        , TERN(M73_REPORT_PRUSA, ";", "m")
+      );
+    }
   #endif
 }
 

Marlin/src/lcd/HD44780/marlinui_HD44780.cpp

@@ -722,7 +722,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 #if HAS_PRINT_PROGRESS
   #define TPOFFSET (LCD_WIDTH - 1)
   static uint8_t timepos = TPOFFSET - 6;
-  static char buffer[14];
+  static char buffer[8];
   static lcd_uint_t pc, pr;
 
   #if ENABLED(SHOW_PROGRESS_PERCENT)
@@ -863,7 +863,7 @@ void MarlinUI::draw_status_screen() {
       #if LCD_WIDTH < 20
 
         #if HAS_PRINT_PROGRESS
-          pc = 0, pr = 2;
+          pc = 0; pr = 2;
           rotate_progress();
         #endif
 
@@ -950,14 +950,14 @@ void MarlinUI::draw_status_screen() {
       #if LCD_WIDTH >= 20
 
         #if HAS_PRINT_PROGRESS
-          pc = timepos - 7, pr = 2;
+          pc = 6; pr = 2;
           rotate_progress();
         #else
           char c;
           uint16_t per;
           #if HAS_FAN0
             if (true
-              #if EXTRUDERS && ENABLED(ADAPTIVE_FAN_SLOWING)
+              #if BOTH(HAS_EXTRUDERS, ADAPTIVE_FAN_SLOWING)
                 && (blink || thermalManager.fan_speed_scaler[0] < 128)
               #endif
             ) {
@@ -1031,15 +1031,15 @@ void MarlinUI::draw_status_screen() {
       _draw_bed_status(blink);
     #elif HAS_PRINT_PROGRESS
       #define DREW_PRINT_PROGRESS 1
-      pc = 0, pr = 2;
+      pc = 0; pr = 2;
       rotate_progress();
     #endif
 
     //
     // All progress strings
     //
     #if HAS_PRINT_PROGRESS && !DREW_PRINT_PROGRESS
-      pc = LCD_WIDTH - 9, pr = 2;
+      pc = LCD_WIDTH - 9; pr = 2;
       rotate_progress();
     #endif
   #endif // LCD_INFO_SCREEN_STYLE 1

Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp

@@ -810,6 +810,8 @@ void MarlinUI::draw_status_screen() {
     _draw_print_progress();
   #endif
 
+  // TODO!
+
   char buffer[10];
   duration_t elapsed = print_job_timer.duration();
   uint8_t len = elapsed.toDigital(buffer);

Marlin/src/lcd/dogm/status_screen_DOGM.cpp

@@ -447,46 +447,53 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 #if HAS_PRINT_PROGRESS
   #define _PRGR_INFO_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH))
   #define PCENTERED 1  // center percent value over progress bar, else align to the right
-  static uint8_t lastProgress = 0xFF;
-  static u8g_uint_t progress_bar_solid_width = 0;
+
+  static MarlinUI::progress_t progress = 0;
+
   #if ENABLED(SHOW_PROGRESS_PERCENT)
-    static char progress_string[5];
-    static u8g_uint_t progress_x_pos;
     void MarlinUI::drawPercent() {
-      if (progress_string[0]) {
-        lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string);
+      if (progress != 0) {
+        char bufferc[13];
+        strcpy(bufferc, TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))));
+        const u8g_uint_t strxpos = TERN(PCENTERED, 77, _PRGR_INFO_X(strlen(bufferc) + 1));
+        lcd_put_u8str(strxpos, EXTRAS_BASELINE, bufferc);
         lcd_put_lchar('%');
       }
     }
   #endif
   #if ENABLED(SHOW_REMAINING_TIME)
-    static char remaining_string[10];
-    static u8g_uint_t remaining_x_pos = 0;
     void MarlinUI::drawRemain() {
-      if (printJobOngoing()){
+      if (printJobOngoing()) {
+        const duration_t buffert = ui.get_remaining_time();
+        char bufferc[13];
+        const uint8_t len = buffert.toDigital(bufferc, buffert.value >= 60*60*24L);
+        const u8g_uint_t strxpos = _PRGR_INFO_X(len);
         lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("R:"));
-        lcd_put_u8str(remaining_x_pos, EXTRAS_BASELINE, remaining_string);
+        lcd_put_u8str(strxpos, EXTRAS_BASELINE, bufferc);
       }
     }
   #endif
   #if ENABLED(SHOW_INTERACTION_TIME)
-    static char interaction_string[10];
-    static u8g_uint_t interaction_x_pos = 0;
     void MarlinUI::drawInter() {
-      if (printingIsActive() && interaction_string[0]) {
+      if (printingIsActive() && interaction_time) {
+        const duration_t buffert = interaction_time;
+        char bufferc[13];
+        const uint8_t len = buffert.toDigital(bufferc, buffert.value >= 60*60*24L);
+        const u8g_uint_t strxpos = _PRGR_INFO_X(len);
         lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("C:"));
-        lcd_put_u8str(interaction_x_pos, EXTRAS_BASELINE, interaction_string);
+        lcd_put_u8str(strxpos, EXTRAS_BASELINE, bufferc);
       }
     }
   #endif
   #if ENABLED(SHOW_ELAPSED_TIME)
-    static char elapsed_string[10];
-    static u8g_uint_t elapsed_x_pos = 0;
-    static uint8_t lastElapsed;
     void MarlinUI::drawElapsed() {
       if (printJobOngoing()) {
+        const duration_t buffert = print_job_timer.duration();
+        char bufferc[13];
+        const uint8_t len = buffert.toDigital(bufferc, buffert.value >= 60*60*24L);
+        const u8g_uint_t strxpos = _PRGR_INFO_X(len);
         lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("E:"));
-        lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
+        lcd_put_u8str(strxpos, EXTRAS_BASELINE, bufferc);
       }
     }
   #endif
@@ -508,6 +515,8 @@ void MarlinUI::draw_status_screen() {
 
   const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive());
 
+  static u8g_uint_t progress_bar_solid_width = 0;
+
   // At the first page, generate new display values
   if (first_page) {
     #if ANIM_HBCC
@@ -543,59 +552,16 @@ void MarlinUI::draw_status_screen() {
       strcpy(mstring, i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
     #endif
 
-    // Progress / elapsed / estimation updates and string formatting to avoid float math on each LCD draw
+    // Progress update to avoid float math on each LCD draw
     #if HAS_PRINT_PROGRESS
-      const progress_t progress = TERN(HAS_PRINT_PROGRESS_PERMYRIAD, get_progress_permyriad, get_progress_percent)();
-      duration_t elapsedt = print_job_timer.duration();
-      const uint8_t p = progress & 0xFF, ev = elapsedt.value & 0xFF;
+      progress = TERN(HAS_PRINT_PROGRESS_PERMYRIAD, get_progress_permyriad, get_progress_percent)();
+
+      static uint8_t lastProgress = 0xFF;
+      const uint8_t p = progress & 0xFF;
       if (p != lastProgress) {
         lastProgress = p;
-
         progress_bar_solid_width = u8g_uint_t((PROGRESS_BAR_WIDTH - 2) * (progress / (PROGRESS_SCALE)) * 0.01f);
-
-        #if ENABLED(SHOW_PROGRESS_PERCENT)
-          if (progress == 0)
-            progress_string[0] = '\0';
-          else
-            strcpy(progress_string, TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))));
-          progress_x_pos = TERN(PCENTERED, 77, _PRGR_INFO_X(strlen(progress_string) + 1));
-        #endif
       }
-
-      #if ENABLED(SHOW_INTERACTION_TIME)
-        if (!(interaction_time)) {
-          interaction_string[0] = '\0';
-          interaction_x_pos = _PRGR_INFO_X(0);
-        }
-        else {
-          const duration_t interactt = ui.interaction_time;
-          interactt.toDigital(interaction_string, interactt.value >= 60*60*24L);
-          interaction_x_pos = _PRGR_INFO_X(strlen(interaction_string));
-        }
-      #endif
-
-      #if ENABLED(SHOW_ELAPSED_TIME)
-        if (ev != lastElapsed) {
-          lastElapsed = ev;
-          const uint8_t len = elapsedt.toDigital(elapsed_string, elapsedt.value >= 60*60*24L);
-          elapsed_x_pos = _PRGR_INFO_X(len);
-        }
-      #endif
-
-      #if ENABLED(SHOW_REMAINING_TIME)
-        if (!(ev & 0x3)) {
-          uint32_t timeval = get_remaining_time();
-          if (!timeval) {
-            remaining_string[0] = '\0';
-            remaining_x_pos = _PRGR_INFO_X(0);
-          }
-          else {
-            const duration_t remaint = timeval;
-            const uint8_t len = remaint.toDigital(remaining_string, remaint.value >= 60*60*24L);
-            remaining_x_pos = _PRGR_INFO_X(len);
-          }
-        }
-      #endif
     #endif
   }
 

Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp

@@ -366,6 +366,8 @@ void MarlinUI::draw_status_screen() {
     );
   }
 
+  // TODO!
+
   //
   // Elapsed time
   //

Marlin/src/libs/numtostr.cpp

@@ -84,12 +84,6 @@ const char* i8tostr3rj(const int8_t x) {
       conv[6] = DIGIMOD(xx, 10);
       return &conv[3];
     }
-    else if (xx % 100 == 0) {
-      conv[4] = ' ';
-      conv[5] = RJDIGIT(xx, 1000);
-      conv[6] = DIGIMOD(xx, 100);
-      return &conv[4];
-    }
     else {
       conv[3] = DIGIMOD(xx, 100);
       conv[4] = '.';