|
@@ -1946,14 +1946,14 @@ void process_commands()
|
1946
|
1946
|
/* See if we are heating up or cooling down */
|
1947
|
1947
|
target_direction = isHeatingHotend(tmp_extruder); // true if heating, false if cooling
|
1948
|
1948
|
|
1949
|
|
- forced_heating_stop = false;
|
|
1949
|
+ cancel_heatup = false;
|
1950
|
1950
|
|
1951
|
1951
|
#ifdef TEMP_RESIDENCY_TIME
|
1952
|
1952
|
long residencyStart;
|
1953
|
1953
|
residencyStart = -1;
|
1954
|
1954
|
/* continue to loop until we have reached the target temp
|
1955
|
1955
|
_and_ until TEMP_RESIDENCY_TIME hasn't passed since we reached it */
|
1956
|
|
- while((forced_heating_stop == false)&&((residencyStart == -1) ||
|
|
1956
|
+ while((!cancel_heatup)&&((residencyStart == -1) ||
|
1957
|
1957
|
(residencyStart >= 0 && (((unsigned int) (millis() - residencyStart)) < (TEMP_RESIDENCY_TIME * 1000UL)))) ) {
|
1958
|
1958
|
#else
|
1959
|
1959
|
while ( target_direction ? (isHeatingHotend(tmp_extruder)) : (isCoolingHotend(tmp_extruder)&&(CooldownNoWait==false)) ) {
|
|
@@ -2010,10 +2010,11 @@ void process_commands()
|
2010
|
2010
|
CooldownNoWait = false;
|
2011
|
2011
|
}
|
2012
|
2012
|
codenum = millis();
|
2013
|
|
-
|
|
2013
|
+
|
|
2014
|
+ cancel_heatup = false;
|
2014
|
2015
|
target_direction = isHeatingBed(); // true if heating, false if cooling
|
2015
|
2016
|
|
2016
|
|
- while ( target_direction ? (isHeatingBed()) : (isCoolingBed()&&(CooldownNoWait==false)) )
|
|
2017
|
+ while ( (target_direction)&&(!cancel_heatup) ? (isHeatingBed()) : (isCoolingBed()&&(CooldownNoWait==false)) )
|
2017
|
2018
|
{
|
2018
|
2019
|
if(( millis() - codenum) > 1000 ) //Print Temp Reading every 1 second while heating up.
|
2019
|
2020
|
{
|