Browse Source

Tweaks for check_axes_activity

Scott Lahteine 6 years ago
parent
commit
1f2acc33bc
1 changed files with 16 additions and 6 deletions
  1. 16
    6
      Marlin/src/module/planner.cpp

+ 16
- 6
Marlin/src/module/planner.cpp View File

@@ -423,17 +423,13 @@ void Planner::check_axes_activity() {
423 423
 
424 424
   #if ENABLED(BARICUDA)
425 425
     #if HAS_HEATER_1
426
-      uint8_t tail_valve_pressure = baricuda_valve_pressure;
426
+      uint8_t tail_valve_pressure;
427 427
     #endif
428 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 430
     #endif
431 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 433
   if (blocks_queued()) {
438 434
 
439 435
     #if FAN_COUNT > 0
@@ -458,6 +454,20 @@ void Planner::check_axes_activity() {
458 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 472
   #if ENABLED(DISABLE_X)
463 473
     if (!axis_active[X_AXIS]) disable_X();

Loading…
Cancel
Save