Procházet zdrojové kódy

Estimate Remaining Time (graphical display) (#15497)

LinFor před 4 roky
rodič
revize
b20d5a7cc6
100 změnil soubory, kde provedl 651 přidání a 102 odebrání
  1. 5
    0
      Marlin/Configuration_adv.h
  2. 4
    1
      Marlin/src/gcode/lcd/M73.cpp
  3. 8
    7
      Marlin/src/inc/Conditionals_LCD.h
  4. 8
    0
      Marlin/src/inc/SanityCheck.h
  5. 2
    2
      Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
  6. 89
    33
      Marlin/src/lcd/dogm/status_screen_DOGM.cpp
  7. 1
    1
      Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
  8. 1
    1
      Marlin/src/lcd/extensible_ui/ui_api.cpp
  9. 3
    3
      Marlin/src/lcd/menu/menu.h
  10. 12
    6
      Marlin/src/lcd/ultralcd.cpp
  11. 19
    6
      Marlin/src/lcd/ultralcd.h
  12. 48
    20
      Marlin/src/libs/numtostr.cpp
  13. 27
    22
      Marlin/src/libs/numtostr.h
  14. 3
    0
      Marlin/src/sd/cardreader.h
  15. 1
    0
      buildroot/share/tests/megaatmega2560-tests
  16. 5
    0
      config/default/Configuration_adv.h
  17. 5
    0
      config/examples/3DFabXYZ/Migbot/Configuration_adv.h
  18. 5
    0
      config/examples/ADIMLab/Gantry v1/Configuration_adv.h
  19. 5
    0
      config/examples/ADIMLab/Gantry v2/Configuration_adv.h
  20. 5
    0
      config/examples/AlephObjects/TAZ4/Configuration_adv.h
  21. 5
    0
      config/examples/Alfawise/U20-bltouch/Configuration_adv.h
  22. 5
    0
      config/examples/Alfawise/U20/Configuration_adv.h
  23. 5
    0
      config/examples/AliExpress/UM2pExt/Configuration_adv.h
  24. 5
    0
      config/examples/Anet/A2/Configuration_adv.h
  25. 5
    0
      config/examples/Anet/A2plus/Configuration_adv.h
  26. 5
    0
      config/examples/Anet/A6/Configuration_adv.h
  27. 5
    0
      config/examples/Anet/A8/Configuration_adv.h
  28. 5
    0
      config/examples/Anet/A8plus/Configuration_adv.h
  29. 5
    0
      config/examples/Anet/E16/Configuration_adv.h
  30. 5
    0
      config/examples/AnyCubic/i3/Configuration_adv.h
  31. 5
    0
      config/examples/ArmEd/Configuration_adv.h
  32. 5
    0
      config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
  33. 5
    0
      config/examples/BIBO/TouchX/default/Configuration_adv.h
  34. 5
    0
      config/examples/BQ/Hephestos/Configuration_adv.h
  35. 5
    0
      config/examples/BQ/Hephestos_2/Configuration_adv.h
  36. 5
    0
      config/examples/BQ/WITBOX/Configuration_adv.h
  37. 5
    0
      config/examples/Cartesio/Configuration_adv.h
  38. 5
    0
      config/examples/Creality/CR-10/Configuration_adv.h
  39. 5
    0
      config/examples/Creality/CR-10S/Configuration_adv.h
  40. 5
    0
      config/examples/Creality/CR-10_5S/Configuration_adv.h
  41. 5
    0
      config/examples/Creality/CR-10mini/Configuration_adv.h
  42. 5
    0
      config/examples/Creality/CR-20 Pro/Configuration_adv.h
  43. 5
    0
      config/examples/Creality/CR-20/Configuration_adv.h
  44. 5
    0
      config/examples/Creality/CR-8/Configuration_adv.h
  45. 5
    0
      config/examples/Creality/Ender-2/Configuration_adv.h
  46. 5
    0
      config/examples/Creality/Ender-3/Configuration_adv.h
  47. 5
    0
      config/examples/Creality/Ender-4/Configuration_adv.h
  48. 5
    0
      config/examples/Creality/Ender-5/Configuration_adv.h
  49. 5
    0
      config/examples/Dagoma/Disco Ultimate/Configuration_adv.h
  50. 5
    0
      config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h
  51. 5
    0
      config/examples/Einstart-S/Configuration_adv.h
  52. 5
    0
      config/examples/FYSETC/AIO_II/Configuration_adv.h
  53. 5
    0
      config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h
  54. 5
    0
      config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h
  55. 5
    0
      config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h
  56. 5
    0
      config/examples/FYSETC/Cheetah/base/Configuration_adv.h
  57. 5
    0
      config/examples/FYSETC/F6_13/Configuration_adv.h
  58. 5
    0
      config/examples/Felix/DUAL/Configuration_adv.h
  59. 5
    0
      config/examples/Felix/Single/Configuration_adv.h
  60. 5
    0
      config/examples/FlashForge/CreatorPro/Configuration_adv.h
  61. 5
    0
      config/examples/FolgerTech/i3-2020/Configuration_adv.h
  62. 5
    0
      config/examples/Formbot/Raptor/Configuration_adv.h
  63. 5
    0
      config/examples/Formbot/T_Rex_3/Configuration_adv.h
  64. 5
    0
      config/examples/Geeetech/A10/Configuration_adv.h
  65. 5
    0
      config/examples/Geeetech/A10M/Configuration_adv.h
  66. 5
    0
      config/examples/Geeetech/A20M/Configuration_adv.h
  67. 5
    0
      config/examples/Geeetech/MeCreator2/Configuration_adv.h
  68. 5
    0
      config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
  69. 5
    0
      config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
  70. 5
    0
      config/examples/HMS434/Configuration_adv.h
  71. 5
    0
      config/examples/Infitary/i3-M508/Configuration_adv.h
  72. 5
    0
      config/examples/JGAurora/A1/Configuration_adv.h
  73. 5
    0
      config/examples/JGAurora/A5/Configuration_adv.h
  74. 5
    0
      config/examples/JGAurora/A5S/Configuration_adv.h
  75. 5
    0
      config/examples/MakerParts/Configuration_adv.h
  76. 5
    0
      config/examples/Malyan/M150/Configuration_adv.h
  77. 5
    0
      config/examples/Malyan/M200/Configuration_adv.h
  78. 5
    0
      config/examples/Micromake/C1/enhanced/Configuration_adv.h
  79. 5
    0
      config/examples/Mks/Robin/Configuration_adv.h
  80. 5
    0
      config/examples/Mks/Sbase/Configuration_adv.h
  81. 5
    0
      config/examples/RapideLite/RL200/Configuration_adv.h
  82. 5
    0
      config/examples/RigidBot/Configuration_adv.h
  83. 5
    0
      config/examples/SCARA/Configuration_adv.h
  84. 5
    0
      config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h
  85. 5
    0
      config/examples/Sanguinololu/Configuration_adv.h
  86. 5
    0
      config/examples/Tevo/Michelangelo/Configuration_adv.h
  87. 5
    0
      config/examples/Tevo/Tarantula Pro/Configuration_adv.h
  88. 5
    0
      config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h
  89. 5
    0
      config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h
  90. 5
    0
      config/examples/TheBorg/Configuration_adv.h
  91. 5
    0
      config/examples/TinyBoy2/Configuration_adv.h
  92. 5
    0
      config/examples/Tronxy/X3A/Configuration_adv.h
  93. 5
    0
      config/examples/Tronxy/X5S-2E/Configuration_adv.h
  94. 5
    0
      config/examples/UltiMachine/Archim1/Configuration_adv.h
  95. 5
    0
      config/examples/UltiMachine/Archim2/Configuration_adv.h
  96. 5
    0
      config/examples/VORONDesign/Configuration_adv.h
  97. 5
    0
      config/examples/Velleman/K8200/Configuration_adv.h
  98. 5
    0
      config/examples/Velleman/K8400/Dual-head/Configuration_adv.h
  99. 5
    0
      config/examples/Velleman/K8400/Single-head/Configuration_adv.h
  100. 0
    0
      config/examples/WASP/PowerWASP/Configuration_adv.h

+ 5
- 0
Marlin/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 4
- 1
Marlin/src/gcode/lcd/M73.cpp Zobrazit soubor

@@ -39,7 +39,10 @@
39 39
  */
40 40
 void GcodeSuite::M73() {
41 41
   if (parser.seen('P'))
42
-    ui.set_progress(parser.value_byte());
42
+    ui.set_progress((PROGRESS_SCALE) > 1
43
+      ? parser.value_float() * (PROGRESS_SCALE)
44
+      : parser.value_byte()
45
+    );
43 46
 }
44 47
 
45 48
 #endif // LCD_SET_PROGRESS_MANUALLY

+ 8
- 7
Marlin/src/inc/Conditionals_LCD.h Zobrazit soubor

@@ -525,13 +525,14 @@
525 525
   #define GRID_MAX_POINTS ((GRID_MAX_POINTS_X) * (GRID_MAX_POINTS_Y))
526 526
 #endif
527 527
 
528
-#define HAS_SOFTWARE_ENDSTOPS EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
529
-#define HAS_RESUME_CONTINUE   ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER)
530
-#define HAS_COLOR_LEDS        ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
531
-#define HAS_LEDS_OFF_FLAG     (BOTH(PRINTER_EVENT_LEDS, SDSUPPORT) && HAS_RESUME_CONTINUE)
532
-#define HAS_PRINT_PROGRESS    EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
533
-#define HAS_SERVICE_INTERVALS (ENABLED(PRINTCOUNTER) && (SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0))
534
-#define HAS_FILAMENT_SENSOR   ENABLED(FILAMENT_RUNOUT_SENSOR)
528
+#define HAS_SOFTWARE_ENDSTOPS        EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
529
+#define HAS_RESUME_CONTINUE          ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER)
530
+#define HAS_COLOR_LEDS               ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
531
+#define HAS_LEDS_OFF_FLAG            (BOTH(PRINTER_EVENT_LEDS, SDSUPPORT) && HAS_RESUME_CONTINUE)
532
+#define HAS_PRINT_PROGRESS           EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
533
+#define HAS_PRINT_PROGRESS_PERMYRIAD (HAS_PRINT_PROGRESS && EITHER(PRINT_PROGRESS_SHOW_DECIMALS, SHOW_REMAINING_TIME))
534
+#define HAS_SERVICE_INTERVALS        (ENABLED(PRINTCOUNTER) && (SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0))
535
+#define HAS_FILAMENT_SENSOR          ENABLED(FILAMENT_RUNOUT_SENSOR)
535 536
 
536 537
 #define Z_MULTI_STEPPER_DRIVERS EITHER(Z_DUAL_STEPPER_DRIVERS, Z_TRIPLE_STEPPER_DRIVERS)
537 538
 #define Z_MULTI_ENDSTOPS        EITHER(Z_DUAL_ENDSTOPS, Z_TRIPLE_ENDSTOPS)

+ 8
- 0
Marlin/src/inc/SanityCheck.h Zobrazit soubor

@@ -2511,3 +2511,11 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
2511 2511
   #endif
2512 2512
   #undef _PIN_CONFLICT
2513 2513
 #endif
2514
+
2515
+#if !HAS_GRAPHICAL_LCD
2516
+  #if ENABLED(PRINT_PROGRESS_SHOW_DECIMALS)
2517
+    #error "PRINT_PROGRESS_SHOW_DECIMALS currently requires a Graphical LCD."
2518
+  #elif ENABLED(SHOW_REMAINING_TIME)
2519
+    #error "SHOW_REMAINING_TIME currently requires a Graphical LCD."
2520
+  #endif
2521
+#endif

+ 2
- 2
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp Zobrazit soubor

@@ -566,7 +566,7 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
566 566
 #if HAS_PRINT_PROGRESS
567 567
 
568 568
   FORCE_INLINE void _draw_print_progress() {
569
-    const uint8_t progress = ui.get_progress();
569
+    const uint8_t progress = ui.get_progress_percent();
570 570
     lcd_put_u8str_P(PSTR(
571 571
       #if ENABLED(SDSUPPORT)
572 572
         "SD"
@@ -613,7 +613,7 @@ void MarlinUI::draw_status_message(const bool blink) {
613 613
     // Draw the progress bar if the message has shown long enough
614 614
     // or if there is no message set.
615 615
     if (ELAPSED(millis(), progress_bar_ms + PROGRESS_BAR_MSG_TIME) || !has_status()) {
616
-      const uint8_t progress = get_progress();
616
+      const uint8_t progress = get_progress_percent();
617 617
       if (progress > 2) return draw_progress_bar(progress);
618 618
     }
619 619
 

+ 89
- 33
Marlin/src/lcd/dogm/status_screen_DOGM.cpp Zobrazit soubor

@@ -99,6 +99,9 @@
99 99
 
100 100
 #define STATUS_HEATERS_BOT (STATUS_HEATERS_Y + STATUS_HEATERS_HEIGHT - 1)
101 101
 
102
+#define PROGRESS_BAR_X 54
103
+#define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
104
+
102 105
 #if ENABLED(MARLIN_DEV_MODE)
103 106
   #define SHOW_ON_STATE READ(X_MIN_PIN)
104 107
 #else
@@ -257,7 +260,7 @@ FORCE_INLINE void _draw_heater_status(const heater_ind_t heater, const bool blin
257 260
 
258 261
   FORCE_INLINE void _draw_chamber_status(const bool blink) {
259 262
     #if ENABLED(MARLIN_DEV_MODE)
260
-	    const float temp = 10 + (millis() >> 8) % CHAMBER_MAXTEMP,
263
+      const float temp = 10 + (millis() >> 8) % CHAMBER_MAXTEMP,
261 264
                 target = CHAMBER_MAXTEMP;
262 265
     #else
263 266
       const float temp = thermalManager.degChamber();
@@ -330,6 +333,26 @@ void MarlinUI::draw_status_screen() {
330 333
     static char wstring[5], mstring[4];
331 334
   #endif
332 335
 
336
+  #if HAS_PRINT_PROGRESS
337
+    #if DISABLED(DOGM_SD_PERCENT)
338
+      #define _SD_DURATION_X(len) (PROGRESS_BAR_X + (PROGRESS_BAR_WIDTH) / 2 - (len) * (MENU_FONT_WIDTH) / 2)
339
+    #else
340
+      #define _SD_DURATION_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH))
341
+    #endif
342
+
343
+    static uint8_t progress_bar_solid_width = 0, lastProgress = 0;
344
+    #if ENABLED(DOGM_SD_PERCENT)
345
+      static char progress_string[5];
346
+    #endif
347
+    static uint8_t lastElapsed = 0, elapsed_x_pos = 0;
348
+    static char elapsed_string[10];
349
+    #if ENABLED(SHOW_REMAINING_TIME)
350
+      #define SHOW_REMAINING_TIME_PREFIX 'E'
351
+      static uint8_t estimation_x_pos = 0;
352
+      static char estimation_string[10];
353
+    #endif
354
+  #endif
355
+
333 356
   // At the first page, generate new display values
334 357
   if (first_page) {
335 358
     #if ANIM_HBC
@@ -353,6 +376,50 @@ void MarlinUI::draw_status_screen() {
353 376
       strcpy(wstring, ftostr12ns(filwidth.measured_mm));
354 377
       strcpy(mstring, i16tostr3(planner.volumetric_percent(parser.volumetric_enabled)));
355 378
     #endif
379
+
380
+    // Progress / elapsed / estimation updates and string formatting to avoid float math on each LCD draw
381
+    #if HAS_PRINT_PROGRESS
382
+      const progress_t progress =
383
+        #if HAS_PRINT_PROGRESS_PERMYRIAD
384
+          get_progress_permyriad()
385
+        #else
386
+          get_progress_percent()
387
+        #endif
388
+      ;
389
+      duration_t elapsed = print_job_timer.duration();
390
+      const uint8_t p = progress & 0xFF, ev = elapsed.value & 0xFF;
391
+      if (progress > 1 && p != lastProgress) {
392
+        lastProgress = p;
393
+
394
+        progress_bar_solid_width = uint8_t((PROGRESS_BAR_WIDTH - 2) * progress / (PROGRESS_SCALE) * 0.01f);
395
+
396
+        #if ENABLED(DOGM_SD_PERCENT)
397
+          strcpy(progress_string, (
398
+            #if ENABLED(PRINT_PROGRESS_SHOW_DECIMALS)
399
+              permyriadtostr4(progress)
400
+            #else
401
+              ui8tostr3(progress / (PROGRESS_SCALE))
402
+            #endif
403
+          ));
404
+        #endif
405
+      }
406
+
407
+      if (ev != lastElapsed) {
408
+        lastElapsed = ev;
409
+        const bool has_days = (elapsed.value >= 60*60*24L);
410
+        const uint8_t len = elapsed.toDigital(elapsed_string, has_days);
411
+        elapsed_x_pos = _SD_DURATION_X(len);
412
+
413
+        #if ENABLED(SHOW_REMAINING_TIME)
414
+          if (!(ev & 0x3)) {
415
+            duration_t estimation = elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress;
416
+            const bool has_days = (estimation.value >= 60*60*24L);
417
+            const uint8_t len = estimation.toDigital(estimation_string, has_days);
418
+            estimation_x_pos = _SD_DURATION_X(len + 1);
419
+          }
420
+        #endif
421
+      }
422
+    #endif
356 423
   }
357 424
 
358 425
   const bool blink = get_blink();
@@ -485,55 +552,44 @@ void MarlinUI::draw_status_screen() {
485 552
     //
486 553
     // Progress bar frame
487 554
     //
488
-    #define PROGRESS_BAR_X 54
489
-    #define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
490 555
 
491 556
     if (PAGE_CONTAINS(49, 52))
492 557
       u8g.drawFrame(PROGRESS_BAR_X, 49, PROGRESS_BAR_WIDTH, 4);
493 558
 
494
-    const uint8_t progress = get_progress();
495
-
496
-    if (progress > 1) {
497
-
498
-      //
499
-      // Progress bar solid part
500
-      //
559
+    //
560
+    // Progress bar solid part
561
+    //
501 562
 
502
-      if (PAGE_CONTAINS(50, 51))     // 50-51 (or just 50)
503
-        u8g.drawBox(
504
-          PROGRESS_BAR_X + 1, 50,
505
-          (uint16_t)((PROGRESS_BAR_WIDTH - 2) * progress * 0.01), 2
506
-        );
563
+    if (PAGE_CONTAINS(50, 51))     // 50-51 (or just 50)
564
+      u8g.drawBox(PROGRESS_BAR_X + 1, 50, progress_bar_solid_width, 2);
507 565
 
508
-      //
509
-      // SD Percent Complete
510
-      //
566
+    //
567
+    // SD Percent Complete
568
+    //
511 569
 
512
-      #if ENABLED(DOGM_SD_PERCENT)
570
+    #if ENABLED(DOGM_SD_PERCENT)
571
+      if (progress_string[0] != '\0')
513 572
         if (PAGE_CONTAINS(41, 48)) {
514 573
           // Percent complete
515
-          lcd_put_u8str(55, 48, ui8tostr3(progress));
574
+          lcd_put_u8str(55, 48, progress_string);
516 575
           lcd_put_wchar('%');
517 576
         }
518
-      #endif
519
-    }
577
+    #endif
520 578
 
521 579
     //
522 580
     // Elapsed Time
523 581
     //
524 582
 
525
-    #if DISABLED(DOGM_SD_PERCENT)
526
-      #define SD_DURATION_X (PROGRESS_BAR_X + (PROGRESS_BAR_WIDTH / 2) - len * (MENU_FONT_WIDTH / 2))
527
-    #else
528
-      #define SD_DURATION_X (LCD_PIXEL_WIDTH - len * MENU_FONT_WIDTH)
529
-    #endif
530
-
531 583
     if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) {
532
-      char buffer[13];
533
-      duration_t elapsed = print_job_timer.duration();
534
-      bool has_days = (elapsed.value >= 60*60*24L);
535
-      uint8_t len = elapsed.toDigital(buffer, has_days);
536
-      lcd_put_u8str(SD_DURATION_X, EXTRAS_BASELINE, buffer);
584
+
585
+      #if ENABLED(SHOW_REMAINING_TIME)
586
+        if (blink && (estimation_string[0] != '\0')) {
587
+          lcd_put_wchar(estimation_x_pos, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX);
588
+          lcd_put_u8str(estimation_string);
589
+        }
590
+        else
591
+      #endif
592
+          lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
537 593
     }
538 594
 
539 595
   #endif // HAS_PRINT_PROGRESS

+ 1
- 1
Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp Zobrazit soubor

@@ -850,7 +850,7 @@ void ST7920_Lite_Status_Screen::update_progress(const bool forceUpdate) {
850 850
     // when an update is actually necessary.
851 851
 
852 852
     static uint8_t last_progress = 0;
853
-    const uint8_t progress = ui.get_progress();
853
+    const uint8_t progress = ui.get_progress_percent();
854 854
     if (forceUpdate || last_progress != progress) {
855 855
       last_progress = progress;
856 856
       draw_progress_bar(progress);

+ 1
- 1
Marlin/src/lcd/extensible_ui/ui_api.cpp Zobrazit soubor

@@ -796,7 +796,7 @@ namespace ExtUI {
796 796
   #endif
797 797
 
798 798
   uint8_t getProgress_percent() {
799
-    return ui.get_progress();
799
+    return ui.get_progress_percent();
800 800
   }
801 801
 
802 802
   uint32_t getProgress_seconds_elapsed() {

+ 3
- 3
Marlin/src/lcd/menu/menu.h Zobrazit soubor

@@ -45,7 +45,7 @@ bool printer_busy();
45 45
   struct MenuEditItemInfo_##NAME { \
46 46
     typedef TYPE type_t; \
47 47
     static constexpr float scale = SCALE; \
48
-    static inline char* strfunc(const float value) { return STRFUNC((TYPE) value); } \
48
+    static inline const char* strfunc(const float value) { return STRFUNC((TYPE) value); } \
49 49
   };
50 50
 
51 51
 DECLARE_MENU_EDIT_TYPE(uint8_t,  percent,     ui8tostr4pct, 100.0/255);   // 100%       right-justified
@@ -204,7 +204,7 @@ class MenuEditItemBase {
204 204
     static screenFunc_t callbackFunc;
205 205
     static bool liveEdit;
206 206
   protected:
207
-    typedef char* (*strfunc_t)(const int32_t);
207
+    typedef const char* (*strfunc_t)(const int32_t);
208 208
     typedef void (*loadfunc_t)(void *, const int32_t);
209 209
     static void init(PGM_P const el, void * const ev, const int32_t minv, const int32_t maxv, const uint16_t ep, const screenFunc_t cs, const screenFunc_t cb, const bool le);
210 210
     static void edit(strfunc_t, loadfunc_t);
@@ -217,7 +217,7 @@ class TMenuEditItem : MenuEditItemBase {
217 217
     static inline float unscale(const float value)    { return value * (1.0f / NAME::scale);  }
218 218
     static inline float scale(const float value)      { return value * NAME::scale;           }
219 219
     static void load(void *ptr, const int32_t value)  { *((type_t*)ptr) = unscale(value);     }
220
-    static char* to_string(const int32_t value)       { return NAME::strfunc(unscale(value)); }
220
+    static const char* to_string(const int32_t value) { return NAME::strfunc(unscale(value)); }
221 221
   public:
222 222
     static void action(
223 223
       PGM_P const pstr,                     // Edit label

+ 12
- 6
Marlin/src/lcd/ultralcd.cpp Zobrazit soubor

@@ -58,7 +58,7 @@
58 58
 #endif
59 59
 
60 60
 #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
61
-  uint8_t MarlinUI::progress_override; // = 0
61
+  MarlinUI::progress_t MarlinUI::progress_override; // = 0
62 62
 #endif
63 63
 
64 64
 #if HAS_BUZZER
@@ -515,7 +515,7 @@ void MarlinUI::status_screen() {
515 515
       if (expire_status_ms > 0) {
516 516
 
517 517
         // Expire the message if a job is active and the bar has ticks
518
-        if (get_progress() > 2 && !print_job_timer.isPaused()) {
518
+        if (get_progress_percent() > 2 && !print_job_timer.isPaused()) {
519 519
           if (ELAPSED(ms, expire_status_ms)) {
520 520
             status_message[0] = '\0';
521 521
             expire_status_ms = 0;
@@ -1534,18 +1534,24 @@ void MarlinUI::update() {
1534 1534
   }
1535 1535
 
1536 1536
   #if HAS_PRINT_PROGRESS
1537
-    uint8_t MarlinUI::get_progress() {
1537
+
1538
+    MarlinUI::progress_t MarlinUI::_get_progress() {
1538 1539
       #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
1539
-        const uint8_t p = progress_override & 0x7F;
1540
+        const progress_t p = progress_override & PROGRESS_MASK;
1540 1541
       #else
1541
-        constexpr uint8_t p = 0;
1542
+        constexpr progress_t p = 0;
1542 1543
       #endif
1543 1544
       return (p
1544 1545
         #if ENABLED(SDSUPPORT)
1545
-          ?: card.percentDone()
1546
+          #if HAS_PRINT_PROGRESS_PERMYRIAD
1547
+            ?: card.permyriadDone()
1548
+          #else
1549
+            ?: card.percentDone()
1550
+          #endif
1546 1551
         #endif
1547 1552
       );
1548 1553
     }
1554
+
1549 1555
   #endif
1550 1556
 
1551 1557
 #endif // HAS_DISPLAY

+ 19
- 6
Marlin/src/lcd/ultralcd.h Zobrazit soubor

@@ -288,15 +288,28 @@ public:
288 288
     static void resume_print();
289 289
 
290 290
     #if HAS_PRINT_PROGRESS
291
+      #if HAS_PRINT_PROGRESS_PERMYRIAD
292
+        typedef uint16_t progress_t;
293
+        #define PROGRESS_SCALE 100U
294
+        #define PROGRESS_MASK 0x7FFF
295
+      #else
296
+        typedef uint8_t progress_t;
297
+        #define PROGRESS_SCALE 1U
298
+        #define PROGRESS_MASK 0x7F
299
+      #endif
291 300
       #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
292
-        static uint8_t progress_override;
293
-        static void set_progress(const uint8_t progress) { progress_override = _MIN(progress, 100); }
294
-        static void set_progress_done() { set_progress(0x80 + 100); }
295
-        static void progress_reset() { if (progress_override & 0x80) set_progress(0); }
301
+        static progress_t progress_override;
302
+        static void set_progress(const progress_t p) { progress_override = _MIN(p, 100U * (PROGRESS_SCALE)); }
303
+        static void set_progress_done() { progress_override = (PROGRESS_MASK + 1U) + 100U * (PROGRESS_SCALE); }
304
+        static void progress_reset() { if (progress_override & (PROGRESS_MASK + 1U)) set_progress(0); }
305
+      #endif
306
+      static progress_t _get_progress();
307
+      #if HAS_PRINT_PROGRESS_PERMYRIAD
308
+        static uint16_t get_progress_permyriad() { return _get_progress(); }
296 309
       #endif
297
-      static uint8_t get_progress();
310
+      static uint8_t get_progress_percent() { return uint8_t(_get_progress() / (PROGRESS_SCALE)); }
298 311
     #else
299
-      static constexpr uint8_t get_progress() { return 0; }
312
+      static constexpr uint8_t get_progress_percent() { return 0; }
300 313
     #endif
301 314
 
302 315
     #if HAS_SPI_LCD

+ 48
- 20
Marlin/src/libs/numtostr.cpp Zobrazit soubor

@@ -33,7 +33,7 @@ char conv[8] = { 0 };
33 33
 #define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
34 34
 
35 35
 // Convert a full-range unsigned 8bit int to a percentage
36
-char* ui8tostr4pct(const uint8_t i) {
36
+const char* ui8tostr4pct(const uint8_t i) {
37 37
   const uint8_t n = ui8_to_percent(i);
38 38
   conv[3] = RJDIGIT(n, 100);
39 39
   conv[4] = RJDIGIT(n, 10);
@@ -43,7 +43,7 @@ char* ui8tostr4pct(const uint8_t i) {
43 43
 }
44 44
 
45 45
 // Convert unsigned 8bit int to string 123 format
46
-char* ui8tostr3(const uint8_t i) {
46
+const char* ui8tostr3(const uint8_t i) {
47 47
   conv[4] = RJDIGIT(i, 100);
48 48
   conv[5] = RJDIGIT(i, 10);
49 49
   conv[6] = DIGIMOD(i, 1);
@@ -51,7 +51,7 @@ char* ui8tostr3(const uint8_t i) {
51 51
 }
52 52
 
53 53
 // Convert signed 8bit int to rj string with 123 or -12 format
54
-char* i8tostr3(const int8_t x) {
54
+const char* i8tostr3(const int8_t x) {
55 55
   int xx = x;
56 56
   conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
57 57
   conv[5] = RJDIGIT(xx, 10);
@@ -59,8 +59,36 @@ char* i8tostr3(const int8_t x) {
59 59
   return &conv[4];
60 60
 }
61 61
 
62
+#if HAS_PRINT_PROGRESS_PERMYRIAD
63
+  // Convert unsigned 16-bit permyriad to percent with 100 / 23 / 23.4 / 3.45 format
64
+  const char* permyriadtostr4(const uint16_t xx) {
65
+    if (xx >= 10000)
66
+      return "100";
67
+    else if (xx >= 1000) {
68
+      conv[3] = DIGIMOD(xx, 1000);
69
+      conv[4] = DIGIMOD(xx, 100);
70
+      conv[5] = '.';
71
+      conv[6] = DIGIMOD(xx, 10);
72
+      return &conv[3];
73
+    }
74
+    else if (xx % 100 == 0) {
75
+      conv[4] = ' ';
76
+      conv[5] = RJDIGIT(xx, 1000);
77
+      conv[6] = DIGIMOD(xx, 100);
78
+      return &conv[4];
79
+    }
80
+    else {
81
+      conv[3] = DIGIMOD(xx, 100);
82
+      conv[4] = '.';
83
+      conv[5] = DIGIMOD(xx, 10);
84
+      conv[6] = RJDIGIT(xx, 1);
85
+      return &conv[3];
86
+    }
87
+  }
88
+#endif
89
+
62 90
 // Convert unsigned 16bit int to string 12345 format
63
-char* ui16tostr5(const uint16_t xx) {
91
+const char* ui16tostr5(const uint16_t xx) {
64 92
   conv[2] = RJDIGIT(xx, 10000);
65 93
   conv[3] = RJDIGIT(xx, 1000);
66 94
   conv[4] = RJDIGIT(xx, 100);
@@ -70,7 +98,7 @@ char* ui16tostr5(const uint16_t xx) {
70 98
 }
71 99
 
72 100
 // Convert unsigned 16bit int to string 1234 format
73
-char* ui16tostr4(const uint16_t xx) {
101
+const char* ui16tostr4(const uint16_t xx) {
74 102
   conv[3] = RJDIGIT(xx, 1000);
75 103
   conv[4] = RJDIGIT(xx, 100);
76 104
   conv[5] = RJDIGIT(xx, 10);
@@ -79,7 +107,7 @@ char* ui16tostr4(const uint16_t xx) {
79 107
 }
80 108
 
81 109
 // Convert unsigned 16bit int to string 123 format
82
-char* ui16tostr3(const uint16_t xx) {
110
+const char* ui16tostr3(const uint16_t xx) {
83 111
   conv[4] = RJDIGIT(xx, 100);
84 112
   conv[5] = RJDIGIT(xx, 10);
85 113
   conv[6] = DIGIMOD(xx, 1);
@@ -87,7 +115,7 @@ char* ui16tostr3(const uint16_t xx) {
87 115
 }
88 116
 
89 117
 // Convert signed 16bit int to rj string with 123 or -12 format
90
-char* i16tostr3(const int16_t x) {
118
+const char* i16tostr3(const int16_t x) {
91 119
   int xx = x;
92 120
   conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
93 121
   conv[5] = RJDIGIT(xx, 10);
@@ -96,7 +124,7 @@ char* i16tostr3(const int16_t x) {
96 124
 }
97 125
 
98 126
 // Convert unsigned 16bit int to lj string with 123 format
99
-char* i16tostr3left(const int16_t i) {
127
+const char* i16tostr3left(const int16_t i) {
100 128
   char *str = &conv[6];
101 129
   *str = DIGIMOD(i, 1);
102 130
   if (i >= 10) {
@@ -108,7 +136,7 @@ char* i16tostr3left(const int16_t i) {
108 136
 }
109 137
 
110 138
 // Convert signed 16bit int to rj string with 1234, _123, -123, _-12, or __-1 format
111
-char* i16tostr4sign(const int16_t i) {
139
+const char* i16tostr4sign(const int16_t i) {
112 140
   const bool neg = i < 0;
113 141
   const int ii = neg ? -i : i;
114 142
   if (i >= 1000) {
@@ -137,7 +165,7 @@ char* i16tostr4sign(const int16_t i) {
137 165
 }
138 166
 
139 167
 // Convert unsigned float to string with 1.23 format
140
-char* ftostr12ns(const float &f) {
168
+const char* ftostr12ns(const float &f) {
141 169
   const long i = ((f < 0 ? -f : f) * 1000 + 5) / 10;
142 170
   conv[3] = DIGIMOD(i, 100);
143 171
   conv[4] = '.';
@@ -147,7 +175,7 @@ char* ftostr12ns(const float &f) {
147 175
 }
148 176
 
149 177
 // Convert signed float to fixed-length string with 12.34 / -2.34 format or 123.45 / -23.45 format
150
-char* ftostr42_52(const float &f) {
178
+const char* ftostr42_52(const float &f) {
151 179
   if (f <= -10 || f >= 100) return ftostr52(f); // need more digits
152 180
   long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
153 181
   conv[2] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 1000));
@@ -159,7 +187,7 @@ char* ftostr42_52(const float &f) {
159 187
 }
160 188
 
161 189
 // Convert signed float to fixed-length string with 023.45 / -23.45 format
162
-char* ftostr52(const float &f) {
190
+const char* ftostr52(const float &f) {
163 191
   long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
164 192
   conv[1] = MINUSOR(i, DIGIMOD(i, 10000));
165 193
   conv[2] = DIGIMOD(i, 1000);
@@ -188,7 +216,7 @@ char* ftostr52(const float &f) {
188 216
 #endif
189 217
 
190 218
 // Convert float to fixed-length string with +123.4 / -123.4 format
191
-char* ftostr41sign(const float &f) {
219
+const char* ftostr41sign(const float &f) {
192 220
   int i = (f * 100 + (f < 0 ? -5: 5)) / 10;
193 221
   conv[1] = MINUSOR(i, '+');
194 222
   conv[2] = DIGIMOD(i, 1000);
@@ -200,7 +228,7 @@ char* ftostr41sign(const float &f) {
200 228
 }
201 229
 
202 230
 // Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
203
-char* ftostr43sign(const float &f, char plus/*=' '*/) {
231
+const char* ftostr43sign(const float &f, char plus/*=' '*/) {
204 232
   long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
205 233
   conv[1] = i ? MINUSOR(i, plus) : ' ';
206 234
   conv[2] = DIGIMOD(i, 1000);
@@ -212,7 +240,7 @@ char* ftostr43sign(const float &f, char plus/*=' '*/) {
212 240
 }
213 241
 
214 242
 // Convert signed float to string (5 digit) with -1.2345 / _0.0000 / +1.2345 format
215
-char* ftostr54sign(const float &f, char plus/*=' '*/) {
243
+const char* ftostr54sign(const float &f, char plus/*=' '*/) {
216 244
   long i = (f * 100000 + (f < 0 ? -5: 5)) / 10;
217 245
   conv[0] = i ? MINUSOR(i, plus) : ' ';
218 246
   conv[1] = DIGIMOD(i, 10000);
@@ -225,13 +253,13 @@ char* ftostr54sign(const float &f, char plus/*=' '*/) {
225 253
 }
226 254
 
227 255
 // Convert unsigned float to rj string with 12345 format
228
-char* ftostr5rj(const float &f) {
256
+const char* ftostr5rj(const float &f) {
229 257
   const long i = ((f < 0 ? -f : f) * 10 + 5) / 10;
230 258
   return ui16tostr5(i);
231 259
 }
232 260
 
233 261
 // Convert signed float to string with +1234.5 format
234
-char* ftostr51sign(const float &f) {
262
+const char* ftostr51sign(const float &f) {
235 263
   long i = (f * 100 + (f < 0 ? -5: 5)) / 10;
236 264
   conv[0] = MINUSOR(i, '+');
237 265
   conv[1] = DIGIMOD(i, 10000);
@@ -244,7 +272,7 @@ char* ftostr51sign(const float &f) {
244 272
 }
245 273
 
246 274
 // Convert signed float to string with +123.45 format
247
-char* ftostr52sign(const float &f) {
275
+const char* ftostr52sign(const float &f) {
248 276
   long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
249 277
   conv[0] = MINUSOR(i, '+');
250 278
   conv[1] = DIGIMOD(i, 10000);
@@ -257,7 +285,7 @@ char* ftostr52sign(const float &f) {
257 285
 }
258 286
 
259 287
 // Convert unsigned float to string with 1234.5 format omitting trailing zeros
260
-char* ftostr51rj(const float &f) {
288
+const char* ftostr51rj(const float &f) {
261 289
   const long i = ((f < 0 ? -f : f) * 100 + 5) / 10;
262 290
   conv[0] = ' ';
263 291
   conv[1] = RJDIGIT(i, 10000);
@@ -270,7 +298,7 @@ char* ftostr51rj(const float &f) {
270 298
 }
271 299
 
272 300
 // Convert signed float to space-padded string with -_23.4_ format
273
-char* ftostr52sp(const float &f) {
301
+const char* ftostr52sp(const float &f) {
274 302
   long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
275 303
   uint8_t dig;
276 304
   conv[0] = MINUSOR(i, ' ');

+ 27
- 22
Marlin/src/libs/numtostr.h Zobrazit soubor

@@ -24,69 +24,74 @@
24 24
 #include <stdint.h>
25 25
 
26 26
 // Convert a full-range unsigned 8bit int to a percentage
27
-char* ui8tostr4pct(const uint8_t i);
27
+const char* ui8tostr4pct(const uint8_t i);
28 28
 
29 29
 // Convert uint8_t to string with 123 format
30
-char* ui8tostr3(const uint8_t i);
30
+const char* ui8tostr3(const uint8_t i);
31 31
 
32 32
 // Convert int8_t to string with 123 format
33
-char* i8tostr3(const int8_t x);
33
+const char* i8tostr3(const int8_t x);
34
+
35
+#if HAS_PRINT_PROGRESS_PERMYRIAD
36
+  // Convert 16-bit unsigned permyriad value to percent: 100 / 23 / 23.4 / 3.45
37
+  const char* permyriadtostr4(const uint16_t xx);
38
+#endif
34 39
 
35 40
 // Convert uint16_t to string with 12345 format
36
-char* ui16tostr5(const uint16_t x);
41
+const char* ui16tostr5(const uint16_t x);
37 42
 
38 43
 // Convert uint16_t to string with 1234 format
39
-char* ui16tostr4(const uint16_t x);
44
+const char* ui16tostr4(const uint16_t x);
40 45
 
41 46
 // Convert uint16_t to string with 123 format
42
-char* ui16tostr3(const uint16_t x);
47
+const char* ui16tostr3(const uint16_t x);
43 48
 
44 49
 // Convert int16_t to string with 123 format
45
-char* i16tostr3(const int16_t x);
50
+const char* i16tostr3(const int16_t x);
46 51
 
47 52
 // Convert unsigned int to lj string with 123 format
48
-char* i16tostr3left(const int16_t xx);
53
+const char* i16tostr3left(const int16_t xx);
49 54
 
50 55
 // Convert signed int to rj string with _123, -123, _-12, or __-1 format
51
-char* i16tostr4sign(const int16_t x);
56
+const char* i16tostr4sign(const int16_t x);
52 57
 
53 58
 // Convert unsigned float to string with 1.23 format
54
-char* ftostr12ns(const float &x);
59
+const char* ftostr12ns(const float &x);
55 60
 
56 61
 // Convert signed float to fixed-length string with 12.34 / -2.34 or 023.45 / -23.45 format
57
-char* ftostr42_52(const float &x);
62
+const char* ftostr42_52(const float &x);
58 63
 
59 64
 // Convert signed float to fixed-length string with 023.45 / -23.45 format
60
-char* ftostr52(const float &x);
65
+const char* ftostr52(const float &x);
61 66
 
62 67
 // Convert float to fixed-length string with +123.4 / -123.4 format
63
-char* ftostr41sign(const float &x);
68
+const char* ftostr41sign(const float &x);
64 69
 
65 70
 // Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
66
-char* ftostr43sign(const float &x, char plus=' ');
71
+const char* ftostr43sign(const float &x, char plus=' ');
67 72
 
68 73
 // Convert signed float to string (5 digit) with -1.2345 / _0.0000 / +1.2345 format
69
-char* ftostr54sign(const float &x, char plus=' ');
74
+const char* ftostr54sign(const float &x, char plus=' ');
70 75
 
71 76
 // Convert unsigned float to rj string with 12345 format
72
-char* ftostr5rj(const float &x);
77
+const char* ftostr5rj(const float &x);
73 78
 
74 79
 // Convert signed float to string with +1234.5 format
75
-char* ftostr51sign(const float &x);
80
+const char* ftostr51sign(const float &x);
76 81
 
77 82
 // Convert signed float to space-padded string with -_23.4_ format
78
-char* ftostr52sp(const float &x);
83
+const char* ftostr52sp(const float &x);
79 84
 
80 85
 // Convert signed float to string with +123.45 format
81
-char* ftostr52sign(const float &x);
86
+const char* ftostr52sign(const float &x);
82 87
 
83 88
 // Convert unsigned float to string with 1234.5 format omitting trailing zeros
84
-char* ftostr51rj(const float &x);
89
+const char* ftostr51rj(const float &x);
85 90
 
86 91
 #include "../core/macros.h"
87 92
 
88 93
 // Convert float to rj string with 123 or -12 format
89
-FORCE_INLINE char* ftostr3(const float &x) { return i16tostr3(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
94
+FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
90 95
 
91 96
 #include "../inc/MarlinConfigPre.h"
92 97
 
@@ -95,5 +100,5 @@ FORCE_INLINE char* ftostr3(const float &x) { return i16tostr3(int16_t(x + (x < 0
95 100
   char* ftostr4sign(const float &fx);
96 101
 #else
97 102
   // Convert float to rj string with 1234, _123, -123, __12, _-12, ___1, or __-1 format
98
-  FORCE_INLINE char* ftostr4sign(const float &x) { return i16tostr4sign(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
103
+  FORCE_INLINE const char* ftostr4sign(const float &x) { return i16tostr4sign(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
99 104
 #endif

+ 3
- 0
Marlin/src/sd/cardreader.h Zobrazit soubor

@@ -118,6 +118,9 @@ public:
118 118
   static inline void pauseSDPrint() { flag.sdprinting = false; }
119 119
   static inline bool isPaused() { return isFileOpen() && !flag.sdprinting; }
120 120
   static inline bool isPrinting() { return flag.sdprinting; }
121
+  #if HAS_PRINT_PROGRESS_PERMYRIAD
122
+    static inline uint16_t permyriadDone() { return (isFileOpen() && filesize) ? sdpos / ((filesize + 9999) / 10000) : 0; }
123
+  #endif
121 124
   static inline uint8_t percentDone() { return (isFileOpen() && filesize) ? sdpos / ((filesize + 99) / 100) : 0; }
122 125
 
123 126
   // Helper for open and remove

+ 1
- 0
buildroot/share/tests/megaatmega2560-tests Zobrazit soubor

@@ -63,6 +63,7 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATU
63 63
            SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT SCROLL_LONG_FILENAMES \
64 64
            EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_USER_MENUS \
65 65
            MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE QUICK_HOME \
66
+           LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME \
66 67
            BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL
67 68
 exec_test $1 $2 "Azteeg X3 Pro with 5 extruders, RRDFGSC, probeless UBL, Linear Advance, and more"
68 69
 

+ 5
- 0
config/default/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/3DFabXYZ/Migbot/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/ADIMLab/Gantry v1/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/ADIMLab/Gantry v2/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/AlephObjects/TAZ4/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Alfawise/U20-bltouch/Configuration_adv.h Zobrazit soubor

@@ -889,6 +889,11 @@
889 889
 // Add an 'M73' G-code to set the current percentage
890 890
 #define LCD_SET_PROGRESS_MANUALLY
891 891
 
892
+#if HAS_PRINT_PROGRESS
893
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
894
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
895
+#endif
896
+
892 897
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
893 898
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
894 899
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Alfawise/U20/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 #define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/AliExpress/UM2pExt/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Anet/A2/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Anet/A2plus/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Anet/A6/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Anet/A8/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Anet/A8plus/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Anet/E16/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/AnyCubic/i3/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/ArmEd/Configuration_adv.h Zobrazit soubor

@@ -892,6 +892,11 @@
892 892
 // Add an 'M73' G-code to set the current percentage
893 893
 //#define LCD_SET_PROGRESS_MANUALLY
894 894
 
895
+#if HAS_PRINT_PROGRESS
896
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
897
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
898
+#endif
899
+
895 900
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
896 901
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
897 902
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/BIBO/TouchX/cyclops/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/BIBO/TouchX/default/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/BQ/Hephestos/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/BQ/Hephestos_2/Configuration_adv.h Zobrazit soubor

@@ -896,6 +896,11 @@
896 896
 // Add an 'M73' G-code to set the current percentage
897 897
 //#define LCD_SET_PROGRESS_MANUALLY
898 898
 
899
+#if HAS_PRINT_PROGRESS
900
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
901
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
902
+#endif
903
+
899 904
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
900 905
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
901 906
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/BQ/WITBOX/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Cartesio/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/CR-10/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/CR-10S/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/CR-10_5S/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/CR-10mini/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/CR-20 Pro/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/CR-20/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/CR-8/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/Ender-2/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/Ender-3/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/Ender-4/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Creality/Ender-5/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Dagoma/Disco Ultimate/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 #define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Einstart-S/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/FYSETC/AIO_II/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/FYSETC/Cheetah/base/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/FYSETC/F6_13/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Felix/DUAL/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Felix/Single/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/FlashForge/CreatorPro/Configuration_adv.h Zobrazit soubor

@@ -887,6 +887,11 @@
887 887
 // Add an 'M73' G-code to set the current percentage
888 888
 //#define LCD_SET_PROGRESS_MANUALLY
889 889
 
890
+#if HAS_PRINT_PROGRESS
891
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
892
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
893
+#endif
894
+
890 895
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
891 896
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
892 897
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/FolgerTech/i3-2020/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   #define LCD_PROGRESS_BAR                // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Formbot/Raptor/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 #define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Formbot/T_Rex_3/Configuration_adv.h Zobrazit soubor

@@ -892,6 +892,11 @@
892 892
 // Add an 'M73' G-code to set the current percentage
893 893
 #define LCD_SET_PROGRESS_MANUALLY
894 894
 
895
+#if HAS_PRINT_PROGRESS
896
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
897
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
898
+#endif
899
+
895 900
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
896 901
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
897 902
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Geeetech/A10/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Geeetech/A10M/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   #define LCD_PROGRESS_BAR                // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Geeetech/A20M/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   #define LCD_PROGRESS_BAR                // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Geeetech/MeCreator2/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/HMS434/Configuration_adv.h Zobrazit soubor

@@ -856,6 +856,11 @@
856 856
 // Add an 'M73' G-code to set the current percentage
857 857
 //#define LCD_SET_PROGRESS_MANUALLY
858 858
 
859
+#if HAS_PRINT_PROGRESS
860
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
861
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
862
+#endif
863
+
859 864
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
860 865
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
861 866
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Infitary/i3-M508/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/JGAurora/A1/Configuration_adv.h Zobrazit soubor

@@ -893,6 +893,11 @@
893 893
 // Add an 'M73' G-code to set the current percentage
894 894
 //#define LCD_SET_PROGRESS_MANUALLY
895 895
 
896
+#if HAS_PRINT_PROGRESS
897
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
898
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
899
+#endif
900
+
896 901
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
897 902
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
898 903
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/JGAurora/A5/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/JGAurora/A5S/Configuration_adv.h Zobrazit soubor

@@ -893,6 +893,11 @@
893 893
 // Add an 'M73' G-code to set the current percentage
894 894
 //#define LCD_SET_PROGRESS_MANUALLY
895 895
 
896
+#if HAS_PRINT_PROGRESS
897
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
898
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
899
+#endif
900
+
896 901
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
897 902
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
898 903
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/MakerParts/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Malyan/M150/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Malyan/M200/Configuration_adv.h Zobrazit soubor

@@ -890,6 +890,11 @@
890 890
 // Add an 'M73' G-code to set the current percentage
891 891
 //#define LCD_SET_PROGRESS_MANUALLY
892 892
 
893
+#if HAS_PRINT_PROGRESS
894
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
895
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
896
+#endif
897
+
893 898
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
894 899
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
895 900
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Micromake/C1/enhanced/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Mks/Robin/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Mks/Sbase/Configuration_adv.h Zobrazit soubor

@@ -889,6 +889,11 @@
889 889
 // Add an 'M73' G-code to set the current percentage
890 890
 //#define LCD_SET_PROGRESS_MANUALLY
891 891
 
892
+#if HAS_PRINT_PROGRESS
893
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
894
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
895
+#endif
896
+
892 897
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
893 898
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
894 899
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/RapideLite/RL200/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/RigidBot/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/SCARA/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Sanguinololu/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Tevo/Michelangelo/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 #define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Tevo/Tarantula Pro/Configuration_adv.h Zobrazit soubor

@@ -884,6 +884,11 @@
884 884
 // Add an 'M73' G-code to set the current percentage
885 885
 #define LCD_SET_PROGRESS_MANUALLY
886 886
 
887
+#if HAS_PRINT_PROGRESS
888
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
889
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
890
+#endif
891
+
887 892
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
888 893
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
889 894
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 #define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 #define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/TheBorg/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/TinyBoy2/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Tronxy/X3A/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Tronxy/X5S-2E/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/UltiMachine/Archim1/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/UltiMachine/Archim2/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/VORONDesign/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Velleman/K8200/Configuration_adv.h Zobrazit soubor

@@ -901,6 +901,11 @@
901 901
 // Add an 'M73' G-code to set the current percentage
902 902
 //#define LCD_SET_PROGRESS_MANUALLY
903 903
 
904
+#if HAS_PRINT_PROGRESS
905
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
906
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
907
+#endif
908
+
904 909
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
905 910
   #define LCD_PROGRESS_BAR                // Show a progress bar on HD44780 LCDs for SD printing
906 911
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Velleman/K8400/Dual-head/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 5
- 0
config/examples/Velleman/K8400/Single-head/Configuration_adv.h Zobrazit soubor

@@ -888,6 +888,11 @@
888 888
 // Add an 'M73' G-code to set the current percentage
889 889
 //#define LCD_SET_PROGRESS_MANUALLY
890 890
 
891
+#if HAS_PRINT_PROGRESS
892
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only)
893
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion (Graphical LCD only)
894
+#endif
895
+
891 896
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
892 897
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
893 898
   #if ENABLED(LCD_PROGRESS_BAR)

+ 0
- 0
config/examples/WASP/PowerWASP/Configuration_adv.h Zobrazit soubor


Některé soubory nejsou zobrazny, neboť je v této revizi změněno mnoho souborů

Loading…
Zrušit
Uložit