Bladeren bron

change filament issue

make a more general solution
Wurstnase 10 jaren geleden
bovenliggende
commit
4122de9d17
1 gewijzigde bestanden met toevoegingen van 4 en 1 verwijderingen
  1. 4
    1
      Marlin/Marlin_main.cpp

+ 4
- 1
Marlin/Marlin_main.cpp Bestand weergeven

204
 #endif
204
 #endif
205
 float homing_feedrate[] = HOMING_FEEDRATE;
205
 float homing_feedrate[] = HOMING_FEEDRATE;
206
 bool axis_relative_modes[] = AXIS_RELATIVE_MODES;
206
 bool axis_relative_modes[] = AXIS_RELATIVE_MODES;
207
+bool ignore_blocks_queued = false;
207
 int feedmultiply=100; //100->1 200->2
208
 int feedmultiply=100; //100->1 200->2
208
 int saved_feedmultiply;
209
 int saved_feedmultiply;
209
 int extrudemultiply=100; //100->1 200->2
210
 int extrudemultiply=100; //100->1 200->2
3616
         while(!lcd_clicked()){
3617
         while(!lcd_clicked()){
3617
           cnt++;
3618
           cnt++;
3618
           manage_heater();
3619
           manage_heater();
3620
+		  ignore_blocks_queued = true;
3619
           manage_inactivity();
3621
           manage_inactivity();
3622
+		  ignore_blocks_queued = false;
3620
           lcd_update();
3623
           lcd_update();
3621
           if(cnt==0)
3624
           if(cnt==0)
3622
           {
3625
           {
4335
   if(stepper_inactive_time)  {
4338
   if(stepper_inactive_time)  {
4336
     if( (millis() - previous_millis_cmd) >  stepper_inactive_time )
4339
     if( (millis() - previous_millis_cmd) >  stepper_inactive_time )
4337
     {
4340
     {
4338
-      if(blocks_queued() == false) {
4341
+      if(blocks_queued() == false && ignore_blocks_queued != true) {
4339
         disable_x();
4342
         disable_x();
4340
         disable_y();
4343
         disable_y();
4341
         disable_z();
4344
         disable_z();

Laden…
Annuleren
Opslaan