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

z_offset fix for deltas (#12210)

Browse Source
This commit is contained in:
Luc Van Daele 2018-10-25 16:11:26 +02:00 committed by Scott Lahteine
parent 9613f00877
commit 7243101135
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1158,7 +1158,11 @@ void set_axis_is_at_home(const AxisEnum axis) {
#if ENABLED(MORGAN_SCARA) #if ENABLED(MORGAN_SCARA)
scara_set_axis_is_at_home(axis); scara_set_axis_is_at_home(axis);
#elif ENABLED(DELTA) #elif ENABLED(DELTA)
current_position[axis] = (axis == Z_AXIS ? delta_height : base_home_pos(axis)); current_position[axis] = (axis == Z_AXIS ? delta_height
#if HAS_BED_PROBE
- zprobe_zoffset + Z_PROBE_OFFSET_FROM_EXTRUDER
#endif
: base_home_pos(axis));
#else #else
current_position[axis] = base_home_pos(axis); current_position[axis] = base_home_pos(axis);
#endif #endif
@ -1514,7 +1518,11 @@ void homeaxis(const AxisEnum axis) {
} }
#elif ENABLED(DELTA) #elif ENABLED(DELTA)
soft_endstop_min[axis] = base_min_pos(axis); soft_endstop_min[axis] = base_min_pos(axis);
soft_endstop_max[axis] = (axis == Z_AXIS ? delta_height : base_max_pos(axis)); soft_endstop_max[axis] = (axis == Z_AXIS ? delta_height
#if HAS_BED_PROBE
- zprobe_zoffset + Z_PROBE_OFFSET_FROM_EXTRUDER
#endif
: base_max_pos(axis));
#else #else
soft_endstop_min[axis] = base_min_pos(axis); soft_endstop_min[axis] = base_min_pos(axis);
soft_endstop_max[axis] = base_max_pos(axis); soft_endstop_max[axis] = base_max_pos(axis);