f5ed44a987
## 为什么
"设备 ID 全部可配置"这条要求在代码里只做了一半:site.yaml 能配,
但**代码和静态配置里到处躺着 Rizon4-063989 当兜底**。这类兜底的危害
不是"改起来麻烦",而是它把"配置没生效"伪装成"配置生效了":
* `robot_sn` 默认 `Rizon4-063989` → 换臂后节点去订**上一台臂**的关节话题,
节点起来了、不报错、什么都不动;
* launch 里用 `ee_frame == "Rizon4-063989_flange"` 当"用户没指定"的哨兵 →
换个站点这个判断永远不成立,于是 site.yaml 里的 ee_frame 再也不会被用上,
静态 TF 挂错坐标系、点还照样查得到;
* `if SN == "Rizon4-063989"` 决定要不要拉触觉服务 → 换臂后触觉静默消失。
## 改了什么
1. **删掉所有"兜底成某台臂"的默认值**(15 处脚本 + 6 个 launch + 6 个节点)。
没配就为空 / 直接 `:?` 报错,宁可起不来也不要连错机器:
- `scripts/lib/export_site_env.py`:别名解析改为从 `robots[]` 现算
(`arm_short_id` / `resolve_robot_sn` / `describe_arms`),选不出臂时
抛 `ValueError`;`main()` 捕获后打人话 + 退出码 2(供 shell `eval`);
- 手眼文件/路点/工作目录由当前臂 short id 派生,不再写死 `89_*`;
- `ROBOT_HAS_TACTILE` 改为读 site.yaml 的 `robots[].tactile`;
- `arm_application/site_io.py` 新增 `joint_prefix_default()` /
`base_frame_default()` / `ee_frame_default()`:优先读 `SITE_*`,
退而由 `SITE_ROBOT_SN` 现算,**不写死 SN**;
- `arm.urdf.xacro` 的 `robot_sn` 默认值改成明显的占位符 `UNSET_ARM_SN`
(关节名会带出来,报错信息自解释);
- `ros2_control.launch.py` / `move_group.launch.py` **原先根本不传
robot_sn**,靠 xacro 写死默认值"蒙对"本机,现在都从环境取。
2. **新增 `scripts/check_arm_prefixes.py`**:Flexiv 把 SN 编进关节名,
所以有一批一级配置(SRDF/controllers/joint_names/bringup/servo/...)
必须跟着当前臂走。漏改的症状是"MoveIt 规划成功但机械臂不动",很难查。
这个脚本逐文件逐行列出对不上的地方,并直接给出修法。
`--list` 还会说明 SN 来自 site.yaml 还是被 `ROBOT_SN` 覆盖。
3. **文档**:`FRAMEWORK_RULES.md` 新增 R1.1.1(两类含臂名文件怎么分、
换臂四步)+ 检查清单第 12 条 + 反例 2 条;`HANDBOOK.md` 新增 3.6.1
与症状表 2 行。
4. **顺带修掉的真 bug**(都是这次改动带出来、被 pyflakes + 真跑抓住的):
- `convert_flexiv_traj.py` / `rdk_drag_bridge.py` 用了 `os` 但没 import
→ `--help` 直接 NameError;
- `check_arm_prefixes.py` 第一版正则用 `\b` 收尾,而关节名是
`Rizon4-063989_joint1`(`_` 属于 \w,`\b` 不成立)→ SRDF 里 24 处
硬编码**一处都没报**,还打印 OK。已加负向测试钉住;
- 删掉若干死代码/死 import(`pos_line`/`flat`/`names`、`IfCondition` 等)。
## 验收(都真跑过)
- `python3 -m pyflakes <全部改过的 py>` → 干净
- 逐包 pytest:233 + 69 + 78 + 24 + 236 = **640 passed**
- `env -u ROBOT_SN python3 scripts/check_arm_prefixes.py` → OK(8 文件)
- 换成 SN=Rizon4-777001 的临时 site.yaml → 报出**8 个**文件不一致并给修法(退出码 1)
- 故意不给 SITE_* → 各 launch 的 `robot_sn` / `ee_frame` / `handeye_file`
默认值为 `''`,不再悄悄指向上一台臂
- `ros2 launch ... --show-args` 对 stack/sim/ros2_control/mock_control/
move_group/display/visual_servo **全部通过**
- `convert_flexiv_traj.py --help` 正常;拿 `xunhuan.traj` 真转 5 个路点,
输出 `joint_prefix: "Rizon4-063989_"` 来自 site.yaml
Co-authored-by: Cursor <cursoragent@cursor.com>
132 lines
4.5 KiB
Bash
Executable File
132 lines
4.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
||
# 工控机上的 DH 夹爪(Modbus RTU)。不是 Flexiv Studio / RDK 那一套。
|
||
#
|
||
# 左臂 89 PGEA 平行夹爪 /dev/ttyUSB0
|
||
# 右臂 91 RGI 旋转夹爪 /dev/ttyUSB1
|
||
#
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 89 --cli probe
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 89 --cli init
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 89 --cli open
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 89 --cli close
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 89 --cli pos 500
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 91 --cli open
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 91 --cli close
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 91 --cli rotate 90
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 91 --cli revolutions 2
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 89 # ROS 节点 PGEA
|
||
# bash ~/ros2/scripts/run_gripper.sh --arm 91 # ROS 节点 RGI
|
||
# bash ~/ros2/scripts/run_dual_gripper.sh # 两个 ROS 节点都起
|
||
|
||
set -eo pipefail
|
||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||
CLI=()
|
||
DUAL=0
|
||
|
||
# shellcheck disable=SC1091
|
||
source "${ROOT}/scripts/lib/parse_arm_args.sh"
|
||
parse_arm_args "$@"
|
||
set -- "${PARSE_ARM_REST[@]}"
|
||
|
||
while [[ $# -gt 0 ]]; do
|
||
case "$1" in
|
||
--cli) shift; CLI=("$@"); break ;;
|
||
--dual) DUAL=1; shift ;;
|
||
-h|--help) sed -n '2,24p' "$0"; exit 0 ;;
|
||
*) echo "Unknown: $1" >&2; exit 1 ;;
|
||
esac
|
||
done
|
||
|
||
# shellcheck disable=SC1091
|
||
source "${ROOT}/scripts/lib/load_site_config.sh"
|
||
|
||
BACKEND="${SITE_GRIP_BACKEND:-usb}"
|
||
MODEL="${SITE_GRIP_MODEL:-PGEA-100-20-W}"
|
||
ARM="${SITE_ROBOT_ARM:-}"
|
||
IS_ROTARY=0
|
||
if [[ "${MODEL}" == *RGI* || "${ARM}" == "right" ]]; then
|
||
IS_ROTARY=1
|
||
fi
|
||
|
||
if [[ "${BACKEND}" == "rdk" || "${BACKEND}" == "flexiv" ]]; then
|
||
echo "ERROR: gripper.backend=${BACKEND} is Flexiv Studio. Use usb (IPC Modbus)." >&2
|
||
exit 1
|
||
fi
|
||
|
||
# shellcheck disable=SC1091
|
||
source "${ROOT}/scripts/env.sh"
|
||
|
||
if [[ ${#CLI[@]} -gt 0 ]]; then
|
||
if [[ "${IS_ROTARY}" -eq 1 ]]; then
|
||
CMD="${CLI[0]}"
|
||
REST=("${CLI[@]:1}")
|
||
ARGS=(--arm right --test "${CMD}")
|
||
case "${CMD}" in
|
||
probe|status) ARGS=(--arm right --test probe) ;;
|
||
pos|move)
|
||
ARGS=(--arm right --test pos)
|
||
if [[ -n "${REST[0]:-}" ]]; then ARGS+=(--pos "${REST[0]}"); fi
|
||
;;
|
||
rotate|rotate_to)
|
||
ARGS=(--arm right --test rotate)
|
||
if [[ -n "${REST[0]:-}" ]]; then ARGS+=(--angle "${REST[0]}"); fi
|
||
;;
|
||
revolutions)
|
||
ARGS=(--arm right --test rotate)
|
||
if [[ -n "${REST[0]:-}" ]]; then ARGS+=(--revolutions "${REST[0]}"); fi
|
||
;;
|
||
esac
|
||
echo "=== DH RGI SN=${SITE_GRIP_SN:-?} ${SITE_GRIP_PORT} arm=${SITE_ROBOT_SHORT_ID:-?} ==="
|
||
exec python3 -m arm_application.dual_gripper_cli "${ARGS[@]}"
|
||
fi
|
||
PORT="${SITE_GRIP_PORT:-/dev/ttyUSB0}"
|
||
BAUD="${SITE_GRIP_BAUD:-115200}"
|
||
SLAVE="${SITE_GRIP_SLAVE:-1}"
|
||
echo "=== DH ${MODEL} SN=${SITE_GRIP_SN:-?} ${PORT} @${BAUD} slave=${SLAVE} ==="
|
||
exec python3 "${ROOT}/src/arm_application/arm_application/dh_pgea.py" \
|
||
--port "${PORT}" --baud "${BAUD}" --slave "${SLAVE}" \
|
||
--force "${SITE_GRIP_FORCE:-50}" --speed "${SITE_GRIP_SPEED:-50}" \
|
||
--rts "${SITE_GRIP_RS485_RTS:-}" \
|
||
"${CLI[@]}"
|
||
fi
|
||
|
||
if [[ "${DUAL}" -eq 1 ]]; then
|
||
exec bash "${ROOT}/scripts/run_dual_gripper.sh"
|
||
fi
|
||
|
||
if [[ "${IS_ROTARY}" -eq 1 ]]; then
|
||
pkill -f 'arm_application/dual_gripper_node.py' 2>/dev/null || true
|
||
pkill -f 'lib/arm_application/dual_gripper' 2>/dev/null || true
|
||
sleep 0.3
|
||
echo "=== DH RGI ROS node ${SITE_GRIP_PORT:-/dev/ttyUSB1} (arm_msgs dual_gripper right) ==="
|
||
exec ros2 launch arm_application dual_gripper.launch.py sides:=right allow_offline:=true
|
||
fi
|
||
|
||
PORT="${SITE_GRIP_PORT:-/dev/ttyUSB0}"
|
||
BAUD="${SITE_GRIP_BAUD:-115200}"
|
||
SLAVE="${SITE_GRIP_SLAVE:-1}"
|
||
GSN="${SITE_GRIP_SN:-}"
|
||
PY="${ROOT}/src/arm_application/arm_application/dh_pgea.py"
|
||
NODE_PY="${ROOT}/src/arm_application/arm_application/dh_pgea_node.py"
|
||
|
||
if [[ ! -e "${PORT}" ]]; then
|
||
echo "ERROR: ${PORT} missing. Plug USB–RS485 into the IPC." >&2
|
||
exit 1
|
||
fi
|
||
|
||
pkill -f 'arm_application/dh_pgea_node.py' 2>/dev/null || true
|
||
pkill -f 'lib/arm_application/dh_pgea' 2>/dev/null || true
|
||
sleep 0.4
|
||
|
||
echo "=== DH ${MODEL} SN=${GSN:-?} ${PORT} @${BAUD} ROS node ==="
|
||
exec python3 "${NODE_PY}" --ros-args \
|
||
-p port:="${PORT}" \
|
||
-p baud:="${BAUD}" \
|
||
-p slave_id:="${SLAVE}" \
|
||
-p stroke_mm:="${SITE_GRIP_STROKE_MM:-20.0}" \
|
||
-p force_pct:="${SITE_GRIP_FORCE:-50}" \
|
||
-p speed_pct:="${SITE_GRIP_SPEED:-50}" \
|
||
-p auto_init:="${SITE_GRIP_AUTO_INIT:-true}" \
|
||
-p model:="${MODEL}" \
|
||
-p "serial_number:='${GSN}'" \
|
||
-p "rs485_rts:='${SITE_GRIP_RS485_RTS:-}'"
|