Browse Source

Inverted state logic for forced_heating_stop variable

Pablo Clemente 10 years ago
parent
commit
cd3220d055
2 changed files with 4 additions and 4 deletions
  1. 2
    2
      Marlin/Marlin_main.cpp
  2. 2
    2
      Marlin/ultralcd.cpp

+ 2
- 2
Marlin/Marlin_main.cpp View File

1946
       /* See if we are heating up or cooling down */
1946
       /* See if we are heating up or cooling down */
1947
       target_direction = isHeatingHotend(tmp_extruder); // true if heating, false if cooling
1947
       target_direction = isHeatingHotend(tmp_extruder); // true if heating, false if cooling
1948
       
1948
       
1949
-      forced_heating_stop = true;
1949
+      forced_heating_stop = false;
1950
 
1950
 
1951
       #ifdef TEMP_RESIDENCY_TIME
1951
       #ifdef TEMP_RESIDENCY_TIME
1952
         long residencyStart;
1952
         long residencyStart;
1953
         residencyStart = -1;
1953
         residencyStart = -1;
1954
         /* continue to loop until we have reached the target temp
1954
         /* continue to loop until we have reached the target temp
1955
           _and_ until TEMP_RESIDENCY_TIME hasn't passed since we reached it */
1955
           _and_ until TEMP_RESIDENCY_TIME hasn't passed since we reached it */
1956
-        while((forced_heating_stop == true)&&((residencyStart == -1) ||
1956
+        while((forced_heating_stop == false)&&((residencyStart == -1) ||
1957
               (residencyStart >= 0 && (((unsigned int) (millis() - residencyStart)) < (TEMP_RESIDENCY_TIME * 1000UL)))) ) {
1957
               (residencyStart >= 0 && (((unsigned int) (millis() - residencyStart)) < (TEMP_RESIDENCY_TIME * 1000UL)))) ) {
1958
       #else
1958
       #else
1959
         while ( target_direction ? (isHeatingHotend(tmp_extruder)) : (isCoolingHotend(tmp_extruder)&&(CooldownNoWait==false)) ) {
1959
         while ( target_direction ? (isHeatingHotend(tmp_extruder)) : (isCoolingHotend(tmp_extruder)&&(CooldownNoWait==false)) ) {

+ 2
- 2
Marlin/ultralcd.cpp View File

19
 int absPreheatHPBTemp;
19
 int absPreheatHPBTemp;
20
 int absPreheatFanSpeed;
20
 int absPreheatFanSpeed;
21
 
21
 
22
-boolean forced_heating_stop = true ;
22
+boolean forced_heating_stop = false ;
23
 
23
 
24
 #ifdef ULTIPANEL
24
 #ifdef ULTIPANEL
25
 static float manual_feedrate[] = MANUAL_FEEDRATE;
25
 static float manual_feedrate[] = MANUAL_FEEDRATE;
258
     }
258
     }
259
     autotempShutdown();
259
     autotempShutdown();
260
     
260
     
261
-    forced_heating_stop = false;
261
+    forced_heating_stop = true;
262
 }
262
 }
263
 
263
 
264
 /* Menu implementation */
264
 /* Menu implementation */

Loading…
Cancel
Save