CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up xdiff, ydiff, zdiff in tool change

Browse Source 
Followup to #12137
This commit is contained in:
Scott Lahteine 2018-11-06 22:56:23 -06:00
parent 6471a75a22
commit 81b1e9d272
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -610,11 +610,15 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
} }
#if HOTENDS > 1 #if HOTENDS > 1
const float xdiff = hotend_offset[X_AXIS][tmp_extruder] - hotend_offset[X_AXIS][active_extruder], #if ENABLED(DUAL_X_CARRIAGE)
ydiff = hotend_offset[Y_AXIS][tmp_extruder] - hotend_offset[Y_AXIS][active_extruder], constexpr float xdiff = 0;
#else
const float xdiff = hotend_offset[X_AXIS][tmp_extruder] - hotend_offset[X_AXIS][active_extruder];
#endif
const float ydiff = hotend_offset[Y_AXIS][tmp_extruder] - hotend_offset[Y_AXIS][active_extruder],
zdiff = hotend_offset[Z_AXIS][tmp_extruder] - hotend_offset[Z_AXIS][active_extruder]; zdiff = hotend_offset[Z_AXIS][tmp_extruder] - hotend_offset[Z_AXIS][active_extruder];
#else #else
const float xdiff = 0, ydiff = 0, zdiff = 0; constexpr float xdiff = 0, ydiff = 0, zdiff = 0;
#endif #endif
#if ENABLED(DUAL_X_CARRIAGE) #if ENABLED(DUAL_X_CARRIAGE)
@ -643,9 +647,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
#endif #endif
// The newly-selected extruder XY is actually at... // The newly-selected extruder XY is actually at...
#if DISABLED(DUAL_X_CARRIAGE)
current_position[X_AXIS] += xdiff; current_position[X_AXIS] += xdiff;
#endif
current_position[Y_AXIS] += ydiff; current_position[Y_AXIS] += ydiff;
current_position[Z_AXIS] += zdiff; current_position[Z_AXIS] += zdiff;