MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Tweaks for check_axes_activity

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-28 18:41:13 -06:00
parent 7f88334aa3
commit 1f2acc33bc
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Marlin/src/module/planner.cpp
View File

@ -423,17 +423,13 @@ void Planner::check_axes_activity() {
#if ENABLED(BARICUDA)
#if HAS_HEATER_1
uint8_t tail_valve_pressure = baricuda_valve_pressure;
uint8_t tail_valve_pressure;
#endif
#if HAS_HEATER_2
uint8_t tail_e_to_p_pressure = baricuda_e_to_p_pressure;
uint8_t tail_e_to_p_pressure;
#endif
#endif
#if FAN_COUNT > 0
for (uint8_t i = 0; i < FAN_COUNT; i++) tail_fan_speed[i] = fanSpeeds[i];
#endif
if (blocks_queued()) {
#if FAN_COUNT > 0
@ -458,6 +454,20 @@ void Planner::check_axes_activity() {
LOOP_XYZE(i) if (block->steps[i]) axis_active[i]++;
}
}
else {
#if FAN_COUNT > 0
for (uint8_t i = 0; i < FAN_COUNT; i++) tail_fan_speed[i] = fanSpeeds[i];
#endif
#if ENABLED(BARICUDA)
#if HAS_HEATER_1
tail_valve_pressure = baricuda_valve_pressure;
#endif
#if HAS_HEATER_2
tail_e_to_p_pressure = baricuda_e_to_p_pressure;
#endif
#endif
}
#if ENABLED(DISABLE_X)
if (!axis_active[X_AXIS]) disable_X();