0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Don't apply hotend_offset.z to Z soft endstops (#20675)

Browse source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
zeleps 2021-01-05 07:48:42 +02:00 committed by GitHub
parent d2e1e9a0ac
commit 2f17f2207a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/src/feature/solenoid.cpp
View file

@ -58,6 +58,11 @@ static void set_solenoid(const uint8_t num, const bool active) {
#endif #endif
default: SERIAL_ECHO_MSG(STR_INVALID_SOLENOID); break; default: SERIAL_ECHO_MSG(STR_INVALID_SOLENOID); break;
} }
#if ENABLED(PARKING_EXTRUDER)
if (!active && active_extruder == num) // If active extruder's solenoid is disabled, carriage is considered parked
parking_extruder_set_parked(true);
#endif
} }
void enable_solenoid(const uint8_t num) { set_solenoid(num, true); } void enable_solenoid(const uint8_t num) { set_solenoid(num, true); }

15
Marlin/src/module/motion.cpp
View file

@ -595,16 +595,17 @@ void restore_feedrate_and_scaling() {
// Software endstops are relative to the tool 0 workspace, so // Software endstops are relative to the tool 0 workspace, so
// the movement limits must be shifted by the tool offset to // the movement limits must be shifted by the tool offset to
// retain the same physical limit when other tools are selected. // retain the same physical limit when other tools are selected.
if (old_tool_index != new_tool_index) {
const float offs = hotend_offset[new_tool_index][axis] - hotend_offset[old_tool_index][axis]; if (new_tool_index == old_tool_index || axis == Z_AXIS) { // The Z axis is "special" and shouldn't be modified
soft_endstop.min[axis] += offs; const float offs = (axis == Z_AXIS) ? 0 : hotend_offset[active_extruder][axis];
soft_endstop.max[axis] += offs;
}
else {
const float offs = hotend_offset[active_extruder][axis];
soft_endstop.min[axis] = base_min_pos(axis) + offs; soft_endstop.min[axis] = base_min_pos(axis) + offs;
soft_endstop.max[axis] = base_max_pos(axis) + offs; soft_endstop.max[axis] = base_max_pos(axis) + offs;
} }
else {
const float diff = hotend_offset[new_tool_index][axis] - hotend_offset[old_tool_index][axis];
soft_endstop.min[axis] += diff;
soft_endstop.max[axis] += diff;
}
#else #else

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

@ -292,8 +292,6 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
return true; return true;
} }
void parking_extruder_set_parked() { extruder_parked = true; }
inline void parking_extruder_tool_change(const uint8_t new_tool, bool no_move) { inline void parking_extruder_tool_change(const uint8_t new_tool, bool no_move) {
if (!no_move) { if (!no_move) {
@ -378,7 +376,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
planner.synchronize(); // Always sync the final move planner.synchronize(); // Always sync the final move
DEBUG_POS("PE Tool-Change done.", current_position); DEBUG_POS("PE Tool-Change done.", current_position);
extruder_parked = false; parking_extruder_set_parked(false);
} }
else if (do_solenoid_activation) { // && nomove == true else if (do_solenoid_activation) { // && nomove == true
// Deactivate current extruder solenoid // Deactivate current extruder solenoid

3
Marlin/src/module/tool_change.h
View file

@ -93,8 +93,9 @@
void pe_solenoid_init(); void pe_solenoid_init();
extern bool extruder_parked;
inline void parking_extruder_set_parked(const bool parked) { extruder_parked = parked; }
bool parking_extruder_unpark_after_homing(const uint8_t final_tool, bool homed_towards_final_tool); bool parking_extruder_unpark_after_homing(const uint8_t final_tool, bool homed_towards_final_tool);
void parking_extruder_set_parked();
#elif ENABLED(MAGNETIC_PARKING_EXTRUDER) #elif ENABLED(MAGNETIC_PARKING_EXTRUDER)