Bläddra i källkod

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

Bernhard 13 år sedan
förälder
incheckning
06411d5c9e
3 ändrade filer med 4 tillägg och 1 borttagningar
  1. 1
    0
      Marlin/Marlin.h
  2. 2
    1
      Marlin/Marlin.pde
  3. 1
    0
      Marlin/cardreader.pde

+ 1
- 0
Marlin/Marlin.h Visa fil

131
 extern bool axis_relative_modes[];
131
 extern bool axis_relative_modes[];
132
 extern float current_position[NUM_AXIS] ;
132
 extern float current_position[NUM_AXIS] ;
133
 extern float add_homeing[3];
133
 extern float add_homeing[3];
134
+extern bool stop_heating_wait;
134
 
135
 
135
 #endif
136
 #endif

+ 2
- 1
Marlin/Marlin.pde Visa fil

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

+ 1
- 0
Marlin/cardreader.pde Visa fil

434
 {
434
 {
435
  quickStop();
435
  quickStop();
436
  sdprinting = false;
436
  sdprinting = false;
437
+ stop_heating_wait=true;
437
  if(SD_FINISHED_STEPPERRELEASE)
438
  if(SD_FINISHED_STEPPERRELEASE)
438
  {
439
  {
439
    //finishAndDisableSteppers();
440
    //finishAndDisableSteppers();

Laddar…
Avbryt
Spara