CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EVENT_GCODE_SD_STOP => ABORT (#18978)

Browse Source
This commit is contained in:
Robby Candra 2020-08-11 08:25:35 +07:00 committed by Scott Lahteine
parent 3e2b272239
commit 648b253f41
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View File

@ -1137,7 +1137,7 @@
//#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files //#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files
#define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop Print (e.g., "G28XY" or "G27") #define EVENT_GCODE_SD_ABORT "G28XY" // G-code to run on SD Abort Print (e.g., "G28XY" or "G27")
#if ENABLED(PRINTER_EVENT_LEDS) #if ENABLED(PRINTER_EVENT_LEDS)
#define PE_LEDS_COMPLETED_TIME (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination #define PE_LEDS_COMPLETED_TIME (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination

4
Marlin/src/MarlinCore.cpp
View File

@ -453,8 +453,8 @@ void startOrResumeJob() {
#endif #endif
wait_for_heatup = false; wait_for_heatup = false;
TERN_(POWER_LOSS_RECOVERY, recovery.purge()); TERN_(POWER_LOSS_RECOVERY, recovery.purge());
#ifdef EVENT_GCODE_SD_STOP #ifdef EVENT_GCODE_SD_ABORT
queue.inject_P(PSTR(EVENT_GCODE_SD_STOP)); queue.inject_P(PSTR(EVENT_GCODE_SD_ABORT));
#endif #endif
TERN_(PASSWORD_AFTER_SD_PRINT_ABORT, password.lock_machine()); TERN_(PASSWORD_AFTER_SD_PRINT_ABORT, password.lock_machine());

6
Marlin/src/inc/SanityCheck.h
View File

@ -517,6 +517,8 @@
#error "TOUCH_BUTTONS is now TOUCH_SCREEN. Please update your Configuration.h." #error "TOUCH_BUTTONS is now TOUCH_SCREEN. Please update your Configuration.h."
#elif defined(ANYCUBIC_TFT_MODEL) #elif defined(ANYCUBIC_TFT_MODEL)
#error "ANYCUBIC_TFT_MODEL is now ANYCUBIC_LCD_I3MEGA. Please update your Configuration.h." #error "ANYCUBIC_TFT_MODEL is now ANYCUBIC_LCD_I3MEGA. Please update your Configuration.h."
#elif defined(EVENT_GCODE_SD_STOP)
#error "EVENT_GCODE_SD_STOP is now EVENT_GCODE_SD_ABORT. Please update your Configuration.h."
#endif #endif
#ifdef FIL_RUNOUT_INVERTING #ifdef FIL_RUNOUT_INVERTING
@ -742,8 +744,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif #endif
#endif #endif
#if defined(EVENT_GCODE_SD_STOP) && DISABLED(NOZZLE_PARK_FEATURE) #if defined(EVENT_GCODE_SD_ABORT) && DISABLED(NOZZLE_PARK_FEATURE)
static_assert(nullptr == strstr(EVENT_GCODE_SD_STOP, "G27"), "NOZZLE_PARK_FEATURE is required to use G27 in EVENT_GCODE_SD_STOP."); static_assert(nullptr == strstr(EVENT_GCODE_SD_ABORT, "G27"), "NOZZLE_PARK_FEATURE is required to use G27 in EVENT_GCODE_SD_ABORT.");
#endif #endif
/** /**

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

@ -2072,9 +2072,9 @@ void HMI_PauseOrStop(void) {
#ifdef ACTION_ON_CANCEL #ifdef ACTION_ON_CANCEL
host_action_cancel(); host_action_cancel();
#endif #endif
#ifdef EVENT_GCODE_SD_STOP #ifdef EVENT_GCODE_SD_ABORT
Popup_Window_Home(); Popup_Window_Home();
queue.inject_P(PSTR(EVENT_GCODE_SD_STOP)); // For Ender 3 "G28 X Y" queue.inject_P(PSTR(EVENT_GCODE_SD_ABORT));
#endif #endif
abort_flag = true; abort_flag = true;
#endif #endif