MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #6190 from Bob-the-Kuhn/Stop-and-Kill-prints---round-2

Browse Source 
Message for every KILL and STOP (also need delays)
This commit is contained in:
Scott Lahteine 2017-04-06 20:40:12 -05:00 committed by GitHub
commit b23aef5b8d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/Marlin_main.cpp
View File

@ -11247,7 +11247,7 @@ void kill(const char* lcd_msg) {
UNUSED(lcd_msg); UNUSED(lcd_msg);
#endif #endif
_delay_ms(250); // Wait a short time _delay_ms(600); // Wait a short time (allows messages to get out before shutting down.
cli(); // Stop interrupts cli(); // Stop interrupts
_delay_ms(250); //Wait to ensure all interrupts routines stopped _delay_ms(250); //Wait to ensure all interrupts routines stopped
@ -11272,11 +11272,12 @@ void kill(const char* lcd_msg) {
void stop() { void stop() {
thermalManager.disable_all_heaters(); thermalManager.disable_all_heaters();
if (IsRunning()) { if (IsRunning()) {
Running = false;
Stopped_gcode_LastN = gcode_LastN; // Save last g_code for restart Stopped_gcode_LastN = gcode_LastN; // Save last g_code for restart
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_STOPPED); SERIAL_ERRORLNPGM(MSG_ERR_STOPPED);
LCD_MESSAGEPGM(MSG_STOPPED); LCD_MESSAGEPGM(MSG_STOPPED);
safe_delay(350); // allow enough time for messages to get out before stopping
Running = false;
} }
} }