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

补齐刀补下偏置平面错误覆盖

Browse Source 
结论：基于 LinuxCNC interp_convert.cc convert_axis_offsets()、convert_straight() 和 convert_set_plane()，native/source-link 现在覆盖刀补打开时 G92、G53、G18 被拒绝的失败分支。
This commit is contained in:
cnc
2026-06-05 23:52:34 +08:00
parent ba0d973f4f
commit 3c05202097
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test-linuxcnc-rs274-native.sh
View File

@@ -746,13 +746,16 @@ CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linux
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_machine_coordinates.ngc >"$output_dir/cnc_sim_linuxcnc_machine_coordinates.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_cutter_comp.ngc >"$output_dir/cnc_sim_linuxcnc_cutter_comp.json"
# Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc rejects
# G28/G30, G54-G59.3, G61/G64, M6, M66, G43, G71.0, and G98/G99 while
# cutter compensation is active; compensated corner and G40 exit checks also
# reject gouging/arc exits.
# G28/G30, G52/G92, G53, G54-G59.3, G61/G64, G17/G18/G19, M6, M66, G43,
# G71.0, and G98/G99 while cutter compensation is active; compensated corner
# and G40 exit checks also reject gouging/arc exits.
cutter_comp_execution_error_cases=(
"linuxcnc_cutter_comp_axis_offset_error|Cannot change axis offsets with cutter radius comp"
"linuxcnc_cutter_comp_control_mode_error|Cannot change control mode with cutter radius compensation on"
"linuxcnc_cutter_comp_coordinate_system_error|Cannot change coordinate systems with cutter radius compensation on"
"linuxcnc_cutter_comp_g53_error|Cannot use g53 with cutter radius comp"
"linuxcnc_cutter_comp_home_error|Cannot use g28 or g30 with cutter radius comp"
"linuxcnc_cutter_comp_plane_change_error|Cannot change planes with cutter radius compensation on"
"linuxcnc_cutter_comp_tool_change_error|Cannot change tools with cutter radius compensation on"
"linuxcnc_cutter_comp_wait_input_error|Cannot wait for digital input with cutter radius compensation on"
"linuxcnc_cutter_comp_tool_offset_error|Cannot change tool offset with cutter radius compensation on"

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

@@ -1458,9 +1458,12 @@ grep -q "Cannot change tool offset with cutter radius compensation on" \
# reject control-mode changes, coordinate-system changes, and G28/G30 while
# cutter radius compensation is active.
cutter_comp_g_error_cases=(
"linuxcnc_cutter_comp_axis_offset_error|Cannot change axis offsets with cutter radius comp"
"linuxcnc_cutter_comp_control_mode_error|Cannot change control mode with cutter radius compensation on"
"linuxcnc_cutter_comp_coordinate_system_error|Cannot change coordinate systems with cutter radius compensation on"
"linuxcnc_cutter_comp_g53_error|Cannot use g53 with cutter radius comp"
"linuxcnc_cutter_comp_home_error|Cannot use g28 or g30 with cutter radius comp"
"linuxcnc_cutter_comp_plane_change_error|Cannot change planes with cutter radius compensation on"
)
for case in "${cutter_comp_g_error_cases[@]}"; do
fixture=${case%%|*}

3
tests/gcode/linuxcnc_cutter_comp_axis_offset_error.ngc Normal file
View File

@@ -0,0 +1,3 @@
G21 G90 G17
G41 D1
G92 X1

3
tests/gcode/linuxcnc_cutter_comp_g53_error.ngc Normal file
View File

@@ -0,0 +1,3 @@
G21 G90 G17
G41 D1
G53 G0 X0

3
tests/gcode/linuxcnc_cutter_comp_plane_change_error.ngc Normal file
View File

@@ -0,0 +1,3 @@
G21 G90 G17
G41 D1
G18