From 110c3ba76e1509de755a93b3ebfba2ac1f7039e7 Mon Sep 17 00:00:00 2001 From: cnc Date: Mon, 1 Jun 2026 23:09:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC2=E7=BB=84=EF=BC=9A=E8=A1=A5=E5=85=85S?= =?UTF-8?q?corbot=E8=BF=90=E5=8A=A8=E5=AD=A6=E6=BA=90=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- check-linuxcnc-inputs.sh | 35 ++++++++++++++++++++++++++++ linuxcnc-kinematics-source-files.txt | 7 ++++++ test-native.sh | 11 +++++++++ 3 files changed, 53 insertions(+) diff --git a/check-linuxcnc-inputs.sh b/check-linuxcnc-inputs.sh index 3f8be3f..2390835 100755 --- a/check-linuxcnc-inputs.sh +++ b/check-linuxcnc-inputs.sh @@ -733,6 +733,41 @@ if [[ -n "$manifest" && "$require_complete" == "--require-kinematics-complete" ] 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 diff --git a/linuxcnc-kinematics-source-files.txt b/linuxcnc-kinematics-source-files.txt index f37314f..0e0d536 100644 --- a/linuxcnc-kinematics-source-files.txt +++ b/linuxcnc-kinematics-source-files.txt @@ -74,6 +74,11 @@ 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/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 @@ -242,6 +247,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 diff --git a/test-native.sh b/test-native.sh index 9d2b89a..c2de778 100755 --- a/test-native.sh +++ b/test-native.sh @@ -228,6 +228,17 @@ 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/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