wangdequan/cnc_wams
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

按建议继续完成后续工作

Browse Source 
结论：native 兼容性验证已接入 interpreter init、rotary indexer、canonical 边界 fixture，并新增 upstream rs274 side-by-side 基线；完整 verify_native_probes.sh 已通过。
This commit is contained in:
wangdequan
2026-06-07 22:37:29 +08:00
parent 59cfc8406e
commit 7a20531ae4
20 changed files with 530 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wasm-port/tests/fixtures/canon/comment_logging.events vendored Normal file
View File

@@ -0,0 +1,4 @@
canon_event=LOGOPEN: session.log
canon_event=LOG: feed log line
canon_event=LOGAPPEND: append log line
canon_event=LOGCLOSE

2
wasm-port/tests/fixtures/canon/file_open_reset.events vendored Normal file
View File

@@ -0,0 +1,2 @@
canon_event=ON_RESET
canon_event=STRAIGHT_TRAVERSE line=1 x=1 y=0 z=0 a=0 b=0 c=0 u=0 v=0 w=0

2
wasm-port/tests/fixtures/canon/percent_file_finish.events vendored Normal file
View File

@@ -0,0 +1,2 @@
canon_event=STRAIGHT_TRAVERSE line=2 x=1 y=0 z=0 a=0 b=0 c=0 u=0 v=0 w=0
canon_event=FINISH

2
wasm-port/tests/fixtures/canon/state_tag_motion.events vendored Normal file
View File

@@ -0,0 +1,2 @@
canon_event=UPDATE_TAG line=1
canon_event=UPDATE_TAG line=2

1
wasm-port/tests/fixtures/canon/tool_reload.events vendored Normal file
View File

@@ -0,0 +1 @@
canon_event=RELOAD_TOOLDATA

4
wasm-port/tests/fixtures/gcode/comment_logging.ngc vendored Normal file
View File

@@ -0,0 +1,4 @@
(LOGOPEN,session.log)
(LOG,feed log line)
(LOGAPPEND,append log line)
(LOGCLOSE)

1
wasm-port/tests/fixtures/gcode/file_open_reset.ngc vendored Normal file
View File

@@ -0,0 +1 @@
G0 X1

3
wasm-port/tests/fixtures/gcode/percent_file_finish.ngc vendored Normal file
View File

@@ -0,0 +1,3 @@
%
G0 X1
%

2
wasm-port/tests/fixtures/gcode/state_tag_motion.ngc vendored Normal file
View File

@@ -0,0 +1,2 @@
G90 G17 G0 X1 Y2
G1 X3 Y4 F120

1
wasm-port/tests/fixtures/gcode/tool_reload.ngc vendored Normal file
View File

@@ -0,0 +1 @@
G10 L0

38
wasm-port/tests/native/verify_native_probes.sh
View File

@@ -12,6 +12,7 @@ NAMEDPARAM_INI_FIXTURE="$ROOT_DIR/tests/fixtures/ini/namedparams.ini"
"$ROOT_DIR/tools/verify_upstream_baseline.sh"
"$ROOT_DIR/tools/verify_vendor_sync.sh"
"$ROOT_DIR/tools/verify_no_standalone_cnc_semantics.sh"
"$ROOT_DIR/tools/verify_native_linuxcnc_fixture_baseline.sh"
"$ROOT_DIR/tools/build_native_probes.sh"
check_source_probe_coverage() {
@@ -152,6 +153,10 @@ check_exitcode linuxcnc_interp_minimal_harness
check_exitcode linuxcnc_interp_minimal_harness.run
check_exitcode linuxcnc_parameter_file_harness
check_exitcode linuxcnc_parameter_file_harness.run
check_exitcode linuxcnc_interp_init_harness
check_exitcode linuxcnc_interp_init_harness.run
check_exitcode linuxcnc_indexer_harness
check_exitcode linuxcnc_indexer_harness.run
check_exitcode linuxcnc_rs274_compile_probe
check_exitcode linuxcnc_kins_util_source_probe
check_exitcode linuxcnc_cubic_source_probe
@@ -238,6 +243,31 @@ grep -Fq "saved_has_5399=1" "$PARAMETER_FILE_STDOUT"
grep -Fq "saved_has_named_param=0" "$PARAMETER_FILE_STDOUT"
grep -Fq "backup_has_original_5161=1" "$PARAMETER_FILE_STDOUT"
INIT_HARNESS_STDOUT="$BUILD_DIR/linuxcnc_interp_init_harness.run.stdout.log"
grep -Fq "init=0" "$INIT_HARNESS_STDOUT"
grep -Fq "setup.length_units=2" "$INIT_HARNESS_STDOUT"
grep -Fq "setup.origin_index=1" "$INIT_HARNESS_STDOUT"
grep -Fq "setup.distance_mode=0" "$INIT_HARNESS_STDOUT"
grep -Fq "setup.feed_mode=0" "$INIT_HARNESS_STDOUT"
grep -Fq "setup.motion_mode=800" "$INIT_HARNESS_STDOUT"
grep -Fq "canon_event=INIT_CANON" "$INIT_HARNESS_STDOUT"
grep -Fq "canon_event=USE_LENGTH_UNITS units=2" "$INIT_HARNESS_STDOUT"
grep -Fq "canon_event=SET_G5X_OFFSET index=1" "$INIT_HARNESS_STDOUT"
grep -Fq "canon_event=SET_G92_OFFSET x=0 y=0 z=0" "$INIT_HARNESS_STDOUT"
grep -Fq "canon_event=SET_XY_ROTATION rotation=0" "$INIT_HARNESS_STDOUT"
grep -Fq "canon_event=SET_FEED_REFERENCE reference=2" "$INIT_HARNESS_STDOUT"
INDEXER_HARNESS_STDOUT="$BUILD_DIR/linuxcnc_indexer_harness.run.stdout.log"
grep -Fq "execute=0" "$INDEXER_HARNESS_STDOUT"
grep -Fq "post_a=90" "$INDEXER_HARNESS_STDOUT"
grep -Fq "canon_event=SET_MOTION_CONTROL_MODE mode=2 tolerance=0" "$INDEXER_HARNESS_STDOUT"
grep -Fq "canon_event=UNLOCK_ROTARY line=1 joint=0" "$INDEXER_HARNESS_STDOUT"
grep -Fq "canon_event=STRAIGHT_TRAVERSE line=1 x=0 y=0 z=0 a=90 b=0 c=0 u=0 v=0 w=0" "$INDEXER_HARNESS_STDOUT"
grep -Fq "canon_event=LOCK_ROTARY line=1 joint=0" "$INDEXER_HARNESS_STDOUT"
grep -Fq "canon_event=SET_MOTION_CONTROL_MODE mode=1 tolerance=0" "$INDEXER_HARNESS_STDOUT"
grep -Fq "canon_event=SET_NAIVECAM_TOLERANCE tolerance=0" "$INDEXER_HARNESS_STDOUT"
grep -Fq "canon_event=UPDATE_TAG line=1" "$INDEXER_HARNESS_STDOUT"
TP_API_STDOUT="$BUILD_DIR/linuxcnc_tp_api_probe.run.stdout.log"
grep -Fq "tp_default_queue_size=32" "$TP_API_STDOUT"
grep -Fq "tp_err_ok=0" "$TP_API_STDOUT"
@@ -438,10 +468,10 @@ check_fixture_output() {
local stdout_file="$3"
local require_mdi="${4:-1}"
grep -Fq "read=0" "$stdout_file"
grep -Fq "parse_line=0" "$stdout_file"
if [[ "$require_mdi" == "1" ]]; then
grep -Fq "read=0" "$stdout_file"
grep -Fq "parse_line=0" "$stdout_file"
local line_count
line_count="$(grep -cv '^[[:space:]]*$' "$fixture")"
local line_number
@@ -484,7 +514,7 @@ for fixture in "$GCODE_FIXTURE_DIR"/*.ngc; do
>"$stdout_file" \
2>"$stderr_file"
require_mdi=1
if [[ "$name" == "oword_subroutine" ]]; then
if [[ "$name" == "oword_subroutine" || "$name" == "percent_file_finish" ]]; then
require_mdi=0
fi
check_fixture_output "$fixture" "$expected" "$stdout_file" "$require_mdi"