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

Pre-apply cosmetic changes to mixing

Browse Source
This commit is contained in:
Scott Lahteine
2019-02-02 23:30:26 -06:00
parent 0358ffcd4c
commit a5e3384691
7 changed files with 62 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2161,7 +2161,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// In worst case, only one extruder running, no change is needed.
// In best case, all extruders run the same amount, we can divide by MIXING_STEPPERS
float delta_mm_i = 0;
if (i == E_AXIS && mixer.get_current_v_tool() == MIXER_AUTORETRACT_TOOL)
if (i == E_AXIS && mixer.get_current_vtool() == MIXER_AUTORETRACT_TOOL)
delta_mm_i = delta_mm[i] / MIXING_STEPPERS;
else
delta_mm_i = delta_mm[i];

2
Marlin/src/module/planner.h
View File

@ -114,7 +114,7 @@ typedef struct block_t {
#endif
#if ENABLED(MIXING_EXTRUDER)
MIXER_BLOCK_DEFINITION; // Normalized color for the mixing steppers
MIXER_BLOCK_FIELD; // Normalized color for the mixing steppers
#endif
// Settings for the trapezoid generator

5
Marlin/src/module/tool_change.cpp
View File

@ -507,9 +507,9 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
if (tmp_extruder >= MIXING_VIRTUAL_TOOLS)
return invalid_extruder_error(tmp_extruder);
#if MIXING_VIRTUAL_TOOLS > 1
#if MIXING_VIRTUAL_TOOLS > 1
// T0-Tnnn: Switch virtual tool by changing the index to the mix
mixer.T(uint_fast8_t(tmp_extruder));
mixer.T(tmp_extruder);
#endif
#elif ENABLED(PRUSA_MMU2)
@ -518,7 +518,6 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
mmu2.toolChange(tmp_extruder);
#elif EXTRUDERS < 2
UNUSED(fr_mm_s); UNUSED(no_move);