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

Disable heaters/steppers before message

Browse Source
This commit is contained in:
Scott Lahteine 2018-10-19 13:30:37 -05:00
parent 71e19baf69
commit 3847c08f7e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/src/Marlin.cpp
View File

@ -610,12 +610,13 @@ void idle(
* After this the machine will need to be reset.
*/
void kill(PGM_P const lcd_msg/*=NULL*/) {
SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
thermalManager.disable_all_heaters();
disable_all_steppers();
SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
#if ENABLED(EXTENSIBLE_UI)
UI::onPrinterKilled(lcd_msg ? lcd_msg : PSTR(MSG_KILLED));
#elif ENABLED(ULTRA_LCD)
@ -633,9 +634,9 @@ void kill(PGM_P const lcd_msg/*=NULL*/) {
void minkill() {
_delay_ms(600); // Wait a short time (allows messages to get out before shutting down.
cli(); // Stop interrupts
_delay_ms(250); // Wait to ensure all interrupts stopped
_delay_ms(600); // Wait a short time (allows messages to get out before shutting down.
cli(); // Stop interrupts
_delay_ms(250); // Wait to ensure all interrupts stopped
thermalManager.disable_all_heaters(); // turn off heaters again