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

Merge pull request #2134 from AnHardt/preheat-all

Browse Source 
Shift call of start_watching_heater() into setTargetHotend()
This commit is contained in:
Scott Lahteine
2015-05-21 18:36:28 -07:00
parent 65343e8ae8 0c0ace2a04
commit f919a2fed1
4 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View File

@ -3367,10 +3367,6 @@ inline void gcode_M104() {
if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && target_extruder == 0)
setTargetHotend1(temp == 0.0 ? 0.0 : temp + duplicate_extruder_temp_offset);
#endif
#ifdef THERMAL_PROTECTION_HOTENDS
start_watching_heater(target_extruder);
#endif
}
}
@ -3482,10 +3478,6 @@ inline void gcode_M109() {
if (code_seen('B')) autotemp_max = code_value();
#endif
#ifdef THERMAL_PROTECTION_HOTENDS
start_watching_heater(target_extruder);
#endif
millis_t temp_ms = millis();
/* See if we are heating up or cooling down */