meswork/wasm-simulator
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对齐 LinuxCNC NURBS 事件行号

Browse Source
This commit is contained in:
cnc
2026-05-24 22:02:46 +08:00
parent dd4b7d9314
commit 86734622d7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/linuxcnc_canon_bridge.cpp
View File

@@ -411,7 +411,7 @@ void NURBS_G5_FEED(int lineno, const std::vector<NURBS_CONTROL_POINT> &points, u
return; return;
} }
for (const auto &point : points) { 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<NURBS_G6_CONTROL_POINT> &points
return; return;
} }
for (const auto &point : points) { 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));
} }
} }

2
test-linuxcnc-source-link.sh
View File

@@ -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()) g52_xz_nurbs = json.loads(Path("/tmp/cnc_sim_linuxcnc_source_g52_xz_nurbs.json").read_text())
if not any( if not any(
event["type"] == "linear-feed" and event["type"] == "linear-feed" and
event["line"] == 6 and
event["plane"] == 18 and event["plane"] == 18 and
event["end"]["x"] == 3 and event["end"]["x"] == 3 and
event["end"]["y"] == 0 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()) g62_xz_nurbs = json.loads(Path("/tmp/cnc_sim_linuxcnc_source_g62_xz_nurbs.json").read_text())
if not any( if not any(
event["type"] == "linear-feed" and event["type"] == "linear-feed" and
event["line"] == 16 and
event["plane"] == 18 and event["plane"] == 18 and
event["end"]["x"] == 100 and event["end"]["x"] == 100 and
event["end"]["y"] == 0 and event["end"]["y"] == 0 and