Browse Source

Followup to progress override (#15488)

LinFor 5 years ago
parent
commit
58f81f8e7e

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.cpp View File

200
   VPHELPER(VP_ZPos, &current_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
200
   VPHELPER(VP_ZPos, &current_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
201
 
201
 
202
   // Print Progress.
202
   // Print Progress.
203
-  VPHELPER(VP_PrintProgress_Percentage, &ui.progress_bar_percent, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay ),
203
+  VPHELPER(VP_PrintProgress_Percentage, &ui.progress_override, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay ),
204
 
204
 
205
   // Print Time
205
   // Print Time
206
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay ),
206
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay ),

+ 8
- 9
Marlin/src/lcd/ultralcd.cpp View File

61
 #endif
61
 #endif
62
 
62
 
63
 #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
63
 #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
64
-  uint8_t MarlinUI::progress_bar_percent; // = 0
64
+  uint8_t MarlinUI::progress_override; // = 0
65
 #endif
65
 #endif
66
 
66
 
67
 #if HAS_BUZZER
67
 #if HAS_BUZZER
1539
   #if HAS_PRINT_PROGRESS
1539
   #if HAS_PRINT_PROGRESS
1540
     uint8_t MarlinUI::get_progress() {
1540
     uint8_t MarlinUI::get_progress() {
1541
       #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
1541
       #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
1542
-        uint8_t &progress = progress_bar_percent;
1543
-        #define _PLIMIT(P) ((P) & 0x7F)
1542
+        const uint8_t p = progress_override & 0x7F;
1544
       #else
1543
       #else
1545
-        #define _PLIMIT(P) P
1546
-        uint8_t progress = 0;
1544
+        constexpr uint8_t p = 0;
1547
       #endif
1545
       #endif
1548
-      #if ENABLED(SDSUPPORT)
1549
-        if (!_PLIMIT(progress)) progress = card.percentDone();
1550
-      #endif
1551
-      return _PLIMIT(progress);
1546
+      return (p
1547
+        #if ENABLED(SDSUPPORT)
1548
+          ?: card.percentDone()
1549
+        #endif
1550
+      );
1552
     }
1551
     }
1553
   #endif
1552
   #endif
1554
 
1553
 

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

293
 
293
 
294
     #if HAS_PRINT_PROGRESS
294
     #if HAS_PRINT_PROGRESS
295
       #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
295
       #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
296
-        static uint8_t progress_bar_percent;
297
-        static void set_progress(const uint8_t progress) { progress_bar_percent = _MIN(progress, 100); }
296
+        static uint8_t progress_override;
297
+        static void set_progress(const uint8_t progress) { progress_override = _MIN(progress, 100); }
298
         static void set_progress_done() { set_progress(0x80 + 100); }
298
         static void set_progress_done() { set_progress(0x80 + 100); }
299
-        static void progress_reset() { if (progress_bar_percent & 0x80) set_progress(0); }
299
+        static void progress_reset() { if (progress_override & 0x80) set_progress(0); }
300
       #endif
300
       #endif
301
       static uint8_t get_progress();
301
       static uint8_t get_progress();
302
     #else
302
     #else

Loading…
Cancel
Save