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

merging

Browse Source
This commit is contained in:
Erik van der Zalm
2011-12-12 20:35:46 +01:00
parent e017228569 3320a5b37d
commit 84d9cf7339
12 changed files with 358 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/temperature.cpp
View File

@ -85,6 +85,7 @@ static unsigned long previous_millis_bed_heater;
#ifdef WATCHPERIOD
static int watch_raw[EXTRUDERS] = { -1000 }; // the first value used for all
static int watch_oldtemp[3] = {0,0,0};
static unsigned long watchmillis = 0;
#endif //WATCHPERIOD
@ -213,7 +214,20 @@ void manage_heater()
soft_pwm[e] = 0;
}
} // End extruder for loop
#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();
@ -493,6 +507,7 @@ void setWatch()
for (int e = 0; e < EXTRUDERS; e++)
{
if(isHeatingHotend(e))
watch_oldtemp[TEMPSENSOR_HOTEND_0] = degHotend(0);
{
t = max(t,millis());
watch_raw[e] = current_raw[e];