thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

♻️ Set Progress without LCD (#24767)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
EvilGremlin
2022-10-09 18:30:47 +03:00
committed by Scott Lahteine
parent 0d8a695ea9
commit f595e40ceb
34 changed files with 626 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
View File

@@ -63,7 +63,7 @@ const uint16_t VPList_Main[] PROGMEM = {
VP_XPos, VP_YPos, VP_ZPos,
VP_Fan0_Percentage,
VP_Feedrate_Percentage,
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
#if ENABLED(SET_PROGRESS_PERCENT)
VP_PrintProgress_Percentage,
#endif
0x0000

2
Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
View File

@@ -63,7 +63,7 @@ const uint16_t VPList_Main[] PROGMEM = {
VP_XPos, VP_YPos, VP_ZPos,
VP_Fan0_Percentage,
VP_Feedrate_Percentage,
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
#if ENABLED(SET_PROGRESS_PERCENT)
VP_PrintProgress_Percentage,
#endif
0x0000

2
Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
View File

@@ -135,7 +135,7 @@ const uint16_t VPList_Main[] PROGMEM = {
VP_XPos, VP_YPos, VP_ZPos,
VP_Fan0_Percentage,
VP_Feedrate_Percentage,
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
#if ENABLED(SET_PROGRESS_PERCENT)
VP_PrintProgress_Percentage,
#endif
0x0000

4
Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
View File

@@ -39,7 +39,7 @@
#include "../../../feature/powerloss.h"
#endif
#if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
#if ENABLED(SET_REMAINING_TIME)
#include "../../marlinui.h"
#endif
@@ -244,7 +244,7 @@ void disp_fan_speed() {
}
void disp_print_time() {
#if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
#if ENABLED(SET_REMAINING_TIME)
const uint32_t r = ui.get_remaining_time();
sprintf_P(public_buf_l, PSTR("%02d:%02d R"), r / 3600, (r % 3600) / 60);
#else

3
Marlin/src/lcd/extui/ui_api.h
View File

@@ -164,6 +164,9 @@ namespace ExtUI {
#if ENABLED(SHOW_REMAINING_TIME)
inline uint32_t getProgress_seconds_remaining() { return ui.get_remaining_time(); }
#endif
#if ENABLED(SHOW_INTERACTION_TIME)
inline uint32_t getInteraction_seconds_remaining() { return ui.interaction_time; }
#endif
#if HAS_LEVELING
bool getLevelingActive();