bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #4254 from AnHardt/killscreen

Browse Source 
Add a kill-screen
This commit is contained in:
Scott Lahteine
2016-07-09 20:44:42 -07:00
committed by GitHub
parent 3b3e52616c faac2bcfdb
commit f9e08b1fcd
6 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/Marlin_main.cpp
View File

@ -8199,13 +8199,17 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
}
void kill(const char* lcd_msg) {
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
#if ENABLED(ULTRA_LCD)
lcd_init();
lcd_setalertstatuspgm(lcd_msg);
kill_screen(lcd_msg);
#else
UNUSED(lcd_msg);
#endif
for (int i = 5; i--;) delay(100); // Wait a short time
cli(); // Stop interrupts
thermalManager.disable_all_heaters();
disable_all_steppers();
@ -8214,13 +8218,6 @@ void kill(const char* lcd_msg) {
pinMode(PS_ON_PIN, INPUT);
#endif
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
// FMC small patch to update the LCD before ending
sei(); // enable interrupts
for (int i = 5; i--; lcd_update()) delay(200); // Wait a short time
cli(); // disable interrupts
suicide();
while (1) {
#if ENABLED(USE_WATCHDOG)