Browse Source

Make cancel_heatup also abort cooldown in M190

This matches the expected behavior, as already implemented in
wait_for_heater().
Yuri D'Elia 2 years ago
parent
commit
3849f9785a
2 changed files with 2 additions and 1 deletions
  1. 1 1
      Firmware/Marlin_main.cpp
  2. 1 0
      Firmware/ultralcd.cpp

+ 1 - 1
Firmware/Marlin_main.cpp

@@ -6751,7 +6751,7 @@ Sigma_Exit:
         target_direction = isHeatingBed(); // true if heating, false if cooling
 
 		KEEPALIVE_STATE(NOT_BUSY);
-        while ( (target_direction)&&(!cancel_heatup) ? (isHeatingBed()) : (isCoolingBed()&&(CooldownNoWait==false)) )
+        while ( (!cancel_heatup) && (target_direction ? (isHeatingBed()) : (isCoolingBed()&&(CooldownNoWait==false))) )
         {
           if(( _millis() - codenum) > 1000 ) //Print Temp Reading every 1 second while heating up.
           {

+ 1 - 0
Firmware/ultralcd.cpp

@@ -7104,6 +7104,7 @@ void lcd_print_stop()
 	pause_time = 0;
 	save_statistics(total_filament_used, t);
 
+    // reset current command
     lcd_commands_step = 0;
     lcd_commands_type = LcdCommands::Idle;