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

补齐刀补下模式切换错误覆盖

Browse Source 
结论：基于 LinuxCNC interp_convert.cc convert_control_mode()、convert_coordinate_system() 和 convert_home()，native/source-link 现在覆盖刀补打开时 G64、G55、G28 被拒绝的失败分支。
This commit is contained in:
cnc
2026-06-05 23:46:15 +08:00
parent f69e10bedf
commit ba0d973f4f
5 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -746,9 +746,13 @@ 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
# 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, 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.
cutter_comp_execution_error_cases=(
"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_home_error|Cannot use g28 or g30 with cutter radius comp"
"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"

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

@@ -1454,6 +1454,26 @@ fi
grep -q "Cannot change tool offset with cutter radius compensation on" \
"$output_dir/cnc_sim_linuxcnc_source_cutter_comp_tool_offset_error.err"
# Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc
# convert_control_mode(), convert_coordinate_system(), and convert_home()
# reject control-mode changes, coordinate-system changes, and G28/G30 while
# cutter radius compensation is active.
cutter_comp_g_error_cases=(
"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_home_error|Cannot use g28 or g30 with cutter radius comp"
)
for case in "${cutter_comp_g_error_cases[@]}"; do
fixture=${case%%|*}
expected=${case#*|}
if CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" \
"$build_dir/linuxcnc_rs274_source_dump" "tests/gcode/$fixture.ngc" \
>"$output_dir/cnc_sim_linuxcnc_source_$fixture.json" 2>"$output_dir/cnc_sim_linuxcnc_source_$fixture.err"; then
echo "expected $fixture.ngc to fail" >&2
exit 1
fi
grep -Fq "$expected" "$output_dir/cnc_sim_linuxcnc_source_$fixture.err"
done
# Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc
# convert_m() rejects M63-M65/M67-M68/M48-M53 while cutter radius
# compensation is active before enqueueing digital/analog output or override
# canon side effects.

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

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

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

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

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

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