Explorar el Código

Merge pull request #3284 from thinkyhead/rc_stop_watchheat_lcdset0

Fix temperature checking conditions (backwards!)
Scott Lahteine hace 9 años
padre
commit
8def2c31db
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2
    2
      Marlin/Marlin_main.cpp

+ 2
- 2
Marlin/Marlin_main.cpp Ver fichero

@@ -4265,7 +4265,7 @@ inline void gcode_M109() {
4265 4265
     #define TEMP_CONDITIONS (residency_start_ms < 0 || now < residency_start_ms + (TEMP_RESIDENCY_TIME) * 1000UL)
4266 4266
   #else
4267 4267
     // Loop until the temperature is very close target
4268
-    #define TEMP_CONDITIONS (fabs(degHotend(target_extruder) - degTargetHotend(target_extruder)) < 0.75f)
4268
+    #define TEMP_CONDITIONS (isHeatingHotend(target_extruder))
4269 4269
   #endif //TEMP_RESIDENCY_TIME
4270 4270
 
4271 4271
   cancel_heatup = false;
@@ -4325,7 +4325,7 @@ inline void gcode_M109() {
4325 4325
 
4326 4326
     cancel_heatup = false;
4327 4327
     millis_t now = millis(), next_temp_ms = now + 1000UL;
4328
-    while (!cancel_heatup && fabs(degTargetBed() - degBed()) < 0.75f) {
4328
+    while (!cancel_heatup && isHeatingBed()) {
4329 4329
       millis_t now = millis();
4330 4330
       if (now > next_temp_ms) { //Print Temp Reading every 1 second while heating up.
4331 4331
         next_temp_ms = now + 1000UL;

Loading…
Cancelar
Guardar