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

Finish G12, update Nozzle::clean (#14642)

Browse Source
This commit is contained in:
InsanityAutomation
2019-07-17 04:41:04 -04:00
committed by Scott Lahteine
parent 57ed063ba1
commit b8cc61262f
10 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -822,12 +822,6 @@ void tool_change(const uint8_t tmp_extruder, bool no_move/*=false*/) {
return invalid_extruder_error(tmp_extruder);
#endif
#if HAS_LEVELING
// Set current position to the physical position
const bool leveling_was_active = planner.leveling_active;
set_bed_leveling_enabled(false);
#endif
if (tmp_extruder >= EXTRUDERS)
return invalid_extruder_error(tmp_extruder);
@ -875,6 +869,11 @@ void tool_change(const uint8_t tmp_extruder, bool no_move/*=false*/) {
}
#endif // TOOLCHANGE_FILAMENT_SWAP
#if HAS_LEVELING
// Set current position to the physical position
TEMPORARY_BED_LEVELING_STATE(false);
#endif
if (tmp_extruder != active_extruder) {
#if SWITCHING_NOZZLE_TWO_SERVOS
@ -1071,11 +1070,6 @@ void tool_change(const uint8_t tmp_extruder, bool no_move/*=false*/) {
fanmux_switch(active_extruder);
#endif
#if HAS_LEVELING
// Restore leveling to re-establish the logical position
set_bed_leveling_enabled(leveling_was_active);
#endif
SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, int(active_extruder));