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

Fix for #12482 (#12483)

Browse Source 
Fix Z-move to uninitialized position in SWITCHING_EXTRUDERS tool_change (no_move=true)
This commit is contained in:
Marcio Teixeira 2018-11-19 23:04:11 -07:00 committed by Scott Lahteine
parent 50ee747787
commit 4bcb63b705
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,13 +96,11 @@
#endif // DO_SWITCH_EXTRUDER #endif // DO_SWITCH_EXTRUDER
#if ENABLED(SWITCHING_NOZZLE) #if ENABLED(SWITCHING_NOZZLE)
void move_nozzle_servo(const uint8_t e) { void move_nozzle_servo(const uint8_t e) {
planner.synchronize(); planner.synchronize();
MOVE_SERVO(SWITCHING_NOZZLE_SERVO_NR, servo_angles[SWITCHING_NOZZLE_SERVO_NR][e]); MOVE_SERVO(SWITCHING_NOZZLE_SERVO_NR, servo_angles[SWITCHING_NOZZLE_SERVO_NR][e]);
safe_delay(500); safe_delay(500);
} }
#endif // SWITCHING_NOZZLE #endif // SWITCHING_NOZZLE
#if ENABLED(PARKING_EXTRUDER) #if ENABLED(PARKING_EXTRUDER)
@ -596,8 +594,9 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
#endif #endif
set_destination_from_current();
if (!no_move) { if (!no_move) {
set_destination_from_current();
#if DISABLED(SWITCHING_NOZZLE) #if DISABLED(SWITCHING_NOZZLE)
// Do a small lift to avoid the workpiece in the move back (below) // Do a small lift to avoid the workpiece in the move back (below)
#if ENABLED(TOOLCHANGE_PARK) #if ENABLED(TOOLCHANGE_PARK)