瀏覽代碼

Merge pull request #1265 from Wurstnase/Development

Expand manage_inactivity #1264
Bernhard Kubicek 10 年之前
父節點
當前提交
053b541de8
共有 1 個檔案被更改,包括 3 行新增6 行删除
  1. 3
    6
      Marlin/Marlin_main.cpp

+ 3
- 6
Marlin/Marlin_main.cpp 查看文件

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_stepper_inactivity_queue_check = false;
208
 int feedmultiply=100; //100->1 200->2
207
 int feedmultiply=100; //100->1 200->2
209
 int saved_feedmultiply;
208
 int saved_feedmultiply;
210
 int extrudemultiply=100; //100->1 200->2
209
 int extrudemultiply=100; //100->1 200->2
3617
         while(!lcd_clicked()){
3616
         while(!lcd_clicked()){
3618
           cnt++;
3617
           cnt++;
3619
           manage_heater();
3618
           manage_heater();
3620
-		  ignore_stepper_inactivity_queue_check = true;
3621
-          manage_inactivity();
3622
-		  ignore_stepper_inactivity_queue_check = false;
3619
+          manage_inactivity(false);
3623
           lcd_update();
3620
           lcd_update();
3624
           if(cnt==0)
3621
           if(cnt==0)
3625
           {
3622
           {
4315
 }
4312
 }
4316
 #endif
4313
 #endif
4317
 
4314
 
4318
-void manage_inactivity()
4315
+void manage_inactivity(bool ignore_stepper_queue=false)
4319
 {
4316
 {
4320
 	
4317
 	
4321
 #if defined(KILL_PIN) && KILL_PIN > -1
4318
 #if defined(KILL_PIN) && KILL_PIN > -1
4338
   if(stepper_inactive_time)  {
4335
   if(stepper_inactive_time)  {
4339
     if( (millis() - previous_millis_cmd) >  stepper_inactive_time )
4336
     if( (millis() - previous_millis_cmd) >  stepper_inactive_time )
4340
     {
4337
     {
4341
-      if(blocks_queued() == false && ignore_stepper_inactivity_queue_check != true) {
4338
+      if(blocks_queued() == false && ignore_stepper_queue != true) {
4342
         disable_x();
4339
         disable_x();
4343
         disable_y();
4340
         disable_y();
4344
         disable_z();
4341
         disable_z();

Loading…
取消
儲存