bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 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 b0f02b8f9e
commit 8481264566
34 changed files with 626 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View File

@ -733,7 +733,7 @@ void CrealityDWINClass::Draw_Print_Screen() {
Update_Status_Bar(true);
Draw_Print_ProgressBar();
Draw_Print_ProgressElapsed();
TERN_(USE_M73_REMAINING_TIME, Draw_Print_ProgressRemain());
TERN_(SET_REMAINING_TIME, Draw_Print_ProgressRemain());
Draw_Print_Filename(true);
}
@ -759,7 +759,7 @@ void CrealityDWINClass::Draw_Print_ProgressBar() {
DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 133, 133, F("%"));
}
#if ENABLED(USE_M73_REMAINING_TIME)
#if ENABLED(SET_REMAINING_TIME)
void CrealityDWINClass::Draw_Print_ProgressRemain() {
uint16_t remainingtime = ui.get_remaining_time();
@ -4565,8 +4565,8 @@ void CrealityDWINClass::Start_Print(bool sd) {
}
else
strcpy_P(filename, PSTR("Host Print"));
TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(0));
TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
TERN_(SET_PROGRESS_PERCENT, ui.set_progress(0));
TERN_(SET_REMAINING_TIME, ui.set_remaining_time(0));
Draw_Print_Screen();
}
}
@ -4575,8 +4575,8 @@ void CrealityDWINClass::Stop_Print() {
printing = false;
sdprint = false;
thermalManager.cooldown();
TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(100 * (PROGRESS_SCALE)));
TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
TERN_(SET_PROGRESS_PERCENT, ui.set_progress(100 * (PROGRESS_SCALE)));
TERN_(SET_REMAINING_TIME, ui.set_remaining_time(0));
Draw_Print_confirm();
}
@ -4653,7 +4653,7 @@ void CrealityDWINClass::Screen_Update() {
if (process == Print) {
Draw_Print_ProgressBar();
Draw_Print_ProgressElapsed();
TERN_(USE_M73_REMAINING_TIME, Draw_Print_ProgressRemain());
TERN_(SET_REMAINING_TIME, Draw_Print_ProgressRemain());
}
}

2
Marlin/src/lcd/e3v2/jyersui/dwin.h
View File

@ -188,7 +188,7 @@ public:
static void Draw_Print_Screen();
static void Draw_Print_Filename(const bool reset=false);
static void Draw_Print_ProgressBar();
#if ENABLED(USE_M73_REMAINING_TIME)
#if ENABLED(SET_REMAINING_TIME)
static void Draw_Print_ProgressRemain();
#endif
static void Draw_Print_ProgressElapsed();

6
Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
View File

@ -374,11 +374,11 @@ void MarlinUI::draw_status_screen() {
#if ENABLED(DWIN_MARLINUI_PORTRAIT)
// Portrait mode only shows one value at a time, and will rotate if ROTATE_PROGRESS_DISPLAY
// Portrait mode only shows one value at a time, and will rotate if many are enabled
dwin_string.set();
char prefix = ' ';
#if ENABLED(SHOW_REMAINING_TIME)
if (TERN1(ROTATE_PROGRESS_DISPLAY, blink) && print_job_timer.isRunning()) {
if (blink && print_job_timer.isRunning()) {
time = get_remaining_time();
prefix = 'R';
}
@ -447,7 +447,7 @@ void MarlinUI::draw_status_screen() {
//if (pb_solid < old_solid)
DWIN_Draw_Rectangle(1, Color_Bg_Black, pb_left + 1 + pb_solid, pb_top + 1, pb_right - 1, pb_bottom - 1); // Erase the rest
#if ENABLED(SHOW_SD_PERCENT)
#if ENABLED(SHOW_PROGRESS_PERCENT)
dwin_string.set(TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))));
dwin_string.add('%');
DWIN_Draw_String(

4
Marlin/src/lcd/e3v2/proui/dwin.cpp
View File

@ -43,8 +43,8 @@
#if DISABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
#warning "INDIVIDUAL_AXIS_HOMING_SUBMENU is recommended with ProUI."
#endif
#if DISABLED(LCD_SET_PROGRESS_MANUALLY)
#warning "LCD_SET_PROGRESS_MANUALLY is recommended with ProUI."
#if DISABLED(SET_PROGRESS_MANUALLY)
#warning "SET_PROGRESS_MANUALLY is recommended with ProUI."
#endif
#if DISABLED(STATUS_MESSAGE_SCROLLING)
#warning "STATUS_MESSAGE_SCROLLING is recommended with ProUI."