From 4122de9d17eee82af773919e0e02a5fc91fc40ee Mon Sep 17 00:00:00 2001 From: Wurstnase Date: Mon, 29 Dec 2014 16:31:00 +0100 Subject: [PATCH 1/2] change filament issue make a more general solution --- Marlin/Marlin_main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 644ae31f1..c3331411a 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -204,6 +204,7 @@ CardReader card; #endif float homing_feedrate[] = HOMING_FEEDRATE; bool axis_relative_modes[] = AXIS_RELATIVE_MODES; +bool ignore_blocks_queued = false; int feedmultiply=100; //100->1 200->2 int saved_feedmultiply; int extrudemultiply=100; //100->1 200->2 @@ -3616,7 +3617,9 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp while(!lcd_clicked()){ cnt++; manage_heater(); + ignore_blocks_queued = true; manage_inactivity(); + ignore_blocks_queued = false; lcd_update(); if(cnt==0) { @@ -4335,7 +4338,7 @@ void manage_inactivity() if(stepper_inactive_time) { if( (millis() - previous_millis_cmd) > stepper_inactive_time ) { - if(blocks_queued() == false) { + if(blocks_queued() == false && ignore_blocks_queued != true) { disable_x(); disable_y(); disable_z(); From d1995aec7a0d3c9b8a55ec667dd42931b2df4067 Mon Sep 17 00:00:00 2001 From: Wurstnase Date: Mon, 29 Dec 2014 16:47:08 +0100 Subject: [PATCH 2/2] Rename ignore_blocks_queued more speaking name --- Marlin/Marlin_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index c3331411a..3d6a1d5b6 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -204,7 +204,7 @@ CardReader card; #endif float homing_feedrate[] = HOMING_FEEDRATE; bool axis_relative_modes[] = AXIS_RELATIVE_MODES; -bool ignore_blocks_queued = false; +bool ignore_stepper_inactivity_queue_check = false; int feedmultiply=100; //100->1 200->2 int saved_feedmultiply; int extrudemultiply=100; //100->1 200->2 @@ -3617,9 +3617,9 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp while(!lcd_clicked()){ cnt++; manage_heater(); - ignore_blocks_queued = true; + ignore_stepper_inactivity_queue_check = true; manage_inactivity(); - ignore_blocks_queued = false; + ignore_stepper_inactivity_queue_check = false; lcd_update(); if(cnt==0) { @@ -4338,7 +4338,7 @@ void manage_inactivity() if(stepper_inactive_time) { if( (millis() - previous_millis_cmd) > stepper_inactive_time ) { - if(blocks_queued() == false && ignore_blocks_queued != true) { + if(blocks_queued() == false && ignore_stepper_inactivity_queue_check != true) { disable_x(); disable_y(); disable_z();