From 6ac9b2e7614766a38276d143592ba0b6e8f31271 Mon Sep 17 00:00:00 2001 From: Erik van der Zalm Date: Fri, 25 Nov 2011 19:34:36 +0100 Subject: [PATCH] Fixed residency time bug. (Thanks to Sound :-) ) --- Marlin/Marlin.pde | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde index edba13f35..c55d7b7da 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -737,7 +737,7 @@ inline void process_commands() residencyStart = -1; /* continue to loop until we have reached the target temp _and_ until TEMP_RESIDENCY_TIME hasn't passed since we reached it */ - while((target_direction ? (isHeatingHotend0()) : (isCoolingHotend0()) || + while((target_direction ? (isHeatingHotend0()) : (isCoolingHotend0())) || (residencyStart > -1 && (millis() - residencyStart) < TEMP_RESIDENCY_TIME*1000) ) { #else while ( target_direction ? (isHeatingHotend0()) : (isCoolingHotend0()) ) {