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>
284 lines
8.5 KiB
Bash
Executable File
284 lines
8.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
||
# 把 Rizon4 移动到指定命名的位姿(默认:home)并强制停止。
|
||
#
|
||
# 关键:必须先杀掉 visual_servo.launch / servo_node,否则
|
||
# 它们会一直发 JointTrajectory,机械臂永远稳定不下来。
|
||
#
|
||
# 用法:
|
||
# bash ~/ros2/scripts/go_home.sh
|
||
# bash ~/ros2/scripts/go_home.sh --pose ready --speed 0.3
|
||
|
||
set -eo pipefail
|
||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||
POSE="${POSE:-}"
|
||
SPEED="${SPEED:-}"
|
||
KEEP_SERVO=0
|
||
|
||
# shellcheck disable=SC1091
|
||
source "${ROOT}/scripts/lib/parse_arm_args.sh"
|
||
parse_arm_args "$@"
|
||
set -- "${PARSE_ARM_REST[@]}"
|
||
|
||
usage() {
|
||
cat <<'EOF'
|
||
Move arm to a named pose (default: home), then hold with zero velocity.
|
||
|
||
Default: kill perception/servo/launch first (required to stop shaking).
|
||
|
||
Options:
|
||
--pose NAME home | ready | inspect | pos_left
|
||
--speed FLOAT velocity_scale (0,1] default 0.25
|
||
--arm 89|91 与 run_real 同一臂
|
||
--keep-servo do NOT kill servo (arm may keep shaking)
|
||
-h, --help
|
||
EOF
|
||
}
|
||
|
||
while [[ $# -gt 0 ]]; do
|
||
case "$1" in
|
||
--pose) POSE="${2:?}"; shift 2 ;;
|
||
--speed) SPEED="${2:?}"; shift 2 ;;
|
||
--keep-servo) KEEP_SERVO=1; shift ;;
|
||
--stop-track) shift ;; # 历史遗留
|
||
-h|--help) usage; exit 0 ;;
|
||
*) echo "Unknown: $1" >&2; usage >&2; exit 1 ;;
|
||
esac
|
||
done
|
||
|
||
if ! command -v ros2 >/dev/null 2>&1 || [[ -z "${ROS_DISTRO:-}" ]]; then
|
||
# shellcheck disable=SC1091
|
||
source "${ROOT}/scripts/env.sh"
|
||
fi
|
||
# shellcheck disable=SC1091
|
||
source "${ROOT}/scripts/lib/load_site_config.sh"
|
||
POSE="${POSE:-${SITE_GO_HOME_POSE:-home}}"
|
||
SPEED="${SPEED:-${SITE_GO_HOME_SPEED:-0.25}}"
|
||
|
||
kill_streamers() {
|
||
echo "=== killing visual-servo streamers ==="
|
||
# 能先禁用控制就禁用(如果节点还活着),再动手 kill
|
||
ros2 param set /servo_node enable_control false >/dev/null 2>&1 || true
|
||
|
||
# 先杀 launch 父进程,再杀可执行文件(先 SIGTERM 再 SIGKILL)
|
||
local patterns=(
|
||
'visual_servo.launch.py'
|
||
'/lib/arm_application/servo_node'
|
||
'/lib/arm_application/perception_node'
|
||
)
|
||
local p
|
||
for p in "${patterns[@]}"; do
|
||
if pgrep -f "$p" >/dev/null 2>&1; then
|
||
echo " TERM $p"
|
||
pkill -TERM -f "$p" 2>/dev/null || true
|
||
fi
|
||
done
|
||
sleep 1.0
|
||
for p in "${patterns[@]}"; do
|
||
if pgrep -f "$p" >/dev/null 2>&1; then
|
||
echo " KILL $p"
|
||
pkill -KILL -f "$p" 2>/dev/null || true
|
||
fi
|
||
done
|
||
sleep 0.5
|
||
|
||
if pgrep -f '/lib/arm_application/servo_node' >/dev/null 2>&1; then
|
||
echo "ERROR: servo_node still alive — refuse to move (would keep shaking)" >&2
|
||
pgrep -af '/lib/arm_application/servo_node' >&2 || true
|
||
exit 2
|
||
fi
|
||
echo " servo_node gone OK"
|
||
}
|
||
|
||
print_joints() {
|
||
python3 <<'PY'
|
||
import rclpy
|
||
from rclpy.node import Node
|
||
from sensor_msgs.msg import JointState
|
||
rclpy.init()
|
||
n = Node("go_home_joints")
|
||
box = [None]
|
||
n.create_subscription(JointState, "joint_states", lambda m: box.__setitem__(0, m), 10)
|
||
for _ in range(40):
|
||
rclpy.spin_once(n, timeout_sec=0.05)
|
||
if box[0] is not None:
|
||
break
|
||
if box[0] is None:
|
||
print(" (no joint_states)")
|
||
else:
|
||
m = dict(zip(box[0].name, box[0].position))
|
||
v = dict(zip(box[0].name, box[0].velocity)) if box[0].velocity else {}
|
||
for i in range(1, 8):
|
||
k = f"{__import__('os').environ['SITE_JOINT_PREFIX']}joint{i}"
|
||
if k in m:
|
||
print(f" joint{i}: {m[k]:+.4f} qd={v.get(k, 0.0):+.4f}")
|
||
n.destroy_node(); rclpy.shutdown()
|
||
PY
|
||
}
|
||
|
||
# 用控制器的 ACTION 做强力稳定(不走话题 —— 这样能可靠地匹配 JTC)
|
||
settle_hold_action() {
|
||
local pose="$1"
|
||
python3 - "$pose" <<'PY'
|
||
import sys, time
|
||
import rclpy
|
||
from rclpy.action import ActionClient
|
||
from rclpy.node import Node
|
||
from control_msgs.action import FollowJointTrajectory
|
||
from trajectory_msgs.msg import JointTrajectory, JointTrajectoryPoint
|
||
from sensor_msgs.msg import JointState
|
||
|
||
POSES = {
|
||
"home": [0.0, -0.698, 0.0, 1.57, 0.0, 0.698, 0.0],
|
||
"ready": [0.0, -0.698, 0.0, 1.57, 0.0, 0.698, 0.0],
|
||
"inspect": [0.698, -0.698, 0.698, 1.57, 0.698, 0.698, 0.698],
|
||
"pos_left": [-0.698, -0.698, 0.698, 1.57, 0.698, 0.698, 0.698],
|
||
}
|
||
name = sys.argv[1]
|
||
target = POSES.get(name)
|
||
if target is None:
|
||
raise SystemExit(f"unknown pose {name}")
|
||
import os
|
||
PREFIX = os.environ["SITE_JOINT_PREFIX"] # 缺失就报错:前缀错了会驱动错关节
|
||
JOINTS = [f"{PREFIX}joint{i}" for i in range(1, 8)]
|
||
|
||
rclpy.init()
|
||
n = Node("go_home_hold_action")
|
||
js_box = [None]
|
||
n.create_subscription(JointState, "joint_states", lambda m: js_box.__setitem__(0, m), 10)
|
||
cli = ActionClient(n, FollowJointTrajectory, "rizon_arm_controller/follow_joint_trajectory")
|
||
if not cli.wait_for_server(timeout_sec=5.0):
|
||
print(" WARN: JTC action not available — skip action hold")
|
||
n.destroy_node(); rclpy.shutdown(); raise SystemExit(0)
|
||
|
||
def spin_until(pred, timeout=3.0):
|
||
t0 = time.monotonic()
|
||
while time.monotonic() - t0 < timeout:
|
||
rclpy.spin_once(n, timeout_sec=0.05)
|
||
if pred():
|
||
return True
|
||
return False
|
||
|
||
spin_until(lambda: js_box[0] is not None, 3.0)
|
||
|
||
# 两点轨迹:当前位姿 -> 目标位姿(或保持在目标位姿),两点速度都为零
|
||
q_now = list(target)
|
||
if js_box[0] is not None:
|
||
m = dict(zip(js_box[0].name, js_box[0].position))
|
||
try:
|
||
q_now = [float(m[j]) for j in JOINTS]
|
||
except KeyError:
|
||
pass
|
||
|
||
def send_hold(q, T=0.40):
|
||
traj = JointTrajectory()
|
||
traj.joint_names = list(JOINTS)
|
||
# 起点
|
||
p0 = JointTrajectoryPoint()
|
||
p0.positions = [float(v) for v in q]
|
||
p0.velocities = [0.0] * 7
|
||
p0.accelerations = [0.0] * 7
|
||
p0.time_from_start.sec = 0
|
||
p0.time_from_start.nanosec = 50_000_000
|
||
# 终点是同一姿势,速度仍为零(钉住)
|
||
p1 = JointTrajectoryPoint()
|
||
p1.positions = [float(v) for v in q]
|
||
p1.velocities = [0.0] * 7
|
||
p1.accelerations = [0.0] * 7
|
||
ns = int(round(T * 1e9))
|
||
p1.time_from_start.sec = ns // 1_000_000_000
|
||
p1.time_from_start.nanosec = ns % 1_000_000_000
|
||
traj.points = [p0, p1]
|
||
goal = FollowJointTrajectory.Goal()
|
||
goal.trajectory = traj
|
||
fut = cli.send_goal_async(goal)
|
||
spin_until(lambda: fut.done(), 3.0)
|
||
if not fut.done():
|
||
print(" hold goal send timeout")
|
||
return False
|
||
gh = fut.result()
|
||
if gh is None or not gh.accepted:
|
||
print(" hold goal rejected")
|
||
return False
|
||
rfut = gh.get_result_async()
|
||
spin_until(lambda: rfut.done(), T + 3.0)
|
||
return True
|
||
|
||
# 1) 先朝命名位姿快速靠拢,末端速度为零
|
||
print(f" action hold → {name} (zero vel)")
|
||
send_hold(target, T=0.60)
|
||
time.sleep(0.4)
|
||
# 2–4) 反复把实测位姿重新钉住(让 JTC 的开环指令与编码器读数对齐)
|
||
for i in range(3):
|
||
spin_until(lambda: js_box[0] is not None, 1.0)
|
||
if js_box[0] is None:
|
||
break
|
||
m = dict(zip(js_box[0].name, js_box[0].position))
|
||
q_pin = [float(m[j]) for j in JOINTS]
|
||
print(f" action re-pin #{i+1} @ measured joints (zero vel)")
|
||
send_hold(q_pin, T=0.45)
|
||
time.sleep(0.25)
|
||
|
||
# 等到 |qd| 足够小
|
||
print(" waiting for joints to stop ...")
|
||
t0 = time.monotonic()
|
||
while time.monotonic() - t0 < 5.0:
|
||
rclpy.spin_once(n, timeout_sec=0.05)
|
||
if js_box[0] is None or not js_box[0].velocity:
|
||
continue
|
||
vmap = dict(zip(js_box[0].name, js_box[0].velocity))
|
||
vmax = max(abs(float(vmap.get(j, 0.0))) for j in JOINTS)
|
||
if vmax < 0.015:
|
||
print(f" settled |qd|_max={vmax:.4f} rad/s")
|
||
break
|
||
else:
|
||
print(" WARN: still some residual velocity")
|
||
|
||
n.destroy_node()
|
||
rclpy.shutdown()
|
||
PY
|
||
}
|
||
|
||
if [[ "${KEEP_SERVO}" -eq 0 ]]; then
|
||
kill_streamers
|
||
else
|
||
echo "WARNING: --keep-servo — shaking likely"
|
||
fi
|
||
|
||
if ! ros2 service list 2>/dev/null | grep -q '/set_named_pose'; then
|
||
echo "ERROR: /set_named_pose missing — start run_real.sh" >&2
|
||
exit 1
|
||
fi
|
||
|
||
echo "=== joints before ==="
|
||
print_joints
|
||
|
||
echo "=== move: ${POSE} speed=${SPEED} ==="
|
||
RESP="$(
|
||
ros2 service call /set_named_pose arm_msgs/srv/SetNamedPose \
|
||
"{pose_name: '${POSE}', velocity_scale: ${SPEED}, acceleration_scale: 0.0}" 2>&1
|
||
)"
|
||
echo "${RESP}"
|
||
if ! echo "${RESP}" | grep -q 'success=True'; then
|
||
echo "ERROR: move failed" >&2
|
||
exit 1
|
||
fi
|
||
|
||
WAIT_SEC="$(python3 -c "print(max(2.5, 1.0 / max(float('${SPEED}'), 0.05) + 2.0))")"
|
||
echo "Waiting ${WAIT_SEC}s ..."
|
||
sleep "${WAIT_SEC}"
|
||
|
||
echo "=== settle (action, vel=0) ==="
|
||
settle_hold_action "${POSE}"
|
||
|
||
# 最后确认:servo 必须仍然是死的
|
||
if pgrep -f '/lib/arm_application/servo_node' >/dev/null 2>&1; then
|
||
echo "WARNING: servo_node came back — killing again"
|
||
kill_streamers
|
||
settle_hold_action "${POSE}"
|
||
fi
|
||
|
||
echo "=== joints after ==="
|
||
print_joints
|
||
echo "Done. Arm should be still."
|
||
echo "Tracking later: bash ~/ros2/scripts/run_visual_servo_rt.sh --control"
|