SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6088 from rafaljot/patch-3

Browse source 
Update Marlin_main.cpp
This commit is contained in:
Scott Lahteine 2017-03-23 01:51:51 -05:00 committed by GitHub
commit 8f9face956
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/Marlin_main.cpp
View file

@ -10595,17 +10595,20 @@ void kill(const char* lcd_msg) {
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_KILLED); SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
thermalManager.disable_all_heaters();
disable_all_steppers();
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
kill_screen(lcd_msg); kill_screen(lcd_msg);
#else #else
UNUSED(lcd_msg); UNUSED(lcd_msg);
#endif #endif
delay(500); // Wait a short time _delay_ms(250); // Wait a short time
cli(); // Stop interrupts cli(); // Stop interrupts
thermalManager.disable_all_heaters();
disable_all_steppers(); _delay_ms(250); //Wait to ensure all interrupts routines stopped
thermalManager.disable_all_heaters(); //turn off heaters again
#if HAS_POWER_SWITCH #if HAS_POWER_SWITCH
SET_INPUT(PS_ON_PIN); SET_INPUT(PS_ON_PIN);