bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Refactor Host Actions as singleton

Browse Source
This commit is contained in:
Scott Lahteine
2021-10-15 00:24:08 -05:00
committed by Scott Lahteine
parent 1ead7ce681
commit f80bcdcc5c
26 changed files with 208 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/e3v2/creality/dwin.cpp
View File

@ -2363,7 +2363,7 @@ void HMI_PauseOrStop() {
card.abortFilePrintSoon(); // Let the main loop handle SD abort
dwin_abort_flag = true; // Reset feedrate, return to Home
#ifdef ACTION_ON_CANCEL
host_action_cancel();
hostui.cancel();
#endif
Popup_Window_Home(true);
if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!

2
Marlin/src/lcd/e3v2/enhanced/dwin.cpp
View File

@ -1391,7 +1391,7 @@ void HMI_PauseOrStop() {
card.abortFilePrintSoon(); // Let the main loop handle SD abort
dwin_abort_flag = true; // Reset feedrate, return to Home
#ifdef ACTION_ON_CANCEL
host_action_cancel();
hostui.cancel();
#endif
DWIN_Draw_Popup(ICON_BLTouch, F("Stopping...") , F("Please wait until done."));
}

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

@ -4503,7 +4503,7 @@ void CrealityDWINClass::Print_Screen_Control() {
#endif
}
else {
TERN_(HOST_ACTION_COMMANDS, host_action_resume());
TERN_(HOST_ACTION_COMMANDS, hostui.resume());
}
Draw_Print_Screen();
}
@ -4553,7 +4553,7 @@ void CrealityDWINClass::Popup_Control() {
#endif
}
else {
TERN_(HOST_ACTION_COMMANDS, host_action_pause());
TERN_(HOST_ACTION_COMMANDS, hostui.pause());
}
}
Draw_Print_Screen();
@ -4566,7 +4566,7 @@ void CrealityDWINClass::Popup_Control() {
thermalManager.disable_all_heaters();
}
else {
TERN_(HOST_ACTION_COMMANDS, host_action_cancel());
TERN_(HOST_ACTION_COMMANDS, hostui.cancel());
}
}
else