meswork/wasm-simulator
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

第2组：补充AXIS trivkins XZ源清单

Browse Source
This commit is contained in:
cnc
2026-06-01 23:14:16 +08:00
parent 110c3ba76e
commit 04b3bc3a47
3 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
check-linuxcnc-inputs.sh
View File

@@ -733,6 +733,26 @@ if [[ -n "$manifest" && "$require_complete" == "--require-kinematics-complete" ]
exit 1
fi
required_axis_ja_xz_trivkins_asset_sources=(
configs/sim/axis/ja_tests/xz/xz.ini
configs/sim/axis/ja_tests/xz/xz_both.ini
configs/sim/axis/ja_tests/xz/xz_both_auto.ini
configs/sim/axis/ja_tests/xz/xzbase.inc
configs/sim/axis/ja_tests/xz/xz.tbl
configs/sim/axis/ja_tests/xz/README
)
missing_axis_ja_xz_trivkins_asset_sources=()
for source in "${required_axis_ja_xz_trivkins_asset_sources[@]}"; do
if ! printf '%s\n' "${manifest_asset_sources[@]}" | grep -Fx -- "$source" >/dev/null; then
missing_axis_ja_xz_trivkins_asset_sources+=("$source")
fi
done
if ((${#missing_axis_ja_xz_trivkins_asset_sources[@]} > 0)); then
echo "manifest does not cover LinuxCNC AXIS joint-axis trivkins XZ INI/include/tool/demo sources as asset sources: $manifest" >&2
printf 'missing AXIS joint-axis trivkins asset source: %s\n' "${missing_axis_ja_xz_trivkins_asset_sources[@]}" >&2
exit 1
fi
required_scorbot_asset_sources=(
configs/by_machine/scorbot-er-3/scorbot-er-3.ini
configs/by_machine/scorbot-er-3/scorbot-er-3.hal

6
linuxcnc-kinematics-source-files.txt
View File

@@ -74,6 +74,12 @@ asset:configs/sim/tklinuxcnc/trivkins/xz_both.ini:TkLinuxCNC trivkins XZ KINEMAT
asset:configs/sim/tklinuxcnc/trivkins/xzbase.inc:TkLinuxCNC trivkins XZ shared INI include
asset:configs/sim/tklinuxcnc/trivkins/xz.tbl:TkLinuxCNC trivkins XZ tool table source referenced by shared include
asset:configs/sim/tklinuxcnc/trivkins/README:TkLinuxCNC trivkins example notes adjacent to XZ coverage
asset:configs/sim/axis/ja_tests/xz/xz.ini:AXIS joint-axis trivkins XZ KINEMATICS_IDENTITY source
asset:configs/sim/axis/ja_tests/xz/xz_both.ini:AXIS joint-axis trivkins XZ KINEMATICS_BOTH source
asset:configs/sim/axis/ja_tests/xz/xz_both_auto.ini:AXIS joint-axis trivkins XZ KINEMATICS_BOTH auto teleop source
asset:configs/sim/axis/ja_tests/xz/xzbase.inc:AXIS joint-axis trivkins XZ shared INI include
asset:configs/sim/axis/ja_tests/xz/xz.tbl:AXIS joint-axis trivkins XZ tool table source referenced by shared include
asset:configs/sim/axis/ja_tests/xz/README:AXIS joint-axis trivkins example notes adjacent to XZ coverage
asset:configs/by_machine/scorbot-er-3/scorbot-er-3.ini:Scorbot ER-3 KINEMATICS source for LinuxCNC scorbot-kins coverage
asset:configs/by_machine/scorbot-er-3/scorbot-er-3.hal:Scorbot ER-3 HALFILE source loading scorbot-kins and user component
asset:configs/by_machine/scorbot-er-3/pyvcp.hal:Scorbot ER-3 POSTGUI_HALFILE source wiring gripper PYVCP output

12
test-native.sh
View File

@@ -228,6 +228,16 @@ grep -Fx "configs/sim/tklinuxcnc/trivkins/README" "$kinematics_manifest_sources"
grep -Fx "KINEMATICS = trivkins coordinates=xz" "../linuxcnc/configs/sim/tklinuxcnc/trivkins/xz.ini" >/dev/null
grep -Fx "KINEMATICS = trivkins coordinates=xz kinstype=BOTH" "../linuxcnc/configs/sim/tklinuxcnc/trivkins/xz_both.ini" >/dev/null
grep -F 'manifest does not cover LinuxCNC TkLinuxCNC trivkins XZ INI/include/tool/demo sources as asset sources' check-linuxcnc-inputs.sh >/dev/null
grep -Fx "configs/sim/axis/ja_tests/xz/xz.ini" "$kinematics_manifest_sources" >/dev/null
grep -Fx "configs/sim/axis/ja_tests/xz/xz_both.ini" "$kinematics_manifest_sources" >/dev/null
grep -Fx "configs/sim/axis/ja_tests/xz/xz_both_auto.ini" "$kinematics_manifest_sources" >/dev/null
grep -Fx "configs/sim/axis/ja_tests/xz/xzbase.inc" "$kinematics_manifest_sources" >/dev/null
grep -Fx "configs/sim/axis/ja_tests/xz/xz.tbl" "$kinematics_manifest_sources" >/dev/null
grep -Fx "configs/sim/axis/ja_tests/xz/README" "$kinematics_manifest_sources" >/dev/null
grep -Fx "KINEMATICS = trivkins coordinates=xz" "../linuxcnc/configs/sim/axis/ja_tests/xz/xz.ini" >/dev/null
grep -Fx "KINEMATICS = trivkins coordinates=xz kinstype=BOTH" "../linuxcnc/configs/sim/axis/ja_tests/xz/xz_both.ini" >/dev/null
grep -Fx "MACHINE = trivkins XZ KINEMATICS_BOTH,AUTO TELEOP" "../linuxcnc/configs/sim/axis/ja_tests/xz/xz_both_auto.ini" >/dev/null
grep -F 'manifest does not cover LinuxCNC AXIS joint-axis trivkins XZ INI/include/tool/demo sources as asset sources' check-linuxcnc-inputs.sh >/dev/null
grep -Fx "configs/by_machine/scorbot-er-3/scorbot-er-3.ini" "$kinematics_manifest_sources" >/dev/null
grep -Fx "configs/by_machine/scorbot-er-3/scorbot-er-3.hal" "$kinematics_manifest_sources" >/dev/null
grep -Fx "configs/by_machine/scorbot-er-3/pyvcp.hal" "$kinematics_manifest_sources" >/dev/null
@@ -341,7 +351,7 @@ grep -Fx "configs/sim/axis/vismach/melfa-sim/README" "$kinematics_manifest_sourc
grep -Fx "configs/sim/axis/vismach/millturn/README" "$kinematics_manifest_sources" >/dev/null
grep -Fx "configs/sim/axis/vismach/puma/README" "$kinematics_manifest_sources" >/dev/null
grep -Fx "configs/sim/axis/vismach/scara/README" "$kinematics_manifest_sources" >/dev/null
if [[ "$(grep -Ec '/README$' "$kinematics_manifest_sources")" -ne 15 ]]; then
if [[ "$(grep -Ec '/README$' "$kinematics_manifest_sources")" -ne 16 ]]; then
echo "expected kinematics manifest to cover all tracked LinuxCNC README sources adjacent to kinematics INI files" >&2
exit 1
fi