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

heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now.

Browse Source
This commit is contained in:
Bernhard
2011-12-09 17:06:56 +01:00
parent b1d84d879b
commit 88ee053af0
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Marlin/temperature.cpp
View File

@ -88,7 +88,7 @@ static unsigned long previous_millis_bed_heater;
#endif //PIDTEMP
#ifdef WATCHPERIOD
static int watch_raw[3] = {-1000,-1000,-1000};
static int watch_oldtemp[3] = {0,0,0};
static unsigned long watchmillis = 0;
#endif //WATCHPERIOD
@ -186,7 +186,20 @@ void manage_heater()
WRITE(HEATER_0_PIN,LOW);
}
#endif
#ifdef WATCHPERIOD
if(watchmillis && millis() - watchmillis > WATCHPERIOD){
if(watch_oldtemp[TEMPSENSOR_HOTEND_0] >= degHotend(active_extruder)){
setTargetHotend(0,active_extruder);
LCD_MESSAGEPGM("Heating failed");
SERIAL_ECHO_START;
SERIAL_ECHOLN("Heating failed");
}else{
watchmillis = 0;
}
}
#endif
if(millis() - previous_millis_bed_heater < BED_CHECK_INTERVAL)
return;
previous_millis_bed_heater = millis();
@ -426,7 +439,7 @@ void setWatch()
if(isHeatingHotend0())
{
watchmillis = max(1,millis());
watch_raw[TEMPSENSOR_HOTEND_0] = current_raw[TEMPSENSOR_HOTEND_0];
watch_oldtemp[TEMPSENSOR_HOTEND_0] = degHotend(0);
}
else
{