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

补齐刀补下工具偏置错误覆盖

Browse Source 
结论：基于 LinuxCNC interp_convert.cc convert_tool_length_offset()，native/source-link 现在覆盖 cutter radius comp 打开时 G43 工具长度偏置被拒绝的失败分支。
This commit is contained in:
cnc
2026-06-05 23:41:09 +08:00
parent a8f6a9d907
commit f69e10bedf
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -746,11 +746,12 @@ 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_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" 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 # Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc rejects
# M6, M66, G71.0, and G98/G99 while cutter compensation is active; # M6, M66, G43, G71.0, and G98/G99 while cutter compensation is active;
# compensated corner and G40 exit checks also reject gouging/arc exits. # compensated corner and G40 exit checks also reject gouging/arc exits.
cutter_comp_execution_error_cases=( cutter_comp_execution_error_cases=(
"linuxcnc_cutter_comp_tool_change_error|Cannot change tools 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_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"
"linuxcnc_cutter_comp_g71_error|G71.0 cannot be used with cutter compensation enabled" "linuxcnc_cutter_comp_g71_error|G71.0 cannot be used with cutter compensation enabled"
"linuxcnc_canned_cycle_g98_retract_error|Cannot change retract mode with cutter radius compensation on" "linuxcnc_canned_cycle_g98_retract_error|Cannot change retract mode with cutter radius compensation on"
"linuxcnc_ccomp_arcexit_error|The move just after exiting cutter compensation mode must be straight, not an arc" "linuxcnc_ccomp_arcexit_error|The move just after exiting cutter compensation mode must be straight, not an arc"

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

@@ -1445,6 +1445,14 @@ if CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" \
fi fi
grep -q "Cannot wait for digital input with cutter radius compensation on" \ grep -q "Cannot wait for digital input with cutter radius compensation on" \
"$output_dir/cnc_sim_linuxcnc_source_cutter_comp_wait_input_error.err" "$output_dir/cnc_sim_linuxcnc_source_cutter_comp_wait_input_error.err"
if CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" \
"$build_dir/linuxcnc_rs274_source_dump" tests/gcode/linuxcnc_cutter_comp_tool_offset_error.ngc \
>"$output_dir/cnc_sim_linuxcnc_source_cutter_comp_tool_offset_error.json" 2>"$output_dir/cnc_sim_linuxcnc_source_cutter_comp_tool_offset_error.err"; then
echo "expected linuxcnc_cutter_comp_tool_offset_error.ngc to fail" >&2
exit 1
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 # Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc
# convert_m() rejects M63-M65/M67-M68/M48-M53 while cutter radius # convert_m() rejects M63-M65/M67-M68/M48-M53 while cutter radius
# compensation is active before enqueueing digital/analog output or override # compensation is active before enqueueing digital/analog output or override

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

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