|
@@ -610,12 +610,13 @@ void idle(
|
610
|
610
|
* After this the machine will need to be reset.
|
611
|
611
|
*/
|
612
|
612
|
void kill(PGM_P const lcd_msg/*=NULL*/) {
|
613
|
|
- SERIAL_ERROR_START();
|
614
|
|
- SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
|
615
|
613
|
|
616
|
614
|
thermalManager.disable_all_heaters();
|
617
|
615
|
disable_all_steppers();
|
618
|
616
|
|
|
617
|
+ SERIAL_ERROR_START();
|
|
618
|
+ SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
|
|
619
|
+
|
619
|
620
|
#if ENABLED(EXTENSIBLE_UI)
|
620
|
621
|
UI::onPrinterKilled(lcd_msg ? lcd_msg : PSTR(MSG_KILLED));
|
621
|
622
|
#elif ENABLED(ULTRA_LCD)
|
|
@@ -633,9 +634,9 @@ void kill(PGM_P const lcd_msg/*=NULL*/) {
|
633
|
634
|
|
634
|
635
|
void minkill() {
|
635
|
636
|
|
636
|
|
- _delay_ms(600); // Wait a short time (allows messages to get out before shutting down.
|
637
|
|
- cli(); // Stop interrupts
|
638
|
|
- _delay_ms(250); // Wait to ensure all interrupts stopped
|
|
637
|
+ _delay_ms(600); // Wait a short time (allows messages to get out before shutting down.
|
|
638
|
+ cli(); // Stop interrupts
|
|
639
|
+ _delay_ms(250); // Wait to ensure all interrupts stopped
|
639
|
640
|
|
640
|
641
|
thermalManager.disable_all_heaters(); // turn off heaters again
|
641
|
642
|
|