Merge pull request #2055 from thinkyhead/thermal_unified

Combine thermal runaway and watch-period
This commit is contained in:
Scott Lahteine
2015-05-12 08:04:29 -07:00
30 changed files with 428 additions and 362 deletions

View File

@ -3198,7 +3198,7 @@ inline void gcode_M104() {
setTargetHotend1(temp == 0.0 ? 0.0 : temp + duplicate_extruder_temp_offset);
#endif
#ifdef WATCH_TEMP_PERIOD
#ifdef THERMAL_PROTECTION_HOTENDS
start_watching_heater(target_extruder);
#endif
}
@ -3312,7 +3312,7 @@ inline void gcode_M109() {
if (code_seen('B')) autotemp_max = code_value();
#endif
#ifdef WATCH_TEMP_PERIOD
#ifdef THERMAL_PROTECTION_HOTENDS
start_watching_heater(target_extruder);
#endif