Skip to content

Commit a2ddc27

Browse files
rmoravcikchristran206
rmoravcik
authored and
christran206
committed
M73 R : Set Remaining Time (MarlinFirmware#15549)
1 parent 736ed1f commit a2ddc27

File tree

109 files changed

+471
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+471
-133
lines changed

‎Marlin/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎Marlin/src/Marlin.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,9 @@ void startOrResumeJob() {
378378
#if ENABLED(LCD_SHOW_E_TOTAL)
379379
e_move_accumulator = 0;
380380
#endif
381+
#if ENABLED(USE_M73_REMAINING_TIME)
382+
ui.reset_remaining_time();
383+
#endif
381384
}
382385
print_job_timer.start();
383386
}

‎Marlin/src/gcode/lcd/M73.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ void GcodeSuite::M73() {
4343
? parser.value_float() * (PROGRESS_SCALE)
4444
: parser.value_byte()
4545
);
46+
#if ENABLED(USE_M73_REMAINING_TIME)
47+
if (parser.seen('R')) ui.set_remaining_time(60 * parser.value_ulong());
48+
#endif
4649
}
4750

4851
#endif // LCD_SET_PROGRESS_MANUALLY

‎Marlin/src/lcd/dogm/status_screen_DOGM.cpp

+13-7
Original file line numberDiff line numberDiff line change
@@ -455,19 +455,25 @@ void MarlinUI::draw_status_screen() {
455455

456456
#if ENABLED(SHOW_REMAINING_TIME)
457457
if (!(ev & 0x3)) {
458-
duration_t estimation = elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress;
459-
if (estimation.value == 0) {
458+
uint32_t timeval = (0
459+
#if ENABLED(USE_M73_REMAINING_TIME)
460+
+ get_remaining_time()
461+
#endif
462+
);
463+
if (!timeval) timeval = elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress;
464+
if (!timeval) {
460465
estimation_string[0] = '\0';
461466
estimation_x_pos = _SD_INFO_X(0);
462467
}
463468
else {
469+
duration_t estimation = timeval;
464470
const bool has_days = (estimation.value >= 60*60*24L);
465471
const uint8_t len = estimation.toDigital(estimation_string, has_days);
466-
#if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
467-
estimation_x_pos = _SD_INFO_X(len);
468-
#else
469-
estimation_x_pos = _SD_INFO_X(len + 1);
470-
#endif
472+
estimation_x_pos = _SD_INFO_X(len
473+
#if !BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
474+
+ 1
475+
#endif
476+
);
471477
}
472478
}
473479
#endif

‎Marlin/src/lcd/ultralcd.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@
5959

6060
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
6161
MarlinUI::progress_t MarlinUI::progress_override; // = 0
62+
#if ENABLED(USE_M73_REMAINING_TIME)
63+
uint32_t MarlinUI::remaining_time;
64+
#endif
6265
#endif
6366

6467
#if ENABLED(PCA9632_BUZZER) || USE_BEEPER

‎Marlin/src/lcd/ultralcd.h

+33-22
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,16 @@ class MarlinUI {
304304
static void set_progress(const progress_t p) { progress_override = _MIN(p, 100U * (PROGRESS_SCALE)); }
305305
static void set_progress_done() { progress_override = (PROGRESS_MASK + 1U) + 100U * (PROGRESS_SCALE); }
306306
static void progress_reset() { if (progress_override & (PROGRESS_MASK + 1U)) set_progress(0); }
307+
#if ENABLED(USE_M73_REMAINING_TIME)
308+
static uint32_t remaining_time;
309+
FORCE_INLINE static void set_remaining_time(const uint32_t r) { remaining_time = r; }
310+
FORCE_INLINE static uint32_t get_remaining_time() { return remaining_time; }
311+
FORCE_INLINE static void reset_remaining_time() { set_remaining_time(0); }
312+
#endif
307313
#endif
308314
static progress_t _get_progress();
309315
#if HAS_PRINT_PROGRESS_PERMYRIAD
310-
static uint16_t get_progress_permyriad() { return _get_progress(); }
316+
FORCE_INLINE static uint16_t get_progress_permyriad() { return _get_progress(); }
311317
#endif
312318
static uint8_t get_progress_percent() { return uint8_t(_get_progress() / (PROGRESS_SCALE)); }
313319
#else
@@ -321,9 +327,9 @@ class MarlinUI {
321327
static bool detected();
322328

323329
static LCDViewAction lcdDrawUpdate;
324-
static inline bool should_draw() { return bool(lcdDrawUpdate); }
325-
static inline void refresh(const LCDViewAction type) { lcdDrawUpdate = type; }
326-
static inline void refresh() { refresh(LCDVIEW_CLEAR_CALL_REDRAW); }
330+
FORCE_INLINE static bool should_draw() { return bool(lcdDrawUpdate); }
331+
FORCE_INLINE static void refresh(const LCDViewAction type) { lcdDrawUpdate = type; }
332+
FORCE_INLINE static void refresh() { refresh(LCDVIEW_CLEAR_CALL_REDRAW); }
327333

328334
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
329335
static void draw_custom_bootscreen(const uint8_t frame=0);
@@ -353,7 +359,7 @@ class MarlinUI {
353359
static void draw_progress_bar(const uint8_t percent);
354360
#if PROGRESS_MSG_EXPIRE > 0
355361
static millis_t expire_status_ms; // = 0
356-
static inline void reset_progress_bar_timeout() { expire_status_ms = 0; }
362+
FORCE_INLINE static void reset_progress_bar_timeout() { expire_status_ms = 0; }
357363
#endif
358364
#endif
359365

@@ -364,7 +370,7 @@ class MarlinUI {
364370
#if HAS_LCD_CONTRAST
365371
static int16_t contrast;
366372
static void set_contrast(const int16_t value);
367-
static inline void refresh_contrast() { set_contrast(contrast); }
373+
FORCE_INLINE static void refresh_contrast() { set_contrast(contrast); }
368374
#endif
369375

370376
#if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
@@ -477,13 +483,13 @@ class MarlinUI {
477483

478484
static void return_to_status();
479485
static inline bool on_status_screen() { return currentScreen == status_screen; }
480-
static inline void run_current_screen() { (*currentScreen)(); }
486+
FORCE_INLINE static void run_current_screen() { (*currentScreen)(); }
481487

482488
#if ENABLED(LIGHTWEIGHT_UI)
483489
static void lcd_in_status(const bool inStatus);
484490
#endif
485491

486-
static inline void defer_status_screen(const bool defer=true) {
492+
FORCE_INLINE static void defer_status_screen(const bool defer=true) {
487493
#if LCD_TIMEOUT_TO_STATUS
488494
defer_return_to_status = defer;
489495
#else
@@ -501,7 +507,7 @@ class MarlinUI {
501507
#endif
502508

503509
#if ENABLED(G26_MESH_VALIDATION)
504-
static inline void chirp() {
510+
FORCE_INLINE static void chirp() {
505511
#if HAS_BUZZER
506512
buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
507513
#endif
@@ -518,7 +524,7 @@ class MarlinUI {
518524

519525
static constexpr bool lcd_clicked = false;
520526
static constexpr bool on_status_screen() { return true; }
521-
static inline void run_current_screen() { status_screen(); }
527+
FORCE_INLINE static void run_current_screen() { status_screen(); }
522528

523529
#endif
524530

@@ -564,22 +570,27 @@ class MarlinUI {
564570

565571
#if EITHER(REVERSE_MENU_DIRECTION, REVERSE_SELECT_DIRECTION)
566572
static int8_t encoderDirection;
567-
static inline void encoder_direction_normal() { encoderDirection = ENCODERBASE; }
568573
#else
569574
static constexpr int8_t encoderDirection = ENCODERBASE;
570-
static inline void encoder_direction_normal() {}
571575
#endif
572576

573-
#if ENABLED(REVERSE_MENU_DIRECTION)
574-
static inline void encoder_direction_menus() { encoderDirection = -(ENCODERBASE); }
575-
#else
576-
static inline void encoder_direction_menus() {}
577-
#endif
578-
#if ENABLED(REVERSE_SELECT_DIRECTION)
579-
static inline void encoder_direction_select() { encoderDirection = -(ENCODERBASE); }
580-
#else
581-
static inline void encoder_direction_select() {}
582-
#endif
577+
FORCE_INLINE static void encoder_direction_normal() {
578+
#if EITHER(REVERSE_MENU_DIRECTION, REVERSE_SELECT_DIRECTION)
579+
encoderDirection = ENCODERBASE;
580+
#endif
581+
}
582+
583+
FORCE_INLINE static void encoder_direction_menus() {
584+
#if ENABLED(REVERSE_MENU_DIRECTION)
585+
encoderDirection = -(ENCODERBASE);
586+
#endif
587+
}
588+
589+
FORCE_INLINE static void encoder_direction_select() {
590+
#if ENABLED(REVERSE_SELECT_DIRECTION)
591+
encoderDirection = -(ENCODERBASE);
592+
#endif
593+
}
583594

584595
#else
585596

‎config/default/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/3DFabXYZ/Migbot/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/ADIMLab/Gantry v1/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/ADIMLab/Gantry v2/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/AlephObjects/TAZ4/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/Alfawise/U20-bltouch/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,10 @@
912912
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
913913
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
914914
//#define SHOW_REMAINING_TIME // Display estimated time to completion
915-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
915+
#if ENABLED(SHOW_REMAINING_TIME)
916+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
917+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
918+
#endif
916919
#endif
917920

918921
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/Alfawise/U20/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/AliExpress/UM2pExt/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/Anet/A2/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/Anet/A2plus/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/Anet/A6/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/Anet/A8/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/Anet/A8plus/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/Anet/E16/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/AnyCubic/i3/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,10 @@
911911
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
912912
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
913913
//#define SHOW_REMAINING_TIME // Display estimated time to completion
914-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
914+
#if ENABLED(SHOW_REMAINING_TIME)
915+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
916+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
917+
#endif
915918
#endif
916919

917920
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

‎config/examples/ArmEd/Configuration_adv.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,10 @@
915915
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
916916
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
917917
//#define SHOW_REMAINING_TIME // Display estimated time to completion
918-
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
918+
#if ENABLED(SHOW_REMAINING_TIME)
919+
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
920+
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
921+
#endif
919922
#endif
920923

921924
#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS

0 commit comments

Comments
 (0)