第2组：补充AXIS XYZB锁定分度源清单

check-linuxcnc-inputs.sh

@@ -714,6 +714,99 @@ if [[ -n "$manifest" && "$require_complete" == "--require-kinematics-complete" ]
         exit 1
     fi
 
+    required_tklinuxcnc_trivkins_asset_sources=(
+        configs/sim/tklinuxcnc/trivkins/xz.ini
+        configs/sim/tklinuxcnc/trivkins/xz_both.ini
+        configs/sim/tklinuxcnc/trivkins/xzbase.inc
+        configs/sim/tklinuxcnc/trivkins/xz.tbl
+        configs/sim/tklinuxcnc/trivkins/README
+    )
+    missing_tklinuxcnc_trivkins_asset_sources=()
+    for source in "${required_tklinuxcnc_trivkins_asset_sources[@]}"; do
+        if ! printf '%s\n' "${manifest_asset_sources[@]}" | grep -Fx -- "$source" >/dev/null; then
+            missing_tklinuxcnc_trivkins_asset_sources+=("$source")
+        fi
+    done
+    if ((${#missing_tklinuxcnc_trivkins_asset_sources[@]} > 0)); then
+        echo "manifest does not cover LinuxCNC TkLinuxCNC trivkins XZ INI/include/tool/demo sources as asset sources: $manifest" >&2
+        printf 'missing TkLinuxCNC trivkins asset source: %s\n' "${missing_tklinuxcnc_trivkins_asset_sources[@]}" >&2
+        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_axis_ja_xyzb_locking_indexer_asset_sources=(
+        configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.ini
+        configs/sim/axis/ja_tests/xyzb_locking_indexer/xyyzb.ini
+        configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.hal
+        configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.halshow
+        configs/sim/axis/ja_tests/xyzb_locking_indexer/README
+    )
+    missing_axis_ja_xyzb_locking_indexer_asset_sources=()
+    for source in "${required_axis_ja_xyzb_locking_indexer_asset_sources[@]}"; do
+        if ! printf '%s\n' "${manifest_asset_sources[@]}" | grep -Fx -- "$source" >/dev/null; then
+            missing_axis_ja_xyzb_locking_indexer_asset_sources+=("$source")
+        fi
+    done
+    if ((${#missing_axis_ja_xyzb_locking_indexer_asset_sources[@]} > 0)); then
+        echo "manifest does not cover LinuxCNC AXIS joint-axis trivkins XYZB locking indexer INI/HAL/demo sources as asset sources: $manifest" >&2
+        printf 'missing AXIS joint-axis XYZB locking indexer asset source: %s\n' "${missing_axis_ja_xyzb_locking_indexer_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
+        configs/by_machine/scorbot-er-3/pyvcp.hal
+        configs/by_machine/scorbot-er-3/gripper.xml
+        src/hal/user_comps/scorbot-er-3.py
+    )
+    missing_scorbot_asset_sources=()
+    for source in "${required_scorbot_asset_sources[@]}"; do
+        if ! printf '%s\n' "${manifest_asset_sources[@]}" | grep -Fx -- "$source" >/dev/null; then
+            missing_scorbot_asset_sources+=("$source")
+        fi
+    done
+    if ((${#missing_scorbot_asset_sources[@]} > 0)); then
+        echo "manifest does not cover LinuxCNC Scorbot ER-3 kinematics INI/HAL/PYVCP/user component sources as asset sources: $manifest" >&2
+        printf 'missing Scorbot ER-3 asset source: %s\n' "${missing_scorbot_asset_sources[@]}" >&2
+        exit 1
+    fi
+
+    required_scorbot_metadata_sources=(
+        src/hal/user_comps/Submakefile
+        docs/src/man/man1/scorbot-er-3.1.adoc
+    )
+    missing_scorbot_metadata_sources=()
+    for source in "${required_scorbot_metadata_sources[@]}"; do
+        if ! printf '%s\n' "${manifest_metadata_sources[@]}" | grep -Fx -- "$source" >/dev/null; then
+            missing_scorbot_metadata_sources+=("$source")
+        fi
+    done
+    if ((${#missing_scorbot_metadata_sources[@]} > 0)); then
+        echo "manifest does not cover LinuxCNC Scorbot ER-3 user component metadata sources: $manifest" >&2
+        printf 'missing Scorbot ER-3 metadata source: %s\n' "${missing_scorbot_metadata_sources[@]}" >&2
+        exit 1
+    fi
+
     required_gantry_asset_sources=(
         configs/sim/axis/gantry/gantry_mm.ini
         configs/sim/axis/gantry/gantry_mm.hal

linuxcnc-kinematics-source-files.txt

@@ -69,6 +69,27 @@ asset:configs/sim/axis/rose_engine/README:rose engine configuration source notes
 asset:configs/sim/tklinuxcnc/tripod.ini:TkLinuxCNC tripod KINEMATICS source for LinuxCNC tripodkins coverage
 asset:lib/hallib/tripodsim.hal:tripod HALFILE source wiring tripodkins geometry pins
 asset:configs/sim/tklinuxcnc/README:TkLinuxCNC configuration notes referencing tripod.ini
+asset:configs/sim/tklinuxcnc/trivkins/xz.ini:TkLinuxCNC trivkins XZ KINEMATICS_IDENTITY source
+asset:configs/sim/tklinuxcnc/trivkins/xz_both.ini:TkLinuxCNC trivkins XZ KINEMATICS_BOTH source
+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/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.ini:AXIS joint-axis trivkins omitted A-axis locking indexer source
+asset:configs/sim/axis/ja_tests/xyzb_locking_indexer/xyyzb.ini:AXIS joint-axis trivkins duplicated Y-axis KINEMATICS_BOTH locking indexer source
+asset:configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.hal:AXIS joint-axis trivkins XYZB wheel jog HAL source adjacent to locking indexer coverage
+asset:configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.halshow:AXIS joint-axis trivkins locking indexer halshow watchlist source
+asset:configs/sim/axis/ja_tests/xyzb_locking_indexer/README:AXIS joint-axis trivkins locking indexer notes adjacent to XYZB 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
+asset:configs/by_machine/scorbot-er-3/gripper.xml:Scorbot ER-3 PYVCP asset referenced by scorbot-er-3 INI
+asset:src/hal/user_comps/scorbot-er-3.py:Scorbot ER-3 userspace HAL component source referenced by HAL loadusr
 asset:configs/sim/axis/gantry/gantry_mm.ini:AXIS gantry metric KINEMATICS source using LinuxCNC trivkins BOTH coverage
 asset:configs/sim/axis/gantry/gantry_mm.hal:AXIS gantry metric HALFILE source wiring four gantry joints
 asset:configs/sim/axis/gantry/gantry_mm.tbl:AXIS gantry metric tool table source referenced by gantry_mm INI
@@ -237,6 +258,8 @@ metadata:src/emc/kinematics/Submakefile:LinuxCNC kinematics make build metadata
 metadata:src/emc/kinematics/meson.build:LinuxCNC kinematics meson build metadata
 metadata:src/libnml/posemath/Submakefile:LinuxCNC posemath make build metadata used by kinematics pose math coverage
 metadata:src/libnml/posemath/meson.build:LinuxCNC posemath meson build metadata used by kinematics pose math coverage
+metadata:src/hal/user_comps/Submakefile:LinuxCNC user component build metadata for Scorbot loadusr source
+metadata:docs/src/man/man1/scorbot-er-3.1.adoc:LinuxCNC Scorbot ER-3 user component manpage source
 metadata:src/hal/user_comps/vismach/Submakefile:LinuxCNC vismach user component build metadata for loadusr GUI sources
 metadata:docs/src/man/man1/5axisgui.1.adoc:LinuxCNC bridgemill vismach GUI command documentation source
 metadata:docs/src/man/man1/hexagui.1.adoc:LinuxCNC hexapod vismach GUI command documentation source

test-native.sh

@@ -220,6 +220,44 @@ grep -Fx "configs/sim/tklinuxcnc/README" "$kinematics_manifest_sources" >/dev/nu
 grep -Fx "docs/man/man9/tripodkins.9" "$kinematics_manifest_sources" >/dev/null
 grep -F 'manifest does not cover LinuxCNC tripod kinematics INI/HAL sources as asset sources' check-linuxcnc-inputs.sh >/dev/null
 grep -F 'manifest does not cover LinuxCNC tripodkins manpage source' check-linuxcnc-inputs.sh >/dev/null
+grep -Fx "configs/sim/tklinuxcnc/trivkins/xz.ini" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "configs/sim/tklinuxcnc/trivkins/xz_both.ini" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "configs/sim/tklinuxcnc/trivkins/xzbase.inc" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "configs/sim/tklinuxcnc/trivkins/xz.tbl" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "configs/sim/tklinuxcnc/trivkins/README" "$kinematics_manifest_sources" >/dev/null
+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/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.ini" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "configs/sim/axis/ja_tests/xyzb_locking_indexer/xyyzb.ini" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.hal" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.halshow" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "configs/sim/axis/ja_tests/xyzb_locking_indexer/README" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "KINEMATICS = trivkins coordinates=xyzb" "../linuxcnc/configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.ini" >/dev/null
+grep -Fx "KINEMATICS = trivkins coordinates=xyyzb kinstype=both" "../linuxcnc/configs/sim/axis/ja_tests/xyzb_locking_indexer/xyyzb.ini" >/dev/null
+grep -Fx "MACHINE = XYYZB trivkins coordinates=xyyzb KINEMATICS_BOTH" "../linuxcnc/configs/sim/axis/ja_tests/xyzb_locking_indexer/xyyzb.ini" >/dev/null
+grep -F 'manifest does not cover LinuxCNC AXIS joint-axis trivkins XYZB locking indexer INI/HAL/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
+grep -Fx "configs/by_machine/scorbot-er-3/gripper.xml" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "src/hal/user_comps/scorbot-er-3.py" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "src/hal/user_comps/Submakefile" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "docs/src/man/man1/scorbot-er-3.1.adoc" "$kinematics_manifest_sources" >/dev/null
+grep -Fx "KINEMATICS =  scorbot-kins" "../linuxcnc/configs/by_machine/scorbot-er-3/scorbot-er-3.ini" >/dev/null
+grep -Fx "loadusr -W scorbot-er-3" "../linuxcnc/configs/by_machine/scorbot-er-3/scorbot-er-3.hal" >/dev/null
+grep -F 'manifest does not cover LinuxCNC Scorbot ER-3 kinematics INI/HAL/PYVCP/user component sources as asset sources' check-linuxcnc-inputs.sh >/dev/null
+grep -F 'manifest does not cover LinuxCNC Scorbot ER-3 user component metadata sources' check-linuxcnc-inputs.sh >/dev/null
 grep -Fx "configs/sim/axis/gantry/gantry_mm.ini" "$kinematics_manifest_sources" >/dev/null
 grep -Fx "configs/sim/axis/gantry/gantry_mm.hal" "$kinematics_manifest_sources" >/dev/null
 grep -Fx "configs/sim/axis/gantry/gantry_mm.tbl" "$kinematics_manifest_sources" >/dev/null
@@ -310,7 +348,7 @@ grep -Fx "configs/sim/axis/vismach/melfa-sim/melfa.tbl" "$kinematics_manifest_so
 grep -Fx "configs/sim/axis/vismach/millturn/millturn.tbl" "$kinematics_manifest_sources" >/dev/null
 grep -Fx "configs/sim/axis/vismach/puma/puma.tbl" "$kinematics_manifest_sources" >/dev/null
 grep -Fx "configs/sim/qtaxis/non-trivial/scara/scara.tbl" "$kinematics_manifest_sources" >/dev/null
-if [[ "$(grep -Ec '\.tbl$' "$kinematics_manifest_sources")" -ne 11 ]]; then
+if [[ "$(./list-linuxcnc-kinematics-manifest-sources.sh linuxcnc-kinematics-source-files.txt tooldata | grep -Ec '\.tbl$')" -ne 10 ]]; then
     echo "expected kinematics manifest to cover all resolvable LinuxCNC TOOL_TABLE switchkins sources" >&2
     exit 1
 fi
@@ -322,7 +360,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 14 ]]; then
+if [[ "$(grep -Ec '/README$' "$kinematics_manifest_sources")" -ne 17 ]]; then
     echo "expected kinematics manifest to cover all tracked LinuxCNC README sources adjacent to kinematics INI files" >&2
     exit 1
 fi