瀏覽代碼

Rename argument of ThermalStop for clarity

Yuri D'Elia 3 年之前
父節點
當前提交
9ef80226c9
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 4 4
      Firmware/Marlin.h
  2. 2 2
      Firmware/Marlin_main.cpp

+ 4 - 4
Firmware/Marlin.h

@@ -241,10 +241,10 @@ void prepare_move();
 void kill(const char *full_screen_message = NULL, unsigned char id = 0);
 void finishAndDisableSteppers();
 
-void UnconditionalStop();             // Stop heaters, motion and clear current print status
-void ThermalStop(bool pause = false); // Emergency stop used by overtemp functions which allows
-                                      // recovery (with pause=true)
-bool IsStopped();                     // Returns true if the print has been stopped
+void UnconditionalStop();                   // Stop heaters, motion and clear current print status
+void ThermalStop(bool allow_pause = false); // Emergency stop used by overtemp functions which allows
+                                            // recovery (with pause=true)
+bool IsStopped();                           // Returns true if the print has been stopped
 
 //put an ASCII command at the end of the current buffer, read from flash
 #define enquecommand_P(cmd) enquecommand(cmd, true)

+ 2 - 2
Firmware/Marlin_main.cpp

@@ -9983,11 +9983,11 @@ void UnconditionalStop()
 //   will introduce either over/under extrusion on the current segment, and will not
 //   survive a power panic. Switching Stop() to use the pause machinery instead (with
 //   the addition of disabling the headers) could allow true recovery in the future.
-void ThermalStop(bool pause)
+void ThermalStop(bool allow_pause)
 {
     if(Stopped == false) {
         Stopped = true;
-        if(pause && (IS_SD_PRINTING || usb_timer.running())) {
+        if(allow_pause && (IS_SD_PRINTING || usb_timer.running())) {
             if (!isPrintPaused) {
                 // we cannot make a distinction for the host here, the pause must be instantaneous
                 lcd_pause_print();