From: Erik van der Zalm <erik@vdzalm.eu>
Date: Fri, 25 Nov 2011 18:34:36 +0000 (+0100)
Subject: Fixed residency time bug. (Thanks to Sound :-)  )
X-Git-Tag: iwj-success-2012-07-29~199
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6ac9b2e7614766a38276d143592ba0b6e8f31271;p=marlin.git

Fixed residency time bug. (Thanks to Sound :-)  )
---

diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index edba13f..c55d7b7 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()) ) {