josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #830 from PavelSindler/crash_det_cool_hotend 

Crash detection: set nozzle target temp to zero when waiting for user
This commit is contained in:
XPila 2018-06-11 15:43:54 +02:00 committed by GitHub
parent 5178675cdd 2f5bb80e98
commit d6ccaa7c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Firmware/Marlin_main.cpp
View File

@ -693,7 +693,6 @@ void crashdet_detected(uint8_t mask)
st_synchronize(); st_synchronize();
static uint8_t crashDet_counter = 0; static uint8_t crashDet_counter = 0;
bool automatic_recovery_after_crash = true; bool automatic_recovery_after_crash = true;
bool yesno;
if (crashDet_counter++ == 0) { if (crashDet_counter++ == 0) {
crashDetTimer.start(); crashDetTimer.start();
@ -734,18 +733,25 @@ void crashdet_detected(uint8_t mask)
gcode_G28(true, true, false, false); //home X and Y gcode_G28(true, true, false, false); //home X and Y
st_synchronize(); st_synchronize();
if(automatic_recovery_after_crash) if (automatic_recovery_after_crash) {
yesno = true;
else
yesno = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Crash detected. Resume print?"), false);
lcd_update_enable(true);
if (yesno)
{
enquecommand_P(PSTR("CRASH_RECOVER")); enquecommand_P(PSTR("CRASH_RECOVER"));
} }else{
else HotendTempBckp = degTargetHotend(active_extruder);
{ setTargetHotend(0, active_extruder);
enquecommand_P(PSTR("CRASH_CANCEL")); bool yesno = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Crash detected. Resume print?"), false);
lcd_update_enable(true);
if (yesno)
{
char cmd1[10];
strcpy(cmd1, "M109 S");
strcat(cmd1, ftostr3(HotendTempBckp));
enquecommand(cmd1);
enquecommand_P(PSTR("CRASH_RECOVER"));
}
else
{
enquecommand_P(PSTR("CRASH_CANCEL"));
}
} }
} }