Browse Source

remove stop_heating_wait

Erik van der Zalm 13 years ago
parent
commit
c6f2ec3c82
4 changed files with 0 additions and 9 deletions
  1. 0
    3
      Marlin/Configuration_adv.h
  2. 0
    1
      Marlin/Marlin.h
  3. 0
    2
      Marlin/Marlin.pde
  4. 0
    3
      Marlin/cardreader.cpp

+ 0
- 3
Marlin/Configuration_adv.h View File

25
 // if CooldownNoWait is defined M109 will not wait for the cooldown to finish
25
 // if CooldownNoWait is defined M109 will not wait for the cooldown to finish
26
 #define CooldownNoWait true
26
 #define CooldownNoWait true
27
 
27
 
28
-//Do not wait for M109 to finish when printing from SD card
29
-//#define STOP_HEATING_WAIT_WHEN_SD_PRINTING
30
-
31
 #ifdef PIDTEMP
28
 #ifdef PIDTEMP
32
   // this adds an experimental additional term to the heatingpower, proportional to the extrusion speed.
29
   // this adds an experimental additional term to the heatingpower, proportional to the extrusion speed.
33
   // if Kc is choosen well, the additional required power due to increased melting should be compensated.
30
   // if Kc is choosen well, the additional required power due to increased melting should be compensated.

+ 0
- 1
Marlin/Marlin.h View File

175
 extern bool axis_relative_modes[];
175
 extern bool axis_relative_modes[];
176
 extern float current_position[NUM_AXIS] ;
176
 extern float current_position[NUM_AXIS] ;
177
 extern float add_homeing[3];
177
 extern float add_homeing[3];
178
-extern bool stop_heating_wait;
179
 
178
 
180
 // Handling multiple extruders pins
179
 // Handling multiple extruders pins
181
 extern uint8_t active_extruder;
180
 extern uint8_t active_extruder;

+ 0
- 2
Marlin/Marlin.pde View File

131
 float current_position[NUM_AXIS] = { 0.0, 0.0, 0.0, 0.0 };
131
 float current_position[NUM_AXIS] = { 0.0, 0.0, 0.0, 0.0 };
132
 float add_homeing[3]={0,0,0};
132
 float add_homeing[3]={0,0,0};
133
 uint8_t active_extruder = 0;
133
 uint8_t active_extruder = 0;
134
-bool stop_heating_wait=false;
135
 
134
 
136
 //===========================================================================
135
 //===========================================================================
137
 //=============================private variables=============================
136
 //=============================private variables=============================
886
           }
885
           }
887
           manage_heater();
886
           manage_heater();
888
           LCD_STATUS;
887
           LCD_STATUS;
889
-        if(stop_heating_wait) break;
890
         #ifdef TEMP_RESIDENCY_TIME
888
         #ifdef TEMP_RESIDENCY_TIME
891
             /* start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time
889
             /* start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time
892
               or when current temp falls outside the hysteresis after target temp was reached */
890
               or when current temp falls outside the hysteresis after target temp was reached */

+ 0
- 3
Marlin/cardreader.cpp View File

447
  st_synchronize();
447
  st_synchronize();
448
  quickStop();
448
  quickStop();
449
  sdprinting = false;
449
  sdprinting = false;
450
- #ifdef STOP_HEATING_WAIT_FOR_SD_PRINTING
451
- stop_heating_wait=true;
452
- #endif
453
  if(SD_FINISHED_STEPPERRELEASE)
450
  if(SD_FINISHED_STEPPERRELEASE)
454
  {
451
  {
455
    //finishAndDisableSteppers();
452
    //finishAndDisableSteppers();

Loading…
Cancel
Save