按规划持续工作

结论:新增 5axis native remap 执行验证,使用 vendored LinuxCNC REMAP/NGC 路径执行 xyzac-trt 与 xyzbc-trt 的 M429 -> M428 -> M430 -> M429,并确认 _hal[motion.switchkins-type] 随 LinuxCNC M68/M66 流程正确读回。
This commit is contained in:
2026-06-08 17:30:23 +08:00
parent 42da16214d
commit 7cccc58acb
4 changed files with 242 additions and 1 deletions

View File

@@ -667,7 +667,7 @@ INDEXER_HARNESS_SOURCES=(
"$WRAP_DIR/linuxcnc_indexer_harness.cpp"
)
REMAP_PARSE_SOURCES=(
REMAP_RUNTIME_CORE_SOURCES=(
"$VENDOR_DIR/src/emc/rs274ngc/modal_state.cc"
"$VENDOR_DIR/src/emc/rs274ngc/interp_array.cc"
"$VENDOR_DIR/src/emc/rs274ngc/interp_internal.cc"
@@ -694,6 +694,10 @@ REMAP_PARSE_SOURCES=(
"$WRAP_DIR/linuxcnc_tool_adapter.cpp"
"$WRAP_DIR/linuxcnc_interp_minimal_runtime.cpp"
"$VENDOR_DIR/src/emc/ini/inifile.cc"
)
REMAP_PARSE_SOURCES=(
"${REMAP_RUNTIME_CORE_SOURCES[@]}"
"$WRAP_DIR/linuxcnc_remap_parse_harness.cpp"
)
@@ -702,6 +706,11 @@ REMAP_HAL_SYNC_SOURCES=(
"$WRAP_DIR/linuxcnc_remap_hal_sync_harness.cpp"
)
FIVEAXIS_REMAP_EXECUTE_SOURCES=(
"${REMAP_RUNTIME_CORE_SOURCES[@]}"
"$WRAP_DIR/linuxcnc_5axis_remap_execute_harness.cpp"
)
build_binary_target \
linuxcnc_ini_probe \
"$BUILD_DIR/linuxcnc_ini_probe" \
@@ -1309,6 +1318,28 @@ else
"$BUILD_DIR/linuxcnc_remap_hal_sync_harness.run.stderr.log"
fi
build_binary_target \
linuxcnc_5axis_remap_execute_harness \
"$BUILD_DIR/linuxcnc_5axis_remap_execute_harness" \
REMAP_RUNTIME_FLAGS \
FIVEAXIS_REMAP_EXECUTE_SOURCES \
MINIMAL_LINK_FLAGS
if [[ "$(tr -d '[:space:]' < "$BUILD_DIR/linuxcnc_5axis_remap_execute_harness.exitcode")" == "0" ]]; then
set +e
"$BUILD_DIR/linuxcnc_5axis_remap_execute_harness" \
>"$BUILD_DIR/linuxcnc_5axis_remap_execute_harness.run.stdout.log" \
2>"$BUILD_DIR/linuxcnc_5axis_remap_execute_harness.run.stderr.log"
FIVEAXIS_REMAP_EXECUTE_RUN_RC=$?
set -e
echo "$FIVEAXIS_REMAP_EXECUTE_RUN_RC" > "$BUILD_DIR/linuxcnc_5axis_remap_execute_harness.run.exitcode"
else
rm -f \
"$BUILD_DIR/linuxcnc_5axis_remap_execute_harness.run.exitcode" \
"$BUILD_DIR/linuxcnc_5axis_remap_execute_harness.run.stdout.log" \
"$BUILD_DIR/linuxcnc_5axis_remap_execute_harness.run.stderr.log"
fi
build_binary_target \
linuxcnc_indexer_harness \
"$BUILD_DIR/linuxcnc_indexer_harness" \