Browse Source

Tweak to check_axes_activity

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

+ 16
- 6
Marlin/planner.cpp View File

@@ -410,17 +410,13 @@ void Planner::check_axes_activity() {
410 410
 
411 411
   #if ENABLED(BARICUDA)
412 412
     #if HAS_HEATER_1
413
-      uint8_t tail_valve_pressure = baricuda_valve_pressure;
413
+      uint8_t tail_valve_pressure;
414 414
     #endif
415 415
     #if HAS_HEATER_2
416
-      uint8_t tail_e_to_p_pressure = baricuda_e_to_p_pressure;
416
+      uint8_t tail_e_to_p_pressure;
417 417
     #endif
418 418
   #endif
419 419
 
420
-  #if FAN_COUNT > 0
421
-    for (uint8_t i = 0; i < FAN_COUNT; i++) tail_fan_speed[i] = fanSpeeds[i];
422
-  #endif
423
-
424 420
   if (blocks_queued()) {
425 421
 
426 422
     #if FAN_COUNT > 0
@@ -445,6 +441,20 @@ void Planner::check_axes_activity() {
445 441
       LOOP_XYZE(i) if (block->steps[i]) axis_active[i]++;
446 442
     }
447 443
   }
444
+  else {
445
+    #if FAN_COUNT > 0
446
+      for (uint8_t i = 0; i < FAN_COUNT; i++) tail_fan_speed[i] = fanSpeeds[i];
447
+    #endif
448
+
449
+    #if ENABLED(BARICUDA)
450
+      #if HAS_HEATER_1
451
+        tail_valve_pressure = baricuda_valve_pressure;
452
+      #endif
453
+      #if HAS_HEATER_2
454
+        tail_e_to_p_pressure = baricuda_e_to_p_pressure;
455
+      #endif
456
+    #endif
457
+  }
448 458
 
449 459
   #if ENABLED(DISABLE_X)
450 460
     if (!axis_active[X_AXIS]) disable_X();

Loading…
Cancel
Save