SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[2.0.x]Idex and bl touch fixes (#11395)

Browse source 
* Fix BLTouch homing

Deploy at start, dont call generic stow function at finish or raise goes too high before setting 0

* Update tool_change.cpp

* Update motion.cpp

* Update motion.cpp

* Update motion.cpp

* Update motion.cpp

* Change brackets to be more in align of Marlin coding standards
This commit is contained in:
silentninja1 2018-07-28 11:33:31 -04:00 committed by Roxy-3D
parent 5ce5ff8e9b
commit 6dafb90c01
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/src/module/tool_change.cpp
View file

@ -377,8 +377,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
#endif #endif
} }
// Save current position to destination, for use later
set_destination_from_current();
#if HAS_LEVELING #if HAS_LEVELING
// Set current position to the physical position // Set current position to the physical position
@ -387,11 +386,15 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
#endif #endif
#if ENABLED(DUAL_X_CARRIAGE) #if ENABLED(DUAL_X_CARRIAGE)
if(current_position[X_AXIS] != x_home_pos(active_extruder))
set_destination_from_current();
else
no_move = true;
dualx_tool_change(tmp_extruder, no_move); // Can modify no_move dualx_tool_change(tmp_extruder, no_move); // Can modify no_move
#else // !DUAL_X_CARRIAGE #else // !DUAL_X_CARRIAGE
// Save current position to destination, for use later
set_destination_from_current();
#if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder #if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder
parking_extruder_tool_change(tmp_extruder, no_move); parking_extruder_tool_change(tmp_extruder, no_move);
#endif #endif