sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🔧 Clarify axis disable / timeout (#25571)

Browse Source
This commit is contained in:
Scott Lahteine
2023-03-26 17:24:40 -05:00
committed by GitHub
parent 39652d93ab
commit 61f22f34d3
17 changed files with 130 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,7 +215,7 @@ uint32_t Planner::acceleration_long_cutoff;
xyze_float_t Planner::previous_speed;
float Planner::previous_nominal_speed;
#if ENABLED(DISABLE_INACTIVE_EXTRUDER)
#if ENABLED(DISABLE_OTHER_EXTRUDERS)
last_move_t Planner::extruder_last_move[E_STEPPERS] = { 0 };
#endif
@@ -1320,7 +1320,7 @@ void Planner::recalculate(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t safe_exit_s
*/
void Planner::check_axes_activity() {
#if HAS_DISABLE_AXIS
#if HAS_DISABLE_AXES
xyze_bool_t axis_active = { false };
#endif
@@ -1360,7 +1360,7 @@ void Planner::check_axes_activity() {
TERN_(HAS_HEATER_2, tail_e_to_p_pressure = block->e_to_p_pressure);
#endif
#if HAS_DISABLE_AXIS
#if HAS_DISABLE_AXES
for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
block_t * const bnext = &block_buffer[b];
LOGICAL_AXIS_CODE(
@@ -1401,18 +1401,20 @@ void Planner::check_axes_activity() {
//
// Disable inactive axes
//
LOGICAL_AXIS_CODE(
if (TERN0(DISABLE_E, !axis_active.e)) stepper.disable_e_steppers(),
if (TERN0(DISABLE_X, !axis_active.x)) stepper.disable_axis(X_AXIS),
if (TERN0(DISABLE_Y, !axis_active.y)) stepper.disable_axis(Y_AXIS),
if (TERN0(DISABLE_Z, !axis_active.z)) stepper.disable_axis(Z_AXIS),
if (TERN0(DISABLE_I, !axis_active.i)) stepper.disable_axis(I_AXIS),
if (TERN0(DISABLE_J, !axis_active.j)) stepper.disable_axis(J_AXIS),
if (TERN0(DISABLE_K, !axis_active.k)) stepper.disable_axis(K_AXIS),
if (TERN0(DISABLE_U, !axis_active.u)) stepper.disable_axis(U_AXIS),
if (TERN0(DISABLE_V, !axis_active.v)) stepper.disable_axis(V_AXIS),
if (TERN0(DISABLE_W, !axis_active.w)) stepper.disable_axis(W_AXIS)
);
#if HAS_DISABLE_AXES
LOGICAL_AXIS_CODE(
if (TERN0(DISABLE_E, !axis_active.e)) stepper.disable_e_steppers(),
if (TERN0(DISABLE_X, !axis_active.x)) stepper.disable_axis(X_AXIS),
if (TERN0(DISABLE_Y, !axis_active.y)) stepper.disable_axis(Y_AXIS),
if (TERN0(DISABLE_Z, !axis_active.z)) stepper.disable_axis(Z_AXIS),
if (TERN0(DISABLE_I, !axis_active.i)) stepper.disable_axis(I_AXIS),
if (TERN0(DISABLE_J, !axis_active.j)) stepper.disable_axis(J_AXIS),
if (TERN0(DISABLE_K, !axis_active.k)) stepper.disable_axis(K_AXIS),
if (TERN0(DISABLE_U, !axis_active.u)) stepper.disable_axis(U_AXIS),
if (TERN0(DISABLE_V, !axis_active.v)) stepper.disable_axis(V_AXIS),
if (TERN0(DISABLE_W, !axis_active.w)) stepper.disable_axis(W_AXIS)
);
#endif
//
// Update Fan speeds
@@ -2276,7 +2278,7 @@ bool Planner::_populate_block(
if (esteps) {
TERN_(AUTO_POWER_CONTROL, powerManager.power_on());
#if ENABLED(DISABLE_INACTIVE_EXTRUDER) // Enable only the selected extruder
#if ENABLED(DISABLE_OTHER_EXTRUDERS) // Enable only the selected extruder
// Count down all steppers that were recently moved
LOOP_L_N(i, E_STEPPERS)