From 36763c6bcdd3f4b3306cc0628cde4e9c8763598f Mon Sep 17 00:00:00 2001 From: cnc Date: Fri, 5 Jun 2026 23:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E9=BD=90=20cutter-comp=20override=20M?= =?UTF-8?q?=E7=A0=81=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test-linuxcnc-source-link.sh | 10 +++++++++- tests/gcode/linuxcnc_cutter_comp_m50_disable_error.ngc | 3 +++ tests/gcode/linuxcnc_cutter_comp_m50_enable_error.ngc | 3 +++ tests/gcode/linuxcnc_cutter_comp_m51_disable_error.ngc | 3 +++ tests/gcode/linuxcnc_cutter_comp_m51_enable_error.ngc | 3 +++ tests/gcode/linuxcnc_cutter_comp_m52_disable_error.ngc | 3 +++ tests/gcode/linuxcnc_cutter_comp_m52_enable_error.ngc | 3 +++ tests/gcode/linuxcnc_cutter_comp_m53_disable_error.ngc | 3 +++ tests/gcode/linuxcnc_cutter_comp_m53_enable_error.ngc | 3 +++ 9 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/gcode/linuxcnc_cutter_comp_m50_disable_error.ngc create mode 100644 tests/gcode/linuxcnc_cutter_comp_m50_enable_error.ngc create mode 100644 tests/gcode/linuxcnc_cutter_comp_m51_disable_error.ngc create mode 100644 tests/gcode/linuxcnc_cutter_comp_m51_enable_error.ngc create mode 100644 tests/gcode/linuxcnc_cutter_comp_m52_disable_error.ngc create mode 100644 tests/gcode/linuxcnc_cutter_comp_m52_enable_error.ngc create mode 100644 tests/gcode/linuxcnc_cutter_comp_m53_disable_error.ngc create mode 100644 tests/gcode/linuxcnc_cutter_comp_m53_enable_error.ngc diff --git a/test-linuxcnc-source-link.sh b/test-linuxcnc-source-link.sh index 2ee5aaf..21d71b4 100755 --- a/test-linuxcnc-source-link.sh +++ b/test-linuxcnc-source-link.sh @@ -1424,7 +1424,7 @@ fi grep -q "Cannot wait for digital input with cutter radius compensation on" \ "$output_dir/cnc_sim_linuxcnc_source_cutter_comp_wait_input_error.err" # Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc -# convert_m() rejects M63-M65/M67-M68/M48-M49 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 # canon side effects. cutter_comp_m_error_cases=( @@ -1435,6 +1435,14 @@ cutter_comp_m_error_cases=( "linuxcnc_cutter_comp_m68_error|Cannot set auxiliary analog output with cutter radius compensation on" "linuxcnc_cutter_comp_m48_error|Cannot enable overrides with cutter radius compensation on" "linuxcnc_cutter_comp_m49_error|Cannot disable overrides with cutter radius compensation on" + "linuxcnc_cutter_comp_m50_enable_error|Cannot enable overrides with cutter radius compensation on" + "linuxcnc_cutter_comp_m50_disable_error|Cannot disable overrides with cutter radius compensation on" + "linuxcnc_cutter_comp_m51_enable_error|Cannot enable overrides with cutter radius compensation on" + "linuxcnc_cutter_comp_m51_disable_error|Cannot disable overrides with cutter radius compensation on" + "linuxcnc_cutter_comp_m52_enable_error|Cannot enable overrides with cutter radius compensation on" + "linuxcnc_cutter_comp_m52_disable_error|Cannot disable overrides with cutter radius compensation on" + "linuxcnc_cutter_comp_m53_enable_error|Cannot enable overrides with cutter radius compensation on" + "linuxcnc_cutter_comp_m53_disable_error|Cannot disable overrides with cutter radius compensation on" ) for case in "${cutter_comp_m_error_cases[@]}"; do fixture=${case%%|*} diff --git a/tests/gcode/linuxcnc_cutter_comp_m50_disable_error.ngc b/tests/gcode/linuxcnc_cutter_comp_m50_disable_error.ngc new file mode 100644 index 0000000..3ad8632 --- /dev/null +++ b/tests/gcode/linuxcnc_cutter_comp_m50_disable_error.ngc @@ -0,0 +1,3 @@ +G21 G90 G17 +G41 D1 +M50 P0 diff --git a/tests/gcode/linuxcnc_cutter_comp_m50_enable_error.ngc b/tests/gcode/linuxcnc_cutter_comp_m50_enable_error.ngc new file mode 100644 index 0000000..1798da7 --- /dev/null +++ b/tests/gcode/linuxcnc_cutter_comp_m50_enable_error.ngc @@ -0,0 +1,3 @@ +G21 G90 G17 +G41 D1 +M50 P1 diff --git a/tests/gcode/linuxcnc_cutter_comp_m51_disable_error.ngc b/tests/gcode/linuxcnc_cutter_comp_m51_disable_error.ngc new file mode 100644 index 0000000..4c4c50e --- /dev/null +++ b/tests/gcode/linuxcnc_cutter_comp_m51_disable_error.ngc @@ -0,0 +1,3 @@ +G21 G90 G17 +G41 D1 +M51 P0 diff --git a/tests/gcode/linuxcnc_cutter_comp_m51_enable_error.ngc b/tests/gcode/linuxcnc_cutter_comp_m51_enable_error.ngc new file mode 100644 index 0000000..0a8409f --- /dev/null +++ b/tests/gcode/linuxcnc_cutter_comp_m51_enable_error.ngc @@ -0,0 +1,3 @@ +G21 G90 G17 +G41 D1 +M51 P1 diff --git a/tests/gcode/linuxcnc_cutter_comp_m52_disable_error.ngc b/tests/gcode/linuxcnc_cutter_comp_m52_disable_error.ngc new file mode 100644 index 0000000..5d0dbd3 --- /dev/null +++ b/tests/gcode/linuxcnc_cutter_comp_m52_disable_error.ngc @@ -0,0 +1,3 @@ +G21 G90 G17 +G41 D1 +M52 P0 diff --git a/tests/gcode/linuxcnc_cutter_comp_m52_enable_error.ngc b/tests/gcode/linuxcnc_cutter_comp_m52_enable_error.ngc new file mode 100644 index 0000000..a9c040f --- /dev/null +++ b/tests/gcode/linuxcnc_cutter_comp_m52_enable_error.ngc @@ -0,0 +1,3 @@ +G21 G90 G17 +G41 D1 +M52 P1 diff --git a/tests/gcode/linuxcnc_cutter_comp_m53_disable_error.ngc b/tests/gcode/linuxcnc_cutter_comp_m53_disable_error.ngc new file mode 100644 index 0000000..e5a8ed1 --- /dev/null +++ b/tests/gcode/linuxcnc_cutter_comp_m53_disable_error.ngc @@ -0,0 +1,3 @@ +G21 G90 G17 +G41 D1 +M53 P0 diff --git a/tests/gcode/linuxcnc_cutter_comp_m53_enable_error.ngc b/tests/gcode/linuxcnc_cutter_comp_m53_enable_error.ngc new file mode 100644 index 0000000..314b311 --- /dev/null +++ b/tests/gcode/linuxcnc_cutter_comp_m53_enable_error.ngc @@ -0,0 +1,3 @@ +G21 G90 G17 +G41 D1 +M53 P1