From 7fde3ed915dd1985aa420a0b009869c7184cef71 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 28 Feb 2019 14:35:05 -0600
Subject: [PATCH] Skip hysteresis check when temp is already close to target
To eliminate a long delay during pause, park, and filament change
---
Marlin/src/module/temperature.cpp | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 5428069086c..6f5c8e2263e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2716,7 +2716,7 @@ void Temperature::isr() {
#endif
float target_temp = -1.0, old_temp = 9999.0;
- bool wants_to_cool = false;
+ bool wants_to_cool = false, first_loop = true;
wait_for_heatup = true;
millis_t now, next_temp_ms = 0, next_cool_check_ms = 0;
do {
@@ -2759,7 +2759,10 @@ void Temperature::isr() {
if (!residency_start_ms) {
// Start the TEMP_RESIDENCY_TIME timer when we reach target temp for the first time.
- if (temp_diff < TEMP_WINDOW) residency_start_ms = now;
+ if (temp_diff < TEMP_WINDOW) {
+ residency_start_ms = now;
+ if (first_loop) residency_start_ms += (TEMP_RESIDENCY_TIME) * 1000UL;
+ }
}
else if (temp_diff > TEMP_HYSTERESIS) {
// Restart the timer whenever the temperature falls outside the hysteresis.
@@ -2786,6 +2789,8 @@ void Temperature::isr() {
}
#endif
+ first_loop = false;
+
} while (wait_for_heatup && TEMP_CONDITIONS);
if (wait_for_heatup) {
@@ -2828,7 +2833,7 @@ void Temperature::isr() {
#endif
float target_temp = -1, old_temp = 9999;
- bool wants_to_cool = false;
+ bool wants_to_cool = false, first_loop = true;
wait_for_heatup = true;
millis_t now, next_temp_ms = 0, next_cool_check_ms = 0;
@@ -2883,6 +2888,7 @@ void Temperature::isr() {
if (!residency_start_ms) {
// Start the TEMP_BED_RESIDENCY_TIME timer when we reach target temp for the first time.
if (temp_diff < TEMP_BED_WINDOW) residency_start_ms = now;
+ if (first_loop) residency_start_ms += (TEMP_BED_RESIDENCY_TIME) * 1000UL;
}
else if (temp_diff > TEMP_BED_HYSTERESIS) {
// Restart the timer whenever the temperature falls outside the hysteresis.
@@ -2909,6 +2915,8 @@ void Temperature::isr() {
}
#endif
+ first_loop = false;
+
} while (wait_for_heatup && TEMP_BED_CONDITIONS);
if (wait_for_heatup) ui.reset_status();