Browse Source

z_offset fix for deltas (#12210)

Luc Van Daele 6 years ago
parent
commit
7243101135
1 changed files with 10 additions and 2 deletions
  1. 10
    2
      Marlin/src/module/motion.cpp

+ 10
- 2
Marlin/src/module/motion.cpp View File

@@ -1158,7 +1158,11 @@ void set_axis_is_at_home(const AxisEnum axis) {
1158 1158
   #if ENABLED(MORGAN_SCARA)
1159 1159
     scara_set_axis_is_at_home(axis);
1160 1160
   #elif ENABLED(DELTA)
1161
-    current_position[axis] = (axis == Z_AXIS ? delta_height : base_home_pos(axis));
1161
+    current_position[axis] = (axis == Z_AXIS ? delta_height
1162
+    #if HAS_BED_PROBE
1163
+      - zprobe_zoffset + Z_PROBE_OFFSET_FROM_EXTRUDER    
1164
+    #endif
1165
+    : base_home_pos(axis));
1162 1166
   #else
1163 1167
     current_position[axis] = base_home_pos(axis);
1164 1168
   #endif
@@ -1514,7 +1518,11 @@ void homeaxis(const AxisEnum axis) {
1514 1518
       }
1515 1519
     #elif ENABLED(DELTA)
1516 1520
       soft_endstop_min[axis] = base_min_pos(axis);
1517
-      soft_endstop_max[axis] = (axis == Z_AXIS ? delta_height : base_max_pos(axis));
1521
+      soft_endstop_max[axis] = (axis == Z_AXIS ? delta_height
1522
+      #if HAS_BED_PROBE
1523
+        - zprobe_zoffset + Z_PROBE_OFFSET_FROM_EXTRUDER
1524
+      #endif
1525
+      : base_max_pos(axis));
1518 1526
     #else
1519 1527
       soft_endstop_min[axis] = base_min_pos(axis);
1520 1528
       soft_endstop_max[axis] = base_max_pos(axis);

Loading…
Cancel
Save