|
|
@ -1946,14 +1946,14 @@ void process_commands()
|
|
|
|
/* See if we are heating up or cooling down */
|
|
|
|
/* See if we are heating up or cooling down */
|
|
|
|
target_direction = isHeatingHotend(tmp_extruder); // true if heating, false if cooling
|
|
|
|
target_direction = isHeatingHotend(tmp_extruder); // true if heating, false if cooling
|
|
|
|
|
|
|
|
|
|
|
|
forced_heating_stop = false;
|
|
|
|
cancel_heatup = false;
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef TEMP_RESIDENCY_TIME
|
|
|
|
#ifdef TEMP_RESIDENCY_TIME
|
|
|
|
long residencyStart;
|
|
|
|
long residencyStart;
|
|
|
|
residencyStart = -1;
|
|
|
|
residencyStart = -1;
|
|
|
|
/* continue to loop until we have reached the target temp
|
|
|
|
/* continue to loop until we have reached the target temp
|
|
|
|
_and_ until TEMP_RESIDENCY_TIME hasn't passed since we reached it */
|
|
|
|
_and_ until TEMP_RESIDENCY_TIME hasn't passed since we reached it */
|
|
|
|
while((forced_heating_stop == false)&&((residencyStart == -1) ||
|
|
|
|
while((!cancel_heatup)&&((residencyStart == -1) ||
|
|
|
|
(residencyStart >= 0 && (((unsigned int) (millis() - residencyStart)) < (TEMP_RESIDENCY_TIME * 1000UL)))) ) {
|
|
|
|
(residencyStart >= 0 && (((unsigned int) (millis() - residencyStart)) < (TEMP_RESIDENCY_TIME * 1000UL)))) ) {
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
while ( target_direction ? (isHeatingHotend(tmp_extruder)) : (isCoolingHotend(tmp_extruder)&&(CooldownNoWait==false)) ) {
|
|
|
|
while ( target_direction ? (isHeatingHotend(tmp_extruder)) : (isCoolingHotend(tmp_extruder)&&(CooldownNoWait==false)) ) {
|
|
|
@ -2011,9 +2011,10 @@ void process_commands()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
codenum = millis();
|
|
|
|
codenum = millis();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cancel_heatup = false;
|
|
|
|
target_direction = isHeatingBed(); // true if heating, false if cooling
|
|
|
|
target_direction = isHeatingBed(); // true if heating, false if cooling
|
|
|
|
|
|
|
|
|
|
|
|
while ( target_direction ? (isHeatingBed()) : (isCoolingBed()&&(CooldownNoWait==false)) )
|
|
|
|
while ( (target_direction)&&(!cancel_heatup) ? (isHeatingBed()) : (isCoolingBed()&&(CooldownNoWait==false)) )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(( millis() - codenum) > 1000 ) //Print Temp Reading every 1 second while heating up.
|
|
|
|
if(( millis() - codenum) > 1000 ) //Print Temp Reading every 1 second while heating up.
|
|
|
|
{
|
|
|
|
{
|
|
|
|