浏览代码

Tweaks for check_axes_activity

Scott Lahteine 7 年前
父节点
当前提交
1f2acc33bc
共有 1 个文件被更改,包括 16 次插入6 次删除
  1. 16
    6
      Marlin/src/module/planner.cpp

+ 16
- 6
Marlin/src/module/planner.cpp 查看文件

423
 
423
 
424
   #if ENABLED(BARICUDA)
424
   #if ENABLED(BARICUDA)
425
     #if HAS_HEATER_1
425
     #if HAS_HEATER_1
426
-      uint8_t tail_valve_pressure = baricuda_valve_pressure;
426
+      uint8_t tail_valve_pressure;
427
     #endif
427
     #endif
428
     #if HAS_HEATER_2
428
     #if HAS_HEATER_2
429
-      uint8_t tail_e_to_p_pressure = baricuda_e_to_p_pressure;
429
+      uint8_t tail_e_to_p_pressure;
430
     #endif
430
     #endif
431
   #endif
431
   #endif
432
 
432
 
433
-  #if FAN_COUNT > 0
434
-    for (uint8_t i = 0; i < FAN_COUNT; i++) tail_fan_speed[i] = fanSpeeds[i];
435
-  #endif
436
-
437
   if (blocks_queued()) {
433
   if (blocks_queued()) {
438
 
434
 
439
     #if FAN_COUNT > 0
435
     #if FAN_COUNT > 0
458
       LOOP_XYZE(i) if (block->steps[i]) axis_active[i]++;
454
       LOOP_XYZE(i) if (block->steps[i]) axis_active[i]++;
459
     }
455
     }
460
   }
456
   }
457
+  else {
458
+    #if FAN_COUNT > 0
459
+      for (uint8_t i = 0; i < FAN_COUNT; i++) tail_fan_speed[i] = fanSpeeds[i];
460
+    #endif
461
+
462
+    #if ENABLED(BARICUDA)
463
+      #if HAS_HEATER_1
464
+        tail_valve_pressure = baricuda_valve_pressure;
465
+      #endif
466
+      #if HAS_HEATER_2
467
+        tail_e_to_p_pressure = baricuda_e_to_p_pressure;
468
+      #endif
469
+    #endif
470
+  }
461
 
471
 
462
   #if ENABLED(DISABLE_X)
472
   #if ENABLED(DISABLE_X)
463
     if (!axis_active[X_AXIS]) disable_X();
473
     if (!axis_active[X_AXIS]) disable_X();

正在加载...
取消
保存