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

Fix mixing with "unload all" compile

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-19 02:01:30 -05:00
parent ad7a6e10a7
commit 87875e0de8
6 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2133,17 +2133,14 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#if EXTRUDERS
{
current_speed.e = steps_dist_mm.e * inverse_secs;
#if BOTH(MIXING_EXTRUDER, RETRACT_SYNC_MIXING)
#if HAS_MIXER_SYNC_CHANNEL
// Move all mixing extruders at the specified rate
if (mixer.get_current_vtool() == MIXER_AUTORETRACT_TOOL)
current_speed.e *= MIXING_STEPPERS;
#endif
const feedRate_t cs = ABS(current_speed.e),
max_fr = (settings.max_feedrate_mm_s[E_AXIS_N(extruder)]
#if BOTH(MIXING_EXTRUDER, RETRACT_SYNC_MIXING)
* MIXING_STEPPERS
#endif
);
max_fr = settings.max_feedrate_mm_s[E_AXIS_N(extruder)]
* TERN(HAS_MIXER_SYNC_CHANNEL, MIXING_STEPPERS, 1);
if (cs > max_fr) NOMORE(speed_factor, max_fr / cs);
}
#endif