3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-18 23:49:49 +00:00
Code Issues Releases Wiki Activity

🐛 Fix DELTA Z when not using probe for homing (#26297)

Browse source
This commit is contained in:
Bob Kuhn 2023-10-06 23:53:52 -05:00 committed by GitHub
parent b799f7d1f3
commit f7a3172c20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/module/delta.cpp
View file

@ -242,7 +242,7 @@ void home_delta() {
#endif #endif
// Move all carriages together linearly until an endstop is hit. // Move all carriages together linearly until an endstop is hit.
current_position.z = DIFF_TERN(HAS_BED_PROBE, delta_height + 10, probe.offset.z); current_position.z = DIFF_TERN(USE_PROBE_FOR_Z_HOMING, delta_height + 10, probe.offset.z);
line_to_current_position(homing_feedrate(Z_AXIS)); line_to_current_position(homing_feedrate(Z_AXIS));
planner.synchronize(); planner.synchronize();
TERN_(HAS_DELTA_SENSORLESS_PROBING, endstops.report_states()); TERN_(HAS_DELTA_SENSORLESS_PROBING, endstops.report_states());

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

@ -892,7 +892,7 @@ void restore_feedrate_and_scaling() {
#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) ? DIFF_TERN(HAS_BED_PROBE, delta_height, probe.offset.z) : base_max_pos(axis); soft_endstop.max[axis] = (axis == Z_AXIS) ? DIFF_TERN(USE_PROBE_FOR_Z_HOMING, delta_height, probe.offset.z) : base_home_pos(axis);
switch (axis) { switch (axis) {
case X_AXIS: case X_AXIS:
@ -2468,7 +2468,7 @@ void set_axis_is_at_home(const AxisEnum axis) {
#if ANY(MORGAN_SCARA, AXEL_TPARA) #if ANY(MORGAN_SCARA, AXEL_TPARA)
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) ? DIFF_TERN(HAS_BED_PROBE, delta_height, probe.offset.z) : base_home_pos(axis); current_position[axis] = (axis == Z_AXIS) ? DIFF_TERN(USE_PROBE_FOR_Z_HOMING, delta_height, probe.offset.z) : base_home_pos(axis);
#else #else
current_position[axis] = SUM_TERN(HAS_HOME_OFFSET, base_home_pos(axis), home_offset[axis]); current_position[axis] = SUM_TERN(HAS_HOME_OFFSET, base_home_pos(axis), home_offset[axis]);
#endif #endif