From 86734622d702452bf4fdc217414152c974dfd67c Mon Sep 17 00:00:00 2001 From: cnc Date: Sun, 24 May 2026 22:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E9=BD=90=20LinuxCNC=20NURBS=20?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=A1=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/linuxcnc_canon_bridge.cpp | 4 ++-- test-linuxcnc-source-link.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/linuxcnc_canon_bridge.cpp b/core/src/linuxcnc_canon_bridge.cpp index d3b4340..38f0e91 100644 --- a/core/src/linuxcnc_canon_bridge.cpp +++ b/core/src/linuxcnc_canon_bridge.cpp @@ -411,7 +411,7 @@ void NURBS_G5_FEED(int lineno, const std::vector &points, u return; } for (const auto &point : points) { - active_sink->straight_feed(lineno, nurbs_plane_point_to_pose(point, plane)); + active_sink->straight_feed(event_line(lineno), nurbs_plane_point_to_pose(point, plane)); } } @@ -420,7 +420,7 @@ void NURBS_G6_FEED(int lineno, const std::vector &points return; } for (const auto &point : points) { - active_sink->straight_feed(lineno, nurbs_plane_point_to_pose(point, plane)); + active_sink->straight_feed(event_line(lineno), nurbs_plane_point_to_pose(point, plane)); } } diff --git a/test-linuxcnc-source-link.sh b/test-linuxcnc-source-link.sh index 3d09725..0c65ff6 100755 --- a/test-linuxcnc-source-link.sh +++ b/test-linuxcnc-source-link.sh @@ -2038,6 +2038,7 @@ if not any(event["type"] == "program-end" and event["line"] == 7 for event in g5 g52_xz_nurbs = json.loads(Path("/tmp/cnc_sim_linuxcnc_source_g52_xz_nurbs.json").read_text()) if not any( event["type"] == "linear-feed" and + event["line"] == 6 and event["plane"] == 18 and event["end"]["x"] == 3 and event["end"]["y"] == 0 and @@ -2049,6 +2050,7 @@ if not any( g62_xz_nurbs = json.loads(Path("/tmp/cnc_sim_linuxcnc_source_g62_xz_nurbs.json").read_text()) if not any( event["type"] == "linear-feed" and + event["line"] == 16 and event["plane"] == 18 and event["end"]["x"] == 100 and event["end"]["y"] == 0 and