Browse Source

No USE_M73_REMAINING_TIME without LCD_SET_PROGRESS_MANUALLY

Scott Lahteine 4 years ago
parent
commit
602ca5dea6

+ 1
- 1
Marlin/src/Marlin.cpp View File

@@ -378,7 +378,7 @@ void startOrResumeJob() {
378 378
     #if ENABLED(LCD_SHOW_E_TOTAL)
379 379
       e_move_accumulator = 0;
380 380
     #endif
381
-    #if ENABLED(USE_M73_REMAINING_TIME)
381
+    #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
382 382
       ui.reset_remaining_time();
383 383
     #endif
384 384
   }

+ 1
- 1
Marlin/src/gcode/lcd/M73.cpp View File

@@ -43,7 +43,7 @@ void GcodeSuite::M73() {
43 43
       ? parser.value_float() * (PROGRESS_SCALE)
44 44
       : parser.value_byte()
45 45
     );
46
-  #if ENABLED(USE_M73_REMAINING_TIME)
46
+  #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
47 47
     if (parser.seen('R')) ui.set_remaining_time(60 * parser.value_ulong());
48 48
   #endif
49 49
 }

+ 1
- 1
Marlin/src/lcd/dogm/status_screen_DOGM.cpp View File

@@ -456,7 +456,7 @@ void MarlinUI::draw_status_screen() {
456 456
         #if ENABLED(SHOW_REMAINING_TIME)
457 457
           if (!(ev & 0x3)) {
458 458
             uint32_t timeval = (0
459
-              #if ENABLED(USE_M73_REMAINING_TIME)
459
+              #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
460 460
                 + get_remaining_time()
461 461
               #endif
462 462
             );

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp View File

@@ -59,7 +59,7 @@
59 59
 
60 60
 #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
61 61
   MarlinUI::progress_t MarlinUI::progress_override; // = 0
62
-  #if ENABLED(USE_M73_REMAINING_TIME)
62
+  #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
63 63
     uint32_t MarlinUI::remaining_time;
64 64
   #endif
65 65
 #endif

+ 1
- 1
Marlin/src/lcd/ultralcd.h View File

@@ -304,7 +304,7 @@ public:
304 304
         static void set_progress(const progress_t p) { progress_override = _MIN(p, 100U * (PROGRESS_SCALE)); }
305 305
         static void set_progress_done() { progress_override = (PROGRESS_MASK + 1U) + 100U * (PROGRESS_SCALE); }
306 306
         static void progress_reset() { if (progress_override & (PROGRESS_MASK + 1U)) set_progress(0); }
307
-        #if ENABLED(USE_M73_REMAINING_TIME)
307
+        #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
308 308
           static uint32_t remaining_time;
309 309
           FORCE_INLINE static void set_remaining_time(const uint32_t r) { remaining_time = r; }
310 310
           FORCE_INLINE static uint32_t get_remaining_time() { return remaining_time; }

Loading…
Cancel
Save