按规划继续工作

结论:修正 standalone 工具表 adapter 的工具查找顺序,使 M61 Q2 current-pocket 行为与 upstream rs274 -t -i 对齐,并将 tool_semantics 的 M61 事件纳入原生 side-by-side 基线。
This commit is contained in:
2026-06-08 12:28:43 +08:00
parent 775f0d9c4c
commit 0a98bb5ba0
5 changed files with 23 additions and 27 deletions

View File

@@ -93,10 +93,10 @@ semantic rewrites:
arc geometry, offsets, feed-control, comment/logging, numbered-parameter,
local named-parameter plus `_ini[...]` lookup through `rs274 -i`, probing,
spindle-orient, file-open reset, file-finish, tool-reload, and tool
select/change/length-offset, canned-cycle, state-tag motion, tool-table
setup, and O-word subroutine fixtures; it also covers threading/rigid tap,
NURBS dispatch boundaries, and comparable canonical runtime edge and
program-end cleanup calls. It now also checks the negative fixture set
select/change/length-offset plus M61 current-tool-number update,
canned-cycle, state-tag motion, tool-table setup, and O-word subroutine
fixtures; it also covers threading/rigid tap, NURBS dispatch boundaries, and
comparable canonical runtime edge and program-end cleanup calls. It now also checks the negative fixture set
against upstream `rs274 -g` for expected error text and absent canonical
event constraints.
HAL-backed adapter-heavy fixtures, standalone modal-state assertions, and upstream
@@ -107,9 +107,9 @@ semantic rewrites:
default `G73/G83` peck-clearance values for millimeter units.
- `tool_table_setup` is now in the upstream `rs274` side-by-side baseline using
a dedicated `rs274 -t` tool table and `-i` millimeter-unit INI boundary.
- `tool_semantics` now compares its T/M6/G43/G49 canonical subset with
upstream `rs274 -t -i`; M61 current-pocket host-state behavior remains a
standalone fixture expectation.
- `tool_semantics` now compares T/M6/G43/G49 plus M61
`CHANGE_TOOL_NUMBER` and current-pocket readback with upstream
`rs274 -t -i`.
- `namedparam_ini_semantics` now compares local named-parameter behavior and
`_ini[...]` lookup with upstream `rs274 -i`; the broader
`namedparam_semantics` fixture still keeps `_hal[...]` lookup on the