Skip to content

Commit f8e2576

Browse files
authored
Fix soft limit calculation when using G43.1
As discussed in this forum thread: https://forum.linuxcnc.org/20-g-code/44244-g43-1-dynamic-tool-length-measurement-program-exceeds-machine-maximum-on-axis?start=10#227198 When using G43.1 Tool Length Offset, Axis will wrongly display a warning about exceeding the soft limits. This PR adds the tool offset to the limits calculation so this warning wont be displayed anymore if not needed (It still will if it actually exceeds the limit).
1 parent bfb09e7 commit f8e2576

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • src/emc/usr_intf/axis/scripts

src/emc/usr_intf/axis/scripts/axis.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,10 +1854,10 @@ def run_warn():
18541854
machine_limit_min, machine_limit_max = soft_limits()
18551855
for i in range(3): # Does not enforce angle limits
18561856
if not(s.axis_mask & (1<<i)): continue
1857-
if o.canon.min_extents_notool[i] < machine_limit_min[i]:
1857+
if o.canon.min_extents_notool[i] + to_internal_linear_unit(o.last_tool_offset[i]) < machine_limit_min[i]:
18581858
warnings.append(_("Program exceeds machine minimum on axis %s")
18591859
% "XYZABCUVW"[i])
1860-
if o.canon.max_extents_notool[i] > machine_limit_max[i]:
1860+
if o.canon.max_extents_notool[i] + to_internal_linear_unit(o.last_tool_offset[i]) > machine_limit_max[i]:
18611861
warnings.append(_("Program exceeds machine maximum on axis %s")
18621862
% "XYZABCUVW"[i])
18631863
if warnings:

0 commit comments

Comments
 (0)