Sync with upstream

prusa3d · Jul 4, 2022 · 80df755 · 80df755
1 parent 2dbdf5a
commit 80df755
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
@@ -287,6 +287,7 @@ uint8_t newFanSpeed = 0;
   #endif
 
 bool cancel_heatup = false;
+bool CooldownNoWait;
 
 int8_t busy_state = NOT_BUSY;
 static long prev_busy_signal_ms = -1;
@@ -6427,6 +6428,7 @@ SERIAL_PROTOCOLPGM("\n\n");
     */
     case 109:
     {
+      CooldownNoWait = false;
       uint8_t extruder;
       if(setTargetedHotend(109, extruder)){
         break;
@@ -6437,11 +6439,13 @@ SERIAL_PROTOCOLPGM("\n\n");
 
 #ifdef AUTOTEMP
         autotemp_enabled=false;
-      #endif
+#endif
       if (code_seen('S')) {
-          setTargetHotendSafe(code_value(), extruder);
-            } else if (code_seen('R')) {
-                setTargetHotendSafe(code_value(), extruder);
+        setTargetHotendSafe(code_value(), extruder);
+        CooldownNoWait = true;
+      }
+      else if (code_seen('R')) {
+        setTargetHotendSafe(code_value(), extruder);
       }
       #ifdef AUTOTEMP
         if (code_seen('S')) autotemp_min=code_value();
@@ -6487,7 +6491,7 @@ SERIAL_PROTOCOLPGM("\n\n");
     case 190: 
     #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
     {
-        bool CooldownNoWait = false;
+        CooldownNoWait = false;
         LCD_MESSAGERPGM(_T(MSG_BED_HEATING));
 		heating_status = HeatingStatus::BED_HEATING;
 		if (farm_mode) { prusa_statistics(1); };