Merge pull request #1265 from Wurstnase/Development

Expand manage_inactivity #1264

Marlin/Marlin_main.cpp

@@ -204,7 +204,6 @@ CardReader card;
 #endif
 float homing_feedrate[] = HOMING_FEEDRATE;
 bool axis_relative_modes[] = AXIS_RELATIVE_MODES;
-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 +3616,7 @@ case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
         while(!lcd_clicked()){
           cnt++;
           manage_heater();
-		  ignore_stepper_inactivity_queue_check = true;
+          manage_inactivity(false);
-          manage_inactivity();
-		  ignore_stepper_inactivity_queue_check = false;
           lcd_update();
           if(cnt==0)
           {
@@ -4315,7 +4312,7 @@ void handle_status_leds(void) {
 }
 #endif
 
-void manage_inactivity()
+void manage_inactivity(bool ignore_stepper_queue=false)
 {
 	
 #if defined(KILL_PIN) && KILL_PIN > -1
@@ -4338,7 +4335,7 @@ void manage_inactivity()
   if(stepper_inactive_time)  {
     if( (millis() - previous_millis_cmd) >  stepper_inactive_time )
     {
-      if(blocks_queued() == false && ignore_stepper_inactivity_queue_check != true) {
+      if(blocks_queued() == false && ignore_stepper_queue != true) {
         disable_x();
         disable_y();
         disable_z();