Skip to content

Commit

Permalink
Deshacemos f7a3172
Browse files Browse the repository at this point in the history
🐛 Fix DELTA Z when not using probe for homing (MarlinFirmware#26297)
  • Loading branch information
lujios committed Dec 14, 2023
1 parent 2ee7f13 commit 1c1c1dc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/module/delta.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ void home_delta() {
#endif

// Move all carriages together linearly until an endstop is hit.
current_position.z = DIFF_TERN(USE_PROBE_FOR_Z_HOMING, delta_height + 10, probe.offset.z);
current_position.z = DIFF_TERN(HAS_BED_PROBE, delta_height + 10, probe.offset.z); //Luj error en f7a3172c20cfed3178ab9ab099ff386f61560ad9 HAS_BED_PROBE que se activa con SENSORLESS
line_to_current_position(homing_feedrate(Z_AXIS));
planner.synchronize();
TERN_(HAS_DELTA_SENSORLESS_PROBING, endstops.report_states());
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/module/motion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ void restore_feedrate_and_scaling() {
#elif ENABLED(DELTA)

soft_endstop.min[axis] = base_min_pos(axis);
soft_endstop.max[axis] = (axis == Z_AXIS) ? DIFF_TERN(USE_PROBE_FOR_Z_HOMING, delta_height, probe.offset.z) : base_max_pos(axis); //Luj error en f7a3172c20cfed3178ab9ab099ff386f61560ad9
soft_endstop.max[axis] = (axis == Z_AXIS) ? DIFF_TERN(HAS_BED_PROBE, delta_height, probe.offset.z) : base_max_pos(axis); //Luj error en f7a3172c20cfed3178ab9ab099ff386f61560ad9

switch (axis) {
case X_AXIS:
Expand Down Expand Up @@ -2468,7 +2468,7 @@ void set_axis_is_at_home(const AxisEnum axis) {
#if ANY(MORGAN_SCARA, AXEL_TPARA)
scara_set_axis_is_at_home(axis);
#elif ENABLED(DELTA)
current_position[axis] = (axis == Z_AXIS) ? DIFF_TERN(USE_PROBE_FOR_Z_HOMING, delta_height, probe.offset.z) : base_home_pos(axis);
current_position[axis] = (axis == Z_AXIS) ? DIFF_TERN(HAS_BED_PROBE, delta_height, probe.offset.z) : base_home_pos(axis); //Luj error en f7a3172c20cfed3178ab9ab099ff386f61560ad9
#else
current_position[axis] = SUM_TERN(HAS_HOME_OFFSET, base_home_pos(axis), home_offset[axis]);
#endif
Expand Down

0 comments on commit 1c1c1dc

Please sign in to comment.