CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2137 from thinkyhead/tweak_swh

Browse Source 
Move millis call in start_watching_heater
This commit is contained in:
AnHardt 2015-05-22 02:02:07 +02:00
commit 94dff5b36a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/temperature.cpp
View File

@ -1004,10 +1004,9 @@ void tp_init() {
* This is called when the temperature is set. (M104, M109) * This is called when the temperature is set. (M104, M109)
*/ */
void start_watching_heater(int e) { void start_watching_heater(int e) {
millis_t ms = millis() + WATCH_TEMP_PERIOD * 1000;
if (degHotend(e) < degTargetHotend(e) - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1)) { if (degHotend(e) < degTargetHotend(e) - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1)) {
watch_target_temp[e] = degHotend(e) + WATCH_TEMP_INCREASE; watch_target_temp[e] = degHotend(e) + WATCH_TEMP_INCREASE;
watch_heater_next_ms[e] = ms; watch_heater_next_ms[e] = millis() + WATCH_TEMP_PERIOD * 1000;;
} }
else else
watch_heater_next_ms[e] = 0; watch_heater_next_ms[e] = 0;