bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🧑‍💻 Misc. updates for extra axes (#23521)

Browse Source
This commit is contained in:
Scott Lahteine
2022-01-14 03:14:13 -06:00
committed by Scott Lahteine
parent 39e4310c7b
commit 5617edbb96
27 changed files with 289 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2041,15 +2041,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
steps_dist_mm.b = (db + dc) * mm_per_step[B_AXIS];
steps_dist_mm.c = CORESIGN(db - dc) * mm_per_step[C_AXIS];
#endif
#if HAS_I_AXIS
steps_dist_mm.i = di * mm_per_step[I_AXIS];
#endif
#if HAS_J_AXIS
steps_dist_mm.j = dj * mm_per_step[J_AXIS];
#endif
#if HAS_K_AXIS
steps_dist_mm.k = dk * mm_per_step[K_AXIS];
#endif
TERN_(HAS_I_AXIS, steps_dist_mm.i = di * mm_per_step[I_AXIS]);
TERN_(HAS_J_AXIS, steps_dist_mm.j = dj * mm_per_step[J_AXIS]);
TERN_(HAS_K_AXIS, steps_dist_mm.k = dk * mm_per_step[K_AXIS]);
#elif ENABLED(MARKFORGED_XY)
steps_dist_mm.a = (da - db) * mm_per_step[A_AXIS];
steps_dist_mm.b = db * mm_per_step[B_AXIS];
@ -2197,15 +2191,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
);
#endif
#if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
#if HAS_I_AXIS
if (block->steps.i) stepper.enable_axis(I_AXIS);
#endif
#if HAS_J_AXIS
if (block->steps.j) stepper.enable_axis(J_AXIS);
#endif
#if HAS_K_AXIS
if (block->steps.k) stepper.enable_axis(K_AXIS);
#endif
TERN_(HAS_I_AXIS, if (block->steps.i) stepper.enable_axis(I_AXIS));
TERN_(HAS_J_AXIS, if (block->steps.j) stepper.enable_axis(J_AXIS));
TERN_(HAS_K_AXIS, if (block->steps.k) stepper.enable_axis(K_AXIS));
#endif
// Enable extruder(s)
@ -2260,7 +2248,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// Slow down when the buffer starts to empty, rather than wait at the corner for a buffer refill
#if EITHER(SLOWDOWN, HAS_WIRED_LCD) || defined(XY_FREQUENCY_LIMIT)
// Segment time im micro seconds
// Segment time in microseconds
int32_t segment_time_us = LROUND(1000000.0f / inverse_secs);
#endif
@ -2419,7 +2407,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
accel = CEIL((esteps ? settings.acceleration : settings.travel_acceleration) * steps_per_mm);
#if ENABLED(LIN_ADVANCE)
// Linear advance is currently not ready for HAS_I_AXIS
#define MAX_E_JERK(N) TERN(HAS_LINEAR_E_JERK, max_e_jerk[E_INDEX_N(N)], max_jerk.e)
/**
@ -2939,7 +2927,7 @@ bool Planner::buffer_segment(const abce_pos_t &abce
SERIAL_ECHOPGM_P(SP_Y_LBL, abce.b);
#endif
SERIAL_ECHOPGM(" (", position.y, "->", target.y);
#if LINEAR_AXES >= ABC
#if HAS_Z_AXIS
#if ENABLED(DELTA)
SERIAL_ECHOPGM(") C:", abce.c);
#else