zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Ender-3 V2 DWIN Stop SD Print (#19642)

Browse source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
signetica 2020-10-06 15:58:28 -06:00 committed by Scott Lahteine
parent 8a69147adf
commit 6fcbf11454
1 changed files with 12 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Marlin/src/lcd/dwin/e3v2/dwin.cpp
View file

@ -181,7 +181,7 @@ uint8_t index_file = MROWS,
index_leveling = MROWS, index_leveling = MROWS,
index_tune = MROWS; index_tune = MROWS;
bool dwin_abort_flag = false; bool dwin_abort_flag = false; // Flag to reset feedrate, return to Home
constexpr float default_max_feedrate[] = DEFAULT_MAX_FEEDRATE; constexpr float default_max_feedrate[] = DEFAULT_MAX_FEEDRATE;
constexpr float default_max_acceleration[] = DEFAULT_MAX_ACCELERATION; constexpr float default_max_acceleration[] = DEFAULT_MAX_ACCELERATION;
@ -1801,8 +1801,8 @@ void HMI_SDCardUpdate() {
// TODO: Move card removed abort handling // TODO: Move card removed abort handling
// to CardReader::manage_media. // to CardReader::manage_media.
card.flag.abort_sd_printing = true; card.flag.abort_sd_printing = true;
wait_for_heatup = false; wait_for_heatup = wait_for_user = false;
dwin_abort_flag = true; dwin_abort_flag = true; // Reset feedrate, return to Home
} }
} }
DWIN_UpdateLCD(); DWIN_UpdateLCD();
@ -2097,7 +2097,7 @@ void HMI_Printing() {
if (HMI_flag.done_confirm_flag) { if (HMI_flag.done_confirm_flag) {
if (encoder_diffState == ENCODER_DIFF_ENTER) { if (encoder_diffState == ENCODER_DIFF_ENTER) {
HMI_flag.done_confirm_flag = false; HMI_flag.done_confirm_flag = false;
dwin_abort_flag = true; dwin_abort_flag = true; // Reset feedrate, return to Home
} }
return; return;
} }
@ -2206,25 +2206,15 @@ void HMI_PauseOrStop() {
} }
else if (select_print.now == 2) { // stop window else if (select_print.now == 2) { // stop window
if (HMI_flag.select_flag) { if (HMI_flag.select_flag) {
wait_for_heatup = false; // Stop waiting for heater checkkey = Back_Main;
if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!
#if 0 wait_for_heatup = wait_for_user = false; // Stop waiting for heating/user
// TODO: In ExtUI or MarlinUI add a common stop event card.flag.abort_sd_printing = true; // Let the main loop handle SD abort
// card.flag.abort_sd_printing = true; dwin_abort_flag = true; // Reset feedrate, return to Home
#else #ifdef ACTION_ON_CANCEL
checkkey = Back_Main; host_action_cancel();
// Wait for planner moves to finish!
if (HMI_flag.home_flag) planner.synchronize();
card.endFilePrint();
#ifdef ACTION_ON_CANCEL
host_action_cancel();
#endif
#ifdef EVENT_GCODE_SD_ABORT
Popup_Window_Home(true);
queue.inject_P(PSTR(EVENT_GCODE_SD_ABORT));
#endif
dwin_abort_flag = true;
#endif #endif
Popup_Window_Home(true);
} }
else else
Goto_PrintProcess(); // cancel stop Goto_PrintProcess(); // cancel stop
@ -3584,13 +3574,6 @@ void EachMomentUpdate() {
dwin_abort_flag = false; dwin_abort_flag = false;
HMI_ValueStruct.print_speed = feedrate_percentage = 100; HMI_ValueStruct.print_speed = feedrate_percentage = 100;
dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z); dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
planner.finish_and_disable();
#if DISABLED(SD_ABORT_NO_COOLDOWN)
thermalManager.disable_all_heaters();
#endif
select_page.set(0); select_page.set(0);
Goto_MainMenu(); Goto_MainMenu();
} }