chiark / gitweb /
Fixed residency time bug. (Thanks to Sound :-) )
authorErik van der Zalm <erik@vdzalm.eu>
Fri, 25 Nov 2011 18:34:36 +0000 (19:34 +0100)
committerErik van der Zalm <erik@vdzalm.eu>
Fri, 25 Nov 2011 18:34:36 +0000 (19:34 +0100)
Marlin/Marlin.pde

index edba13f35fba44e9f10b0ea302528118ab6adde9..c55d7b7daca8552063f49b24a7a6e87832319b81 100644 (file)
@@ -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()) ) {