瀏覽代碼

ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints.

Bernhard 13 年之前
父節點
當前提交
06411d5c9e
共有 3 個文件被更改,包括 4 次插入1 次删除
  1. 1
    0
      Marlin/Marlin.h
  2. 2
    1
      Marlin/Marlin.pde
  3. 1
    0
      Marlin/cardreader.pde

+ 1
- 0
Marlin/Marlin.h 查看文件

@@ -131,5 +131,6 @@ extern float homing_feedrate[];
131 131
 extern bool axis_relative_modes[];
132 132
 extern float current_position[NUM_AXIS] ;
133 133
 extern float add_homeing[3];
134
+extern bool stop_heating_wait;
134 135
 
135 136
 #endif

+ 2
- 1
Marlin/Marlin.pde 查看文件

@@ -138,7 +138,7 @@ int saved_feedmultiply;
138 138
 volatile bool feedmultiplychanged=false;
139 139
 float current_position[NUM_AXIS] = {  0.0, 0.0, 0.0, 0.0};
140 140
 float add_homeing[3]={0,0,0};
141
-
141
+bool stop_heating_wait=false;
142 142
 //===========================================================================
143 143
 //=============================private variables=============================
144 144
 //===========================================================================
@@ -825,6 +825,7 @@ FORCE_INLINE void process_commands()
825 825
         }
826 826
         manage_heater();
827 827
         LCD_STATUS;
828
+        if(stop_heating_wait) break;
828 829
         #ifdef TEMP_RESIDENCY_TIME
829 830
             /* start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time
830 831
               or when current temp falls outside the hysteresis after target temp was reached */

+ 1
- 0
Marlin/cardreader.pde 查看文件

@@ -434,6 +434,7 @@ void CardReader::printingHasFinished()
434 434
 {
435 435
  quickStop();
436 436
  sdprinting = false;
437
+ stop_heating_wait=true;
437 438
  if(SD_FINISHED_STEPPERRELEASE)
438 439
  {
439 440
    //finishAndDisableSteppers();

Loading…
取消
儲存