Browse Source

Merge pull request #3642 from thinkyhead/rc_quieter_wait_for_temps

Keepalive not needed while waiting for temperatures
Scott Lahteine 8 years ago
parent
commit
96b2b3f4fe
1 changed files with 5 additions and 0 deletions
  1. 5
    0
      Marlin/Marlin_main.cpp

+ 5
- 0
Marlin/Marlin_main.cpp View File

4464
     #define TEMP_CONDITIONS (wants_to_cool ? isCoolingHotend(target_extruder) : isHeatingHotend(target_extruder))
4464
     #define TEMP_CONDITIONS (wants_to_cool ? isCoolingHotend(target_extruder) : isHeatingHotend(target_extruder))
4465
   #endif //TEMP_RESIDENCY_TIME > 0
4465
   #endif //TEMP_RESIDENCY_TIME > 0
4466
 
4466
 
4467
+  KEEPALIVE_STATE(NOT_BUSY);
4468
+
4467
   cancel_heatup = false;
4469
   cancel_heatup = false;
4468
   millis_t now, next_temp_ms = 0;
4470
   millis_t now, next_temp_ms = 0;
4469
   do {
4471
   do {
4508
   } while (!cancel_heatup && TEMP_CONDITIONS);
4510
   } while (!cancel_heatup && TEMP_CONDITIONS);
4509
 
4511
 
4510
   LCD_MESSAGEPGM(MSG_HEATING_COMPLETE);
4512
   LCD_MESSAGEPGM(MSG_HEATING_COMPLETE);
4513
+  KEEPALIVE_STATE(IN_HANDLER);
4511
 }
4514
 }
4512
 
4515
 
4513
 #if HAS_TEMP_BED
4516
 #if HAS_TEMP_BED
4541
     millis_t now, next_temp_ms = 0;
4544
     millis_t now, next_temp_ms = 0;
4542
 
4545
 
4543
     // Wait for temperature to come close enough
4546
     // Wait for temperature to come close enough
4547
+    KEEPALIVE_STATE(NOT_BUSY);
4544
     do {
4548
     do {
4545
       now = millis();
4549
       now = millis();
4546
       if (ELAPSED(now, next_temp_ms)) { //Print Temp Reading every 1 second while heating up.
4550
       if (ELAPSED(now, next_temp_ms)) { //Print Temp Reading every 1 second while heating up.
4580
 
4584
 
4581
     } while (!cancel_heatup && TEMP_BED_CONDITIONS);
4585
     } while (!cancel_heatup && TEMP_BED_CONDITIONS);
4582
     LCD_MESSAGEPGM(MSG_BED_DONE);
4586
     LCD_MESSAGEPGM(MSG_BED_DONE);
4587
+    KEEPALIVE_STATE(IN_HANDLER);
4583
   }
4588
   }
4584
 
4589
 
4585
 #endif // HAS_TEMP_BED
4590
 #endif // HAS_TEMP_BED

Loading…
Cancel
Save