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

MKS H43 controller (#20609)

Browse Source
This commit is contained in:
Sola
2021-02-28 07:35:32 +08:00
committed by GitHub
parent e0aa9ce372
commit c76008bd6a
33 changed files with 6314 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/gcode/sd/M24_M25.cpp
View File

@ -41,6 +41,10 @@
#include "../../feature/powerloss.h"
#endif
#if ENABLED(DGUS_LCD_UI_MKS)
#include "../../lcd/extui/lib/dgus/DGUSDisplayDef.h"
#endif
#include "../../MarlinCore.h" // for startOrResumeJob
/**
@ -48,6 +52,11 @@
*/
void GcodeSuite::M24() {
#if ENABLED(DGUS_LCD_UI_MKS)
if ((print_job_timer.isPaused() || print_job_timer.isRunning()) && !parser.seen("ST"))
MKS_resume_print_move();
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
if (parser.seenval('S')) card.setIndex(parser.value_long());
if (parser.seenval('T')) print_job_timer.resume(parser.value_long());
@ -98,9 +107,9 @@ void GcodeSuite::M25() {
print_job_timer.pause();
#if DISABLED(DWIN_CREALITY_LCD)
ui.reset_status();
#endif
TERN_(DGUS_LCD_UI_MKS, MKS_pause_print_move());
IF_DISABLED(DWIN_CREALITY_LCD, ui.reset_status());
#if ENABLED(HOST_ACTION_COMMANDS)
TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, PSTR("Pause SD"), PSTR("Resume")));