按规划持续工作

结论:已纳入 LinuxCNC 五轴 switchkins M428/M429/M430 来源资产,补齐 remap source probe 与 native 验证闭环,未新增自写 CNC 语义。
This commit is contained in:
2026-06-08 15:33:05 +08:00
parent 19687c3268
commit 5df62ad60a
61 changed files with 12160 additions and 4 deletions

View File

@@ -40,6 +40,16 @@ COMMON_INI_FLAGS=(
-I"$VENDOR_DIR/src/emc/ini"
)
REMAP_SOURCE_FLAGS=(
"${COMMON_INI_FLAGS[@]}"
-include "$SHIM_DIR/linuxcnc_remap_compile_compat.hh"
)
VENDOR_ASSET_FLAGS=(
"${COMMON_INI_FLAGS[@]}"
-DLINUXCNC_VENDOR_DIR=\"$VENDOR_DIR\"
)
MINIMAL_FLAGS=(
"${COMMON_INI_FLAGS[@]}"
-ffunction-sections
@@ -338,6 +348,11 @@ INI_PROBE_SOURCES=(
"$WRAP_DIR/linuxcnc_ini_probe.cpp"
)
FIVEAXIS_REMAP_ASSET_PROBE_SOURCES=(
"$VENDOR_DIR/src/emc/ini/inifile.cc"
"$WRAP_DIR/linuxcnc_5axis_remap_asset_probe.cpp"
)
STATE_PROBE_SOURCES=(
"$WRAP_DIR/linuxcnc_interp_state_probe.cpp"
)
@@ -654,6 +669,29 @@ build_binary_target \
NO_LINK_FLAGS \
-lfmt
build_binary_target \
linuxcnc_5axis_remap_asset_probe \
"$BUILD_DIR/linuxcnc_5axis_remap_asset_probe" \
VENDOR_ASSET_FLAGS \
FIVEAXIS_REMAP_ASSET_PROBE_SOURCES \
NO_LINK_FLAGS \
-lfmt
if [[ "$(tr -d '[:space:]' < "$BUILD_DIR/linuxcnc_5axis_remap_asset_probe.exitcode")" == "0" ]]; then
set +e
"$BUILD_DIR/linuxcnc_5axis_remap_asset_probe" \
>"$BUILD_DIR/linuxcnc_5axis_remap_asset_probe.run.stdout.log" \
2>"$BUILD_DIR/linuxcnc_5axis_remap_asset_probe.run.stderr.log"
FIVEAXIS_REMAP_ASSET_RUN_RC=$?
set -e
echo "$FIVEAXIS_REMAP_ASSET_RUN_RC" > "$BUILD_DIR/linuxcnc_5axis_remap_asset_probe.run.exitcode"
else
rm -f \
"$BUILD_DIR/linuxcnc_5axis_remap_asset_probe.run.exitcode" \
"$BUILD_DIR/linuxcnc_5axis_remap_asset_probe.run.stdout.log" \
"$BUILD_DIR/linuxcnc_5axis_remap_asset_probe.run.stderr.log"
fi
build_object_target \
linuxcnc_inifile_source_probe \
"$BUILD_DIR/linuxcnc_inifile_source_probe.o" \
@@ -1454,6 +1492,12 @@ build_object_target \
"$VENDOR_DIR/src/emc/rs274ngc/interp_o_word.cc" \
COMMON_INI_FLAGS
build_object_target \
linuxcnc_interp_remap_source_probe \
"$BUILD_DIR/linuxcnc_interp_remap_source_probe.o" \
"$VENDOR_DIR/src/emc/rs274ngc/interp_remap.cc" \
REMAP_SOURCE_FLAGS
build_object_target \
linuxcnc_rs274ngc_pre_source_probe \
"$BUILD_DIR/linuxcnc_rs274ngc_pre_source_probe.o" \

View File

@@ -146,6 +146,56 @@ src/emc/rs274ngc/interp_execute.cc
src/emc/rs274ngc/interp_find.cc
src/emc/rs274ngc/interp_inverse.cc
src/emc/rs274ngc/interp_o_word.cc
src/emc/rs274ngc/interp_remap.cc
src/emc/rs274ngc/interp_convert.cc
src/emc/rs274ngc/interp_cycles.cc
src/emc/rs274ngc/interp_g7x.cc
configs/sim/axis/vismach/5axis/bridgemill/5axis.ini
configs/sim/axis/vismach/5axis/bridgemill/5axis.tbl
configs/sim/axis/vismach/5axis/bridgemill/5axis.xml
configs/sim/axis/vismach/5axis/bridgemill/5axis_postgui.hal
configs/sim/axis/vismach/5axis/bridgemill/5axisgui.hal
configs/sim/axis/vismach/5axis/bridgemill/5axisgui.ngc
configs/sim/axis/vismach/5axis/bridgemill/README
configs/sim/axis/vismach/5axis/bridgemill/remap_subs/428remap.ngc
configs/sim/axis/vismach/5axis/bridgemill/remap_subs/429remap.ngc
configs/sim/axis/vismach/5axis/bridgemill/remap_subs/430remap.ngc
configs/sim/axis/vismach/5axis/table-dual-rotary/README
configs/sim/axis/vismach/5axis/table-dual-rotary/demos/xyzab-tdr-demo.ngc
configs/sim/axis/vismach/5axis/table-dual-rotary/remap_subs/428remap.ngc
configs/sim/axis/vismach/5axis/table-dual-rotary/remap_subs/429remap.ngc
configs/sim/axis/vismach/5axis/table-dual-rotary/xyzab-tdr-postgui.hal
configs/sim/axis/vismach/5axis/table-dual-rotary/xyzab-tdr.ini
configs/sim/axis/vismach/5axis/table-dual-rotary/xyzab-tdr.tbl
configs/sim/axis/vismach/5axis/table-dual-rotary/xyzab-tdr.var
configs/sim/axis/vismach/5axis/table-dual-rotary/xyzab-tdr.var.bak
configs/sim/axis/vismach/5axis/table-dual-rotary/xyzab-tdr.xml
configs/sim/axis/vismach/5axis/table-dual-rotary/xyzab-tdr_cmds.hal
configs/sim/axis/vismach/5axis/table-rotary-tilting/README
configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/boat-xyzac.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/boat-xyzbc.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/impeller-7bl-xyzac.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/xyzac_switchkins.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/xyzac_switchkins_test_1.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/xyzac_switchkins_test_2.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/xyzac_switchkins_test_3.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/xyzbc_switchkins.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/remap_subs/428remap.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/remap_subs/429remap.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/remap_subs/430remap.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/remap_subs/centering.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/remap_subs/helix_ac.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/remap_subs/helix_bc.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/remap_subs/xyzac_switchkins_sub.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/remap_subs/xyzbc_switchkins_sub.ngc
configs/sim/axis/vismach/5axis/table-rotary-tilting/switchkins.halshow
configs/sim/axis/vismach/5axis/table-rotary-tilting/switchkins_postgui.hal
configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzac-trt.ini
configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzac-trt.tbl
configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzac-trt.txt
configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzac-trt.xml
configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzac-trt_cmds.hal
configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzbc-trt.ini
configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzbc-trt.tbl
configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzbc-trt.txt
configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzbc-trt.xml