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

Fix broken jerk handling (#12019)

Browse Source 
Fix #12004
This commit is contained in:
Thomas Moore 2018-10-06 13:02:50 -04:00 committed by Scott Lahteine
parent 68bb75c847
commit 49823a4939
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2087,14 +2087,16 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
float delta_mm_i = 0; float delta_mm_i = 0;
if (i == E_AXIS) { if (i == E_AXIS) {
for (uint8_t s = 0; s < MIXING_STEPPERS; s++) for (uint8_t s = 0; s < MIXING_STEPPERS; s++) {
delta_mm_i = MAX(mixing_factor[s] * ABS(delta_mm[i]), delta_mm_i); const float delta_mm_s = mixing_factor[s] * delta_mm[i];
if (ABS(delta_mm_s) > ABS(delta_mm_i)) delta_mm_i = delta_mm_s;
} }
else delta_mm_i = ABS(delta_mm[i]); }
else delta_mm_i = delta_mm[i];
#else #else
const float delta_mm_i = ABS(delta_mm[i]); const float delta_mm_i = delta_mm[i];
#endif #endif
const float cs = current_speed[i] = delta_mm_i * inverse_secs; const float cs = ABS(current_speed[i] = delta_mm_i * inverse_secs);
#if ENABLED(DISTINCT_E_FACTORS) #if ENABLED(DISTINCT_E_FACTORS)
if (i == E_AXIS) i += extruder; if (i == E_AXIS) i += extruder;
#endif #endif