Author SHA1 Message Date
YikaiFu-cart f173e37f35 更新README.md 2026-08-11 12:48:14 +08:00
YikaiFu-cart 43699a81f1 fix: 修复mujoco仿真里左臂剪刀安装位置与实际位置不同 2026-08-04 20:53:26 +08:00
YikaiFu-cart 5a6ec47e6c fix: 更新 README 和配置文件,调整模式和工具设置 2026-08-04 18:11:19 +08:00
YikaiFu-cart b24165640d fix: 阻止重复遥操作节点继续运行 2026-08-04 14:36:16 +08:00
YikaiFu-cart 1fefae34e5 fix: 完善 MuJoCo 退出与测试环境 2026-08-04 13:58:35 +08:00
YikaiFu-cart 9c47c94c79 docs: 补充双臂 MuJoCo 使用说明 2026-08-04 13:46:54 +08:00
YikaiFu-cart 0dfe3d77dc fix: 安全关闭 MuJoCo 显示窗口 2026-08-04 13:46:31 +08:00
YikaiFu-cart 002484b610 feat: 接入双臂 MuJoCo 启动模式 2026-08-04 13:37:31 +08:00
YikaiFu-cart 826b929d97 feat: 添加双臂 MuJoCo 显示节点 2026-08-04 13:36:39 +08:00
YikaiFu-cart f5790a8c77 feat: 支持 MuJoCo 双臂即时复位 2026-08-04 13:34:27 +08:00
YikaiFu-cart c1bc56fe09 test: 补充关节状态发布夹具 2026-08-04 13:33:06 +08:00
YikaiFu-cart 9a00898be3 feat: 发布双臂关节状态与目标 2026-08-04 13:31:52 +08:00
YikaiFu-cart 631e3ee11c feat: 添加双臂 MuJoCo 运动学模型 2026-08-04 13:30:20 +08:00
YikaiFu-cart 1df09fef63 docs: 添加双臂 MuJoCo 设计与计划 2026-08-04 11:42:07 +08:00
YikaiFu-cart 36f82fe2db docs: 更新双 RM75 逆解说明 2026-08-03 16:53:26 +08:00
YikaiFu-cart 56baabae7a feat: 接入双 RM75 逆解模型 2026-08-03 16:33:57 +08:00
YikaiFu-cart 451de103b8 feat: 使用双 RM75 局部相对逆解 2026-08-03 16:08:07 +08:00
YikaiFu-cart 99cb45ef6d test: 强化双臂逆解测试边界 2026-08-03 16:00:33 +08:00
YikaiFu-cart a9c605c804 test: 修正双臂 offset 断言 2026-08-03 15:52:35 +08:00
YikaiFu-cart 2d197a8928 test: 添加双 RM75 逆解回归 2026-08-03 15:49:58 +08:00
YikaiFu-cart 7edc28b44a config: 同步双臂 TCP 与前方工作空间 2026-08-03 15:37:59 +08:00
YikaiFu-cart 700d709fb1 docs: 添加双 RM75 逆解设计与计划 2026-08-03 14:24:09 +08:00
YikaiFu-cart ba068b19a1 Add scissor mesh files for dual_rm75 model 2026-08-03 09:55:26 +08:00
YikaiFu-cart 75eff40fa2 config:修改机械臂yaml文件 2026-07-31 16:20:59 +08:00
YikaiFu-cart 21c444dcc8 config: 更新左右臂初始位姿 2026-07-31 15:32:06 +08:00
YikaiFu-cart 4e068ce637 feat: 添加手柄主键回初始位姿 2026-07-31 15:31:35 +08:00
YikaiFu-cart 5267da14c2 feat: 复用适配器初始位姿运动 2026-07-31 15:30:20 +08:00
YikaiFu-cart 3981c380ea docs: 修正遥操作测试命令 2026-07-31 15:29:22 +08:00
YikaiFu-cart 80e823c097 docs: 添加手柄主键回位实施计划 2026-07-31 15:24:59 +08:00
YikaiFu-cart b7eab7cc76 docs: 补充左右臂初始位姿 2026-07-31 15:18:47 +08:00
YikaiFu-cart cf559f6d25 docs: 添加手柄主键回位设计 2026-07-31 15:08:15 +08:00
YikaiFu-cart d26ce7b945 docs: 更新手柄输入与 Superpowers 规则 2026-07-30 20:29:03 +08:00
YikaiFu-cart 1936adf2fd feat: 发布 XR 手柄摇杆与按键 2026-07-30 20:24:28 +08:00
YikaiFu-cart cbc18bed8a feat: 扩展 XR 手柄消息 2026-07-30 20:22:10 +08:00
YikaiFu-cart d84393f5cb docs: 添加手柄输入扩展实施计划 2026-07-30 20:13:47 +08:00
YikaiFu-cart 378ba05be8 docs: 添加手柄输入扩展设计 2026-07-30 20:05:07 +08:00
YikaiFu-cart bbfb306903 docs: 记录 RM75 QP 与 UDP 修复计划 2026-07-30 18:14:47 +08:00
YikaiFu-cart 4d8a9b7724 fix: 补充 RM75 UDP 超时反馈年龄 2026-07-30 18:13:43 +08:00
YikaiFu-cart d043f2709d fix: 修正 RM75 UDP 上报周期单位 2026-07-30 18:13:03 +08:00
YikaiFu-cart 84c96d7cf8 fix: 放宽 RM75 QP 位置收敛阈值 2026-07-30 18:12:14 +08:00
YikaiFu-cart 0df9e9bcfc docs: 记录 RM75 QP 与 UDP 周期修复设计 2026-07-30 18:04:49 +08:00
YikaiFu-cart 4f6981d08b fix: 修复 RM75 关节目标越界振荡 2026-07-30 10:43:11 +08:00
60 changed files with 6785 additions and 740 deletions
+5 -1
View File
@@ -230,7 +230,11 @@
除非用户明确要求,否则不要自动提交、推送或修改远程仓库。
使用 Superpowers 执行计划时,允许 subagent 按相关 skill 创建和使用独立 worktree 及其配套本地分支;其他情况下,除非用户明确要求,不要自动创建分支。
使用 Superpowers 执行任务时,允许按相关 skill 工作流创建本地 Git 提交;
同一项变更生成的规格文档与实施计划必须合并为一次本地提交,不得分别提交。
禁止执行 `git push`、合并本地分支、合并 PR 或其他远程写操作。相关 skill
如需独立 worktree 或配套本地分支,可以创建,但不得将其合并到其他分支。
其他情况下,除非用户明确要求,不要自动创建分支。
如果用户要求生成提交信息,提交信息应:
+103 -407
View File
@@ -1,89 +1,44 @@
# XR-RM75 双臂遥操作工作空间
# XR-RM75 双臂遥操作
本仓库是面向 **Ubuntu 22.04 + ROS2 Humble + PICO 4 Ultra + 睿尔曼 RM75**阶段一 XR 双臂遥操作项目。当前目标是先跑通一条低速、安全、可调试的闭环:
基于 **Ubuntu 22.04ROS2 HumblePICO 4 Ultra 睿尔曼 RM75**双臂 XR 遥操作
工作空间,支持单臂/双臂 Mock 与真机控制,以及 MuJoCo 运动学显示。
> [!WARNING]
> 真机命令会连接并控制机械臂。首次运行必须从 Mock 和单臂低速验证开始,确保急停
> 可用且工作区无人。当前项目没有双臂碰撞检测或避障。
## 当前能力
- PICO/XR 双手柄 UDP 输入,相对位姿目标与 Placo QP 七关节控制。
- 单臂/双臂 Mock 与真机、手柄/话题夹爪控制,以及只读 MuJoCo 双臂显示。
- 工作空间/圆柱限位、速度限制、指令超时和安全慢停。
- 统一 launch、Tkinter 启动面板、调试话题和 Mock 输入工具。
尚未完成:D405/D435 视频流、数据记录、相机标定、目标检测、双臂碰撞避障、任务级状态机,以及 PICO 与 ROS 的完整时间同步和状态回传。
## 系统架构
```text
PICO/XR 双手柄 UDP JSON
PICO / XRoboToolkit
-> UDP JSON
-> xr_rm_input/udp_controller_receiver
-> /xr/left_controller/xr/right_controller
-> /xr/left_controller/xr/right_controller
-> xr_rm_teleop/single_arm_velocity_teleop
-> Placo QP 单步逆解
-> 左右 RM75 七关节角透传控制
-> /xr_rm/<arm_name>/current_pose、raw_target_pose、target_pose、cmd_vel、target_clamped 调试话题
-> 相对 TCP 目标 + Placo QP
-> Mock 或 RM75 rm_movej_canfd
-> joint_states / 调试话题
-> 可选 xr_rm_mujoco/dual_arm_simulator
```
当前控制方式是“手柄相对位姿 + 单步 QP”遥操作:按住 `grip` 时锁定当前手柄位姿和机械臂 TCP 位姿,之后根据手柄相对位移和相对旋转生成目标 TCP。姿态目标使用旋转矩阵和 SO(3) 最短路径完成死区、滤波与限速,不经过 RPY。每个控制周期执行一次 Placo QP,并通过 `rm_movej_canfd` 下发 7 个关节目标。松开 `grip`、UDP 或关节反馈超时、节点退出时会请求机械臂慢停。
工作空间包含五个 ROS2 包:`xr_rm_input` 负责手柄输入,`xr_rm_interfaces` 定义消息,
`xr_rm_teleop` 实现遥操作与真机适配,`xr_rm_bringup` 提供启动和配置,
`xr_rm_mujoco` 负责只读运动学显示。
## 当前范围
`single_arm_velocity_teleop` 每个实例只控制一台机械臂;双臂模式分别启动 `left_arm_teleop``right_arm_teleop`
已完成:
## 环境与构建
- PICO/XR 手柄 UDP 数据接收,并分发到左右手柄 ROS2 话题。
- 通过统一的 `arm_debug.launch.py` 支持左臂、右臂、双臂的 mock 调试和真机调试。
- RM75 真机连接适配,包含关节反馈缓存、`rm_movej_canfd` 关节透传、安全速度/加速度配置、可选初始化点位移动。
- Placo 0.9.4 RM75 QP 逆解;收到首帧有效关节反馈后才启用,求解失败时保留上一组有效关节目标。
- 真机模式下,点击对应手柄 `trigger` 可切换并保持对应夹爪开/关状态。
- Tkinter 启动面板 `launcher_ui.py`,用于现场快速启动、监控 topic、检查环境和清理进程。
- 自定义 PICO 4 Ultra UDP Sender Unity 工程,负责发送左右手柄 pose、`grip``trigger` 和 pose 诊断字段。
暂未完成:
- D405/D435 视频流、数据记录、相机标定和目标检测链路。
- 双臂碰撞模型、任务级状态机、自动采摘策略。
- PICO 端与 ROS 端的完整时间同步和状态回传。
## 项目结构
```text
src/
├── README.md # 项目主文档
├── CODEX.md # Codex/Claude Code 项目工作流和安全规则
├── docs/
│ └── pico_udp_sender_ubuntu22_setup.md # Ubuntu 22.04 下 PICO UDP Sender 配置教程
├── unity/
│ ├── XR_RM_PICO_UDP_Sender/ # PICO 4 Ultra UDP Sender Unity 工程
│ │ ├── Assets/Editor/ # Android/PICO 设置与 APK 构建菜单
│ │ ├── Assets/Scripts/ # UDP sender、配置面板、KeepAwake
│ │ ├── Assets/Resources/ # PICO 资源与 Roboto TMP 字体
│ │ ├── Packages/ # Unity package manifest
│ │ └── ProjectSettings/
│ └── PICO-Unity-Integration-SDK-release_3.4.0/
├── xr_rm_bringup/
│ ├── config/
│ │ ├── dual_arm_rm75.yaml # 双臂配置:left_arm_teleop 与 right_arm_teleop
│ │ ├── left_arm_rm75.yaml # 左臂单独调试配置
│ │ ├── right_arm_rm75.yaml # 右臂单独调试配置
│ │ └── peripherals_rm75.yaml # 左右臂末端外设配置
│ ├── launch/
│ │ └── arm_debug.launch.py # 统一入口:arm:=left/right/both, use_mock:=true/false
│ └── tools/
│ ├── launcher_ui.py # 图形化调试启动面板
│ └── realman_dual_arm_state_monitor.py
├── xr_rm_input/
│ ├── launch/
│ │ └── udp_receiver.launch.py # 低层 UDP 接收测试入口
│ └── xr_rm_input/
│ ├── udp_controller_receiver.py
│ └── sample_udp_sender.py # 本机扫轴/正弦模拟手柄 UDP 数据
├── xr_rm_interfaces/
│ └── msg/
│ └── XrController.msg # hand/grip/trigger/pose
└── xr_rm_teleop/
├── models/
│ ├── rm75/ # 旧 RM75 模型资源(launch 不再选用)
│ └── rm75_omnipicker/ # RM75 + OmniPicker fixed URDF 与网格
└── xr_rm_teleop/
├── placo_ik_solver.py # Placo 0.9.4 单步 QP 逆解
├── single_arm_velocity_teleop.py
├── realman_adapter.py
└── fun_peripheral.py
```
`single_arm_velocity_teleop` 这个名字保留是有意的:双臂模式不是一个大节点直接控制两台机械臂,而是启动两个相同的单臂控制节点,分别命名为 `left_arm_teleop``right_arm_teleop`
## 环境准备
在工作空间根目录,也就是包含 `src/` 的目录执行:
在工作空间根目录执行:
```bash
cd /home/robot/WS_xr
@@ -94,384 +49,125 @@ colcon build --symlink-install
source install/setup.bash
```
真机模式还需要安装睿尔曼 Python API2。若未安装,mock 模式仍可正常使用;真机启动时会提示缺少 `Robotic_Arm` 包。
遥操作和 MuJoCo 节点固定使用 `/home/robot/miniconda3/envs/xr/bin/python`
其中固定 Placo 0.9.4、Pinocchio 3.7.0、NumPy 2.2.6 和 MuJoCo 3.10.0;不要从
用户或系统 Python 覆盖这些版本。
遥操作节点固定由 `/home/robot/miniconda3/envs/xr/bin/python` 启动,并复用其中的 Python 3.10、Placo 0.9.4、Pinocchio 3.7.0 和 NumPy 2.2.6。`ros2``colcon``udp_controller_receiver` 仍使用系统 Python。禁止通过 `pip --user``sudo pip` 或系统安装升级 Placo、Pinocchio、EigenPy 和 NumPy
真机模式另需睿尔曼 Python API2Mock 模式不依赖厂商 SDK
只读检查 Placo 版本:
## 快速开始
以下命令均在 `/home/robot/WS_xr` 执行,并先 source ROS2 与 `install/setup.bash`
### Mock
```bash
/home/robot/miniconda3/envs/xr/bin/python -c \
"import importlib.metadata; print(importlib.metadata.version('placo'))"
ros2 launch xr_rm_bringup arm_debug.launch.py arm:=both use_mock:=true
```
输出必须为 `0.9.4`
如果希望 `launcher_ui.py` 从任意目录找到工作空间,可以设置:
另开终端发送模拟手柄数据:
```bash
export XR_RM_WS=/home/robot/WS_xr
```
## 使用 launcher_ui.py 调试
推荐现场调试优先使用图形化启动面板。它会自动进入工作空间、source ROS2 与 `install/setup.bash`,并把每个命令放到独立终端中运行。
源码方式启动:
```bash
cd /home/robot/WS_xr
python3 src/xr_rm_bringup/tools/launcher_ui.py
```
构建后也可以通过 ROS2 入口启动:
```bash
source /opt/ros/humble/setup.bash
source install/setup.bash
ros2 run xr_rm_bringup launcher_ui
```
面板顶部的 `Mode` 分为五类:
- `Simulation`:左臂 mock、右臂 mock、双臂 mock、sample UDP 发送、one-click mock demo、controller 位置/频率监控。
- `Left Arm`:左臂网络 ping、左臂真机 launch、左手 sample UDP。
- `Right Arm`:右臂网络 ping、右臂真机 launch、右手 sample UDP。
- `Dual Arm`:左右臂 ping、双臂真机 launch、双手 sample UDP。
- `Diagnostics``ros2 doctor --report` 和核心包的 `ros2 pkg prefix` 检查。
常用按钮:
- `Run Selected`:运行当前选中的命令。双击列表项也可以运行。
- `Check Env`:检查 ROS2 Humble、工作空间 build、终端、核心 ROS 包、睿尔曼 API2。
- `Stop All`:结束由本工作空间启动的 launch、sample sender、topic monitor、相关 ROS 节点和终端窗口。
每个模式都会附带基础监控入口:
- `Open Controller Topic Monitor`:同时查看 `/xr/left_controller``/xr/right_controller`
- `Open Target Velocity Monitor`:同时查看 `/xr_rm/left_rm75/cmd_vel``/xr_rm/right_rm75/cmd_vel`;该话题表示目标位姿变化率,仅用于调试。
- `Open ROS Topic/Node List Monitor`:每秒刷新 `ros2 topic list``ros2 node list`
`Simulation` 模式还提供 `Open Controller Position Monitor``Open Controller Hz Monitor`,用于快速看手柄位置字段和接收频率。
分屏监控依赖 `x-terminal-emulator` 指向 Terminator。若提示不支持,可安装并切换:
```bash
sudo apt install terminator wmctrl xdotool
sudo update-alternatives --config x-terminal-emulator
```
## 推荐调试顺序
第一步:检查环境。
打开 `launcher_ui.py`,点击 `Check Env`。如果 `install/setup.bash` 缺失,先回工作空间根目录重新执行 `colcon build --symlink-install`
第二步:分别跑左、右臂 mock 闭环。
分两个终端依次验证左臂:
```bash
ros2 launch xr_rm_bringup arm_debug.launch.py arm:=left use_mock:=true
ros2 run xr_rm_input sample_udp_sender --hand left --host 127.0.0.1 --port 15000 \
ros2 run xr_rm_input sample_udp_sender \
--hand both --host 127.0.0.1 --port 15000 \
--pattern axis_sweep --seconds 30
```
停止左臂进程后,再分别验证右臂:
单臂调试时将 `arm` 改为 `left``right`。推荐先分别完成左右单臂
Mock,再进入双臂或真机验证。
### MuJoCo
```bash
ros2 launch xr_rm_bringup arm_debug.launch.py arm:=right use_mock:=true
ros2 run xr_rm_input sample_udp_sender --hand right --host 127.0.0.1 --port 15000 \
--pattern axis_sweep --seconds 30
ros2 launch xr_rm_bringup arm_debug.launch.py \
arm:=both use_mock:=true use_mujoco:=true
```
`sample_udp_sender` 默认使用 `axis_sweep` 扫轴轨迹,并在终端打印 `XR +X/-X/+Y/-Y/+Z/-Z` 标签。需要检查末端姿态时可增加 `--rotation-pattern rpy_steps --rotation-amplitude-deg 25`
MuJoCo 只订阅关节状态,不参与控制。真机显示可将 `use_mock` 改为 `false`
但该命令会同时连接两台 RM75。
观察:
### PICO 输入
只保留一个 UDP 输入源,然后启动 XRoboToolkit bridge
```bash
ros2 topic echo /xr/left_controller
ros2 topic echo /xr/right_controller
ros2 topic echo /xr_rm/left_rm75/target_pose
ros2 topic echo /xr_rm/right_rm75/target_pose
ros2 topic echo /xr_rm/left_rm75/cmd_vel
ros2 topic echo /xr_rm/right_rm75/cmd_vel
ros2 run xr_rm_input xrobotoolkit_to_udp_bridge \
--host 127.0.0.1 --port 15000 --hz 90
```
第三步:单臂真机。
确认左右 topic 持续接收数据:
先只上一个臂,确认网络、方向、急停和限幅:
```bash
ros2 topic hz /xr/left_controller
ros2 topic hz /xr/right_controller
```
图形启动面板可运行 `python3 src/xr_rm_bringup/tools/launcher_ui.py`,提供
Simulation、MuJoCo、Real Hardware 和 Diagnostics 模式。
### 真机
确认对应 YAML 中 `move_to_initial_pose_on_connect: false`,再从单臂开始:
```bash
ros2 launch xr_rm_bringup arm_debug.launch.py arm:=left use_mock:=false
ros2 launch xr_rm_bringup arm_debug.launch.py arm:=right use_mock:=false
```
所有 YAML 默认都不会执行 `movej(initial_joint_pose)`。只有确认安全区清空后,才可在当前使用的
`left_arm_rm75.yaml``right_arm_rm75.yaml``dual_arm_rm75.yaml` 中将
`move_to_initial_pose_on_connect` 改为 `true`
第四步:双臂真机。
单臂方向、限位、急停、超时停止和夹爪均验证后,才能启动双臂:
```bash
ros2 launch xr_rm_bringup arm_debug.launch.py arm:=both use_mock:=false
```
双臂默认不会自动移动到初始化点;机器人地址、控制参数和初始化移动开关均从
`dual_arm_rm75.yaml` 读取
按住 `grip` 控制对应机械臂;松开后停止。点击 `trigger` 切换对应夹爪开/关。
左手 X、右手 A 会请求对应机械臂回到配置的初始位姿;真机使用前必须清空安全区
## Launch 入口说明
## Launch 参数
`arm_debug.launch.py` 是当前唯一的遥操作 launch 主入口,`launcher_ui.py` 中的 mock、单臂真机和双臂真机按钮都调用它。
统一入口为 `xr_rm_bringup/launch/arm_debug.launch.py`
常用参数:
| 参数 | 默认值 | 说明 |
| --- | --- | --- |
| `arm` | `right` | `left``right``both` |
| `use_mock` | `true` | `false` 会连接真机 |
| `use_mujoco` | `false` | 仅支持 `arm:=both` |
| `udp_host` | `0.0.0.0` | UDP 监听地址 |
| `udp_port` | `15000` | UDP 监听端口 |
| `udp_timer_hz` | `200.0` | UDP receiver 轮询频率 |
- `arm``left``right``both`,默认 `right`
- `use_mock``true` 不连接真机,`false` 连接 RM75。
- `udp_host`UDP 监听地址,默认 `0.0.0.0`
- `udp_port`UDP 监听端口,默认 `15000`
- `udp_timer_hz`UDP receiver 轮询频率,默认 `200.0`
## 配置
机器人 IP/端口、控制频率、CANFD、限速、工具和初始化位姿等行为参数只由对应 YAML
配置,launch 不再提供同名覆盖项。
| 文件 | 用途 |
| --- | --- |
| `dual_arm_rm75.yaml` | 双臂节点、网络、控制与安全参数 |
| `left_arm_rm75.yaml` | 左臂单独调试 |
| `right_arm_rm75.yaml` | 右臂单独调试 |
| `peripherals_rm75.yaml` | 工具坐标、负载和末端执行器 |
| `dual_arm_mujoco.yaml` | MuJoCo 刷新频率 |
## 配置文件说明
修改某一侧控制参数时,同时检查单臂和双臂 YAML 是否需要同步。必须保留工作空间/
圆柱限位、线速度与角速度限制、关节速度/加速度限制、指令超时和安全停止逻辑。
`xr_rm_bringup/config/dual_arm_rm75.yaml` 是双臂配置主文件,包含两个 ROS 节点命名空间:
`configure_safety_limits` 不得默认关闭;
`move_to_initial_pose_on_connect` 必须保持默认 `false`
- `left_arm_teleop`
- `right_arm_teleop`
## 测试
`left_arm_rm75.yaml``right_arm_rm75.yaml` 用于 `arm_debug.launch.py arm:=left/right` 的单臂调试,因为单臂节点名是 `single_arm_velocity_teleop`
`xr_rm_bringup/config/peripherals_rm75.yaml` 保存真实控制器使用的末端工具坐标、负载和左右臂外设选择,文件内容保持原状。Placo 使用 `xr_rm_teleop/models/rm75_omnipicker` 中的一体化 fixed URDF,直接控制相对 `omnipicker_base_link` 沿 `+Z` 偏移 `0.16 m``omnipicker_tcp`,不再把外设 YAML 的工具位姿重复转换到 QP。真机连接阶段仍会初始化外设,关节反馈、关节指令、慢停和开合命令复用该单臂节点的同一个 RealMan 连接。
重点控制参数:
- `controller_topic`:订阅的手柄话题。
- `scale`:手柄位移到 TCP 位移的比例。
- `target_filter_alpha` / `target_filter_alpha_fast`:目标 TCP 低通滤波系数,快速移动时自动使用更大的系数。
- `target_filter_fast_threshold_m`:进入快速滤波区间的目标变化阈值。
- `max_linear_speed`:目标位姿单帧步长限制对应的最大线速度。
- `enable_orientation_control`:是否把手柄相对旋转映射到 TCP 姿态。
- `orientation_filter_alpha` / `orientation_deadband_rad`:按 SO(3) 最短旋转角处理的目标 TCP 姿态滤波和死区。
- `max_orientation_speed`:目标 TCP 姿态沿 SO(3) 最短路径的最大角速度,当前为 `0.5 rad/s`
- `workspace_min` / `workspace_max`:笛卡尔工作空间边界。
- `cyl_radius_limit`:基座圆柱半径限制。
- `xr_to_robot_matrix``/xr/*_controller` Project 位移到 RM75 base 坐标的映射矩阵。
- `robot_ip` / `robot_port`RM75 TCP 控制连接地址。
- `realtime_push_host_ip`:连接机械臂 Wi-Fi 后本机实际 IPv4;可用
`ip -4 route get 192.168.192.19` 查看输出中的 `src`,当前为 `192.168.192.148`
- `realtime_push_port`UDP 主动反馈端口;左臂 `8089`、右臂 `8090`,同机双臂不能重复。
- `realtime_push_cycle_ms`:UDP 主动反馈周期,当前为厂商支持的 `5 ms`
- `follow` / `canfd_trajectory_mode``rm_movej_canfd` 的高跟随和轨迹模式参数。
- 当前三份 YAML 默认均使用 `follow: false` 完成安全基线验证;确认关节加速度与反馈稳定后,再单独测试高跟随。
- `initial_joint_pose`:mock 的初始关节反馈,以及显式开启初始化移动时的真机初始关节角。
当前 `/xr/*_controller` 的 Project 坐标约定:
- Project`+X` 向右,`+Y` 向上,`+Z` 向后。
- Unity APK 的 `Project (+Z back)` 会把 PXR `pxr_predict` 原始坐标转换为 `project.x=native.z``project.y=native.y``project.z=-native.x`
- `Source raw` 模式保留原始 pose source 坐标,只用于现场对照。
- 左臂映射:机器人位移增量 = `[-手柄y, 手柄z, -手柄x]`
- 右臂映射:机器人位移增量 = `[手柄y, 手柄z, 手柄x]`
如果 `/xr/*_controller.pose.position` 已符合 Project 坐标,但某个机械臂方向相反,只改对应臂的 `xr_to_robot_matrix` 符号,不要同时改多个控制参数。
## 末端工具开合
真机 launch 默认会在遥操作节点内启用工具控制。左/右手柄 `trigger` 从低于阈值按到 `>= 0.95` 时,会切换一次对应夹爪开/关状态,并保持到下一次点击。`grip` 仍只控制机械臂运动,不影响夹爪 trigger 切换。
也可以用 Bool 话题手动控制开合,`true` 表示打开,`false` 表示闭合:
在工作空间根目录执行:
```bash
ros2 topic pub --once /xr_rm/left_rm75/tool_enable std_msgs/msg/Bool "{data: true}"
ros2 topic pub --once /xr_rm/left_rm75/tool_enable std_msgs/msg/Bool "{data: false}"
ros2 topic pub --once /xr_rm/right_rm75/tool_enable std_msgs/msg/Bool "{data: true}"
ros2 topic pub --once /xr_rm/right_rm75/tool_enable std_msgs/msg/Bool "{data: false}"
```
桌面 UI 的 `Left Arm``Right Arm` 模式里也有对应的 Tool Open/Close 命令项;`Dual Arm` 真机模式下可直接通过左右手柄 `trigger` 分别切换夹爪。
## UDP 数据格式
当前 Unity APK 每个周期发送一个双手柄 JSON 包:
```json
{
"t": 12.345,
"source_time": 12.345,
"seq": 42,
"frame_id": "xr_world",
"controllers": {
"left": {
"grip": true,
"trigger": 0.0,
"pos": [-0.12, 1.05, 0.30],
"quat": [0.0, 0.0, 0.0, 1.0],
"pose_valid": true,
"pose_source": "pxr_predict",
"tracking_state": 3,
"controller_status": 2,
"grip_value": 1.0,
"axis": [0.0, 0.0],
"buttons": {
"grip": true,
"primary": false,
"secondary": false,
"menu": false,
"axis_click": false
}
},
"right": {
"grip": true,
"trigger": 0.4,
"pos": [0.12, 1.05, 0.30],
"quat": [0.0, 0.0, 0.0, 1.0],
"pose_valid": true,
"pose_source": "unity_xr",
"tracking_state": 3,
"controller_status": -1,
"grip_value": 0.8,
"axis": [0.0, 0.0],
"buttons": {
"grip": true,
"primary": false,
"secondary": false,
"menu": false,
"axis_click": false
}
}
}
}
```
字段说明:
- `t` / `source_time`Unity 端 `Time.realtimeSinceStartupAsDouble`,用于后续延迟分析。
- `seq`:Unity 端递增包序号,用于后续丢包分析。
- `frame_id`:默认 `xr_world`,会写入 `XrController.header.frame_id`
- `grip`:运动使能。`true` 时进入相对位姿控制,`false` 时停止。
- `trigger`:扳机值,范围 `0.0-1.0`。真机模式下跨过 `0.95` 的上升沿会切换对应夹爪开/关状态。
- `pos`:手柄位置,长度 3。
- `quat`:手柄姿态四元数,默认按 `xyzw` 解析;遥操作节点会用 grip 锁定后的相对旋转控制 TCP 姿态。
- `pose_valid`:姿态是否可信。ROS 接收端看到 `false` 会强制 `grip=false`
- `pose_source``pxr_predict``unity_xr``xrobotoolkit``none`,用于判断姿态来自 PICO 预测接口、Unity XR fallback 还是官方 XRoboToolkit SDK bridge。
- `tracking_state` / `controller_status`Unity/PICO 侧追踪诊断值,只用于日志和排查。
- `grip_value``axis``buttons`:PICO 端输入诊断字段,当前不会写入 `XrController` 消息。
`udp_controller_receiver` 仍兼容调试用的单手柄包:可以直接发送带 `hand``pos``quat` 的 JSON object,也可以用 `controllers` list、顶层 `left/right``pose.position``position``p``q` 等常见字段。四元数默认按 `xyzw` 解析,也可通过 `quat_order:=wxyz` 切换。
PICO 4 Ultra 在 Ubuntu 22.04 下配置 Unity、构建 APK、安装到头显并向 ROS2 主机发送 UDP 的详细步骤见 [docs/pico_udp_sender_ubuntu22_setup.md](docs/pico_udp_sender_ubuntu22_setup.md)。
## 官方 XRoboToolkit bridge
如果使用官方 XRoboToolkit APK 和 PC-Service,可以用 `xrobotoolkit_to_udp_bridge` 从本机 ROS Python 环境中的 `xrobotoolkit_sdk` 读取左右手柄数据,再转换成当前 `udp_controller_receiver` 支持的 UDP JSON。
正式运行时不要同时启动官方 `PXREAClientUnity` / `RobotLinuxDemo` 可视化窗口。`/opt/apps/roboticsservice/run3D.sh` 会启动这个可视化 demo,适合单独确认 PICO 与 PC-Service 已连接;bridge 遥操作链路中只需要 PC-Service。
运行前只保留一个 UDP 输入源。先清掉重复 bridge、sample sender 和官方 Unity 可视化 demo,再保留或启动 PC-Service
```bash
pkill -f '[x]robotoolkit_to_udp_bridge'
pkill -f '[s]ample_udp_sender'
pkill -f '[R]obotLinuxDemo.x86_64'
pkill -f '[P]XREAClientUnity'
pgrep -af RoboticsServiceProcess || /opt/apps/roboticsservice/runService.sh
```
启动 ROS mock 接收链路:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
source install/setup.bash
ros2 launch xr_rm_bringup arm_debug.launch.py arm:=both use_mock:=true
```
另开终端启动 bridge
```bash
cd /home/robot/WS_xr
source ~/.bashrc
source /opt/ros/humble/setup.bash
source install/setup.bash
ros2 run xr_rm_input xrobotoolkit_to_udp_bridge \
--host 127.0.0.1 --port 15000 --hz 90
```
bridge 默认对 grip/trigger 做轻量滞回:`grip` 按下阈值 `0.90`、松开阈值 `0.75``trigger` 按下阈值 `0.95`、松开阈值 `0.75`。启动日志会打印 PID、UDP endpoint 和阈值,便于确认当前只运行了一个 bridge。
验证手柄数据是否进入 ROS
```bash
ps -ef | grep -E 'xrobotoolkit_to_udp_bridge|sample_udp_sender|RobotLinuxDemo|PXREAClientUnity' | grep -v grep
ros2 topic hz /xr/left_controller
ros2 topic hz /xr/right_controller
ros2 topic echo /xr/left_controller --field pose.position
ros2 topic echo /xr/right_controller --field pose.position
ros2 topic echo /xr/left_controller --field grip
ros2 topic echo /xr/right_controller --field grip
ros2 topic echo /xr/right_controller --field trigger
```
`/xr/left_controller``/xr/right_controller` 持续刷新、位置随手柄移动变化、`grip` 随握持键切换,即表示官方 XRoboToolkit 数据已经进入当前遥操作输入层。
## 真机安全验证
第一次接真机时按这个顺序走:
1. 确认急停、网络、机械臂工作区和人员位置。
2. `launcher_ui.py` 中先 `Ping Left RM75``Ping Right RM75`
3. 确认对应 YAML 中 `move_to_initial_pose_on_connect: false` 后单臂启动。
4. 手握急停,按住 `grip` 后只做小幅单轴移动。
5. 逐个确认上/下、前/后、左/右方向。
6. 小角度转动手柄,确认 `/xr_rm/<arm>/target_pose` 姿态和 `/xr_rm/<arm>/cmd_vel.twist.angular` 变化符合预期。
7. 点击对应 `trigger`,确认每次点击都会切换对应夹爪状态,松开 trigger 后状态保持且左右不串臂。
8. 确认松开 `grip` 后机械臂慢停,`/xr_rm/<arm>/cmd_vel` 回到零;trigger 仍只影响夹爪,不影响机械臂运动门控。
9. 左右臂都确认后,再进入双臂模式。
当前项目没有双臂碰撞检测。双臂首次联调时,请让两个工作区在物理上分开,低速验证,不要让两臂末端互相靠近。
## 后续优化路线
为了达到“稳定可用的双臂 XR 遥操作/采摘平台”,建议按下面顺序推进:
1. 稳定 PICO 数据链路:利用 `seq``source_time``pose_valid` 做频率、延迟、丢包和追踪状态统计,记录 `/xr/*_controller``/xr_rm/*/raw_target_pose``/xr_rm/*/target_pose``/xr_rm/*/target_clamped``/xr_rm/*/current_pose`
2. 提升真机安全性:增加启动前安全检查、软件急停 topic、UI Stop 状态提示、双臂中间区域互斥边界和速度/加速度限幅。
3. 细化末端执行器:增加夹爪状态反馈、力控比例、安全上限和现场可视化提示。
4. 接入视觉和数据记录:加入 D405/D435 相机 launch、TF、内外参和 rosbag2 实验记录。
5. 从遥操作走向半自动:先做目标检测和 3D 定位提示,再做单臂辅助,最后做双臂任务分配和任务级状态机。
## 常见问题
`launcher_ui.py` 提示找不到 `install/setup.bash`
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
colcon build --symlink-install
source install/setup.bash
colcon test --event-handlers console_direct+
colcon test-result --verbose
```
真机模式提示缺少 `Robotic_Arm`
涉及遥操作姿态控制时,额外运行
```text
未安装睿尔曼 Python API2。请安装厂商 SDK,或用 use_mock:=true 先跑模拟模式。
```bash
pytest src/xr_rm_teleop/test/test_orientation_control.py
```
Controller topic 没有数据:
- 确认 UDP 发送端目标 IP 是运行 ROS2 的主机 IP。
- 确认端口是 `15000`,或 launch 与发送端端口一致。
-`sample_udp_sender` 在本机验证接收链路。
- 如果 Unity HUD 显示某个手柄 `invalid none`ROS 侧会把该手柄 `grip` 强制置为 `false`
机械臂不动:
- 确认 `grip=true`
- 确认 `udp_controller_receiver` 终端没有持续 `pose_valid=false` 日志;该字段不会写入 `XrController` 消息,但会让接收端强制停止。
- 确认 `/xr_rm/<arm>/raw_target_pose``/xr_rm/<arm>/target_pose` 是否在变化。
- 确认 `/xr_rm/<arm>/target_clamped` 是否持续为 `true`,如果是,目标 TCP 可能被工作空间、圆柱半径或单帧步长限制夹住。
- 确认真机 SDK 连接成功,且 RM75 没有报警或急停。
真机验证不属于自动测试。默认使用 `use_mock:=true`,未经现场安全确认不要连接或
移动机械臂。
@@ -46,7 +46,7 @@
- 修改:`xr_rm_teleop/test/test_joint_control.py:206`
- 测试:`xr_rm_teleop/test/test_joint_control.py`
- [ ] **步骤 1:在现有首周期加速度测试后增加固定目标测试**
- [x] **步骤 1:在现有首周期加速度测试后增加固定目标测试**
增加以下测试:
@@ -90,7 +90,7 @@ def test_joint_command_step_brakes_before_fixed_target_without_overshoot() -> No
该测试同时覆盖正负方向、不同目标距离、最大速度、最大加速度、禁止越过固定目标
和最终停止。
- [ ] **步骤 2:运行新增测试并确认失败**
- [x] **步骤 2:运行新增测试并确认失败**
运行:
@@ -113,7 +113,7 @@ PYTHONPATH="/home/robot/WS_xr/src/xr_rm_teleop:${PYTHONPATH:-}" \
`xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py:1232-1263`
- 测试:`xr_rm_teleop/test/test_joint_control.py`
- [ ] **步骤 1:用离散制动逻辑替换现有限幅计算**
- [x] **步骤 1:用离散制动逻辑替换现有限幅计算**
保留方法签名和现有长度、参数校验,将
`desired_velocity = np.clip(...)` 到返回值的部分替换为:
@@ -188,7 +188,7 @@ PYTHONPATH="/home/robot/WS_xr/src/xr_rm_teleop:${PYTHONPATH:-}" \
不要增加 ROS 参数或辅助类。制动距离直接使用当前方法已有的
`max_acceleration``max_speed``dt`
- [ ] **步骤 2:运行新增测试并确认通过**
- [x] **步骤 2:运行新增测试并确认通过**
运行:
@@ -202,7 +202,7 @@ PYTHONPATH="/home/robot/WS_xr/src/xr_rm_teleop:${PYTHONPATH:-}" \
预期:`PASS`
- [ ] **步骤 3:运行关节控制测试文件**
- [x] **步骤 3:运行关节控制测试文件**
运行:
@@ -222,7 +222,7 @@ PYTHONPATH="/home/robot/WS_xr/src/xr_rm_teleop:${PYTHONPATH:-}" \
- 不修改文件。
- [ ] **步骤 1:运行 `xr_rm_teleop` 全部测试**
- [x] **步骤 1:运行 `xr_rm_teleop` 全部测试**
运行:
@@ -230,13 +230,13 @@ PYTHONPATH="/home/robot/WS_xr/src/xr_rm_teleop:${PYTHONPATH:-}" \
source /opt/ros/humble/setup.bash
export RM75_TEST_PYTHONPATH="/home/robot/WS_xr/src/xr_rm_teleop:/home/robot/miniconda3/envs/xr/lib/python3.10/site-packages:/home/robot/miniconda3/envs/xr/lib/python3.10/site-packages/cmeel.prefix/lib/python3.10/site-packages"
PYTHONPATH="${RM75_TEST_PYTHONPATH}:${PYTHONPATH:-}" \
/home/robot/miniconda3/envs/xr/bin/python -m pytest \
python3 -m pytest \
src/xr_rm_teleop/test -v
```
预期:全部测试通过,无失败;真实 Placo 回归测试必须执行,不能因缺少模块而跳过。
- [ ] **步骤 2:单独运行姿态控制测试**
- [x] **步骤 2:单独运行姿态控制测试**
运行:
@@ -249,7 +249,7 @@ PYTHONPATH="/home/robot/WS_xr/src/xr_rm_teleop:${PYTHONPATH:-}" \
预期:全部通过。
- [ ] **步骤 3:构建工作空间**
- [x] **步骤 3:构建工作空间**
运行:
@@ -261,7 +261,7 @@ colcon build --symlink-install
预期:`xr_rm_input``xr_rm_interfaces``xr_rm_teleop``xr_rm_bringup`
全部构建成功。
- [ ] **步骤 4:使用 mock 启动右臂统一 launch**
- [x] **步骤 4:使用 mock 启动右臂统一 launch**
运行:
@@ -279,7 +279,7 @@ timeout 10s ros2 launch xr_rm_bringup arm_debug.launch.py \
- 不连接厂商 SDK,不发送真实 CANFD;
-`timeout` 主动结束产生的退出状态外,没有 Python 异常或 ROS 错误。
- [ ] **步骤 5:检查最终差异**
- [x] **步骤 5:检查最终差异**
运行:
@@ -0,0 +1,352 @@
# RM75 QP 与 UDP 反馈周期修复实施计划
> **供代理执行:** 必须使用 `superpowers:subagent-driven-development`(推荐)或
> `superpowers:executing-plans` 子技能,按任务逐项实施。步骤使用复选框
>`- [ ]`)跟踪。
**目标:** 将 QP 位置收敛阈值调整为 2 mm,并把项目配置的毫秒周期正确换算为
睿尔曼 SDK 的 5 ms 周期单位,从根因上降低误触发 UDP 反馈超时的概率。
**架构:** 保持 ROS 参数和 YAML 中 `realtime_push_cycle_ms` 的毫秒语义,仅在
`RealManAdapter.connect()` 的 SDK 边界执行单位换算。QP 只调整现有位置收敛常量;
反馈超时状态机保持不变,只在首次超时日志中增加实际反馈年龄。
**技术栈:** Python 3.10、ROS2 Humble、pytest、ament/colcon、睿尔曼 Python
API2、Placo 0.9.4。
---
## 文件范围
- 修改 `xr_rm_teleop/xr_rm_teleop/placo_ik_solver.py`QP 位置收敛阈值。
- 修改 `xr_rm_teleop/test/test_placo_transforms.py`1.5 mm 近收敛结果测试。
- 修改 `xr_rm_teleop/xr_rm_teleop/realman_adapter.py`:毫秒到 SDK 周期单位换算。
- 修改 `xr_rm_teleop/test/test_initial_joint_pose.py`5 ms、10 ms 换算测试。
- 修改 `xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py`:超时日志增加年龄。
- 修改 `xr_rm_teleop/test/test_joint_control.py`:超时年龄日志测试。
- 不修改 YAML、launch、UI、消息定义或依赖。
## 测试环境
所有命令从工作空间根目录 `/home/robot/WS_xr` 执行:
```bash
source /opt/ros/humble/setup.bash
export PYTHONPATH=/home/robot/WS_xr/src/xr_rm_teleop:/home/robot/miniconda3/envs/xr/lib/python3.10/site-packages:/home/robot/miniconda3/envs/xr/lib/python3.10/site-packages/cmeel.prefix/lib/python3.10/site-packages:${PYTHONPATH}
```
### 任务 1:接受 2 mm 内的 QP 位置残差
**文件:**
- 修改:`xr_rm_teleop/test/test_placo_transforms.py`
- 修改:`xr_rm_teleop/xr_rm_teleop/placo_ik_solver.py:14`
- [ ] **步骤 1:编写 1.5 mm 近收敛结果的失败测试**
`test_placo_transforms.py` 的 QP 测试附近增加:
```python
def test_qp_solve_accepts_position_error_within_two_millimeters() -> None:
solver = object.__new__(PlacoIkSolver)
solver._actual_joints = np.zeros(7)
solver._robot = SimpleNamespace(
state=SimpleNamespace(q=np.zeros(14))
)
solver._frame_task = SimpleNamespace(T_world_frame=None)
solver._target_errors = lambda: (1.5e-3, 0.0)
result = solver.solve(np.eye(4))
assert result == pytest.approx([0.0] * 7)
```
并在文件顶部加入现有标准库类型:
```python
from types import SimpleNamespace
```
同时从 `placo_ik_solver` 导入现有收敛常量:
```python
from xr_rm_teleop.placo_ik_solver import (
QP_POSITION_TOLERANCE_M,
PlacoIkSolver,
_validated_transform,
)
```
将真实 Placo 可达目标测试的位置断言改为引用同一收敛常量:
```python
assert position_error <= QP_POSITION_TOLERANCE_M
```
再增加超过 2 mm 时仍拒绝结果的边界测试:
```python
def test_qp_solve_rejects_position_error_above_two_millimeters() -> None:
solver = object.__new__(PlacoIkSolver)
solver._actual_joints = np.zeros(7)
solver._robot = SimpleNamespace(
state=SimpleNamespace(q=np.zeros(14)),
update_kinematics=lambda: None,
)
solver._frame_task = SimpleNamespace(T_world_frame=None)
solver._solver = SimpleNamespace(solve=lambda update: None)
solver._validate_result = lambda result, previous: None
solver._target_errors = lambda: (2.1e-3, 0.0)
with pytest.raises(RuntimeError, match="QP did not converge after 30"):
solver.solve(np.eye(4))
```
- [ ] **步骤 2:运行测试并确认当前实现失败**
```bash
python3 -m pytest src/xr_rm_teleop/test/test_placo_transforms.py::test_qp_solve_accepts_position_error_within_two_millimeters -q
```
预期:失败;当前 1 mm 阈值不会直接接收 1.5 mm 残差,测试对象缺少后续 QP
求解器。
- [ ] **步骤 3:最小修改 QP 位置阈值**
`placo_ik_solver.py` 修改现有常量:
```python
QP_POSITION_TOLERANCE_M = 2e-3
```
保留 `QP_MAX_ITERATIONS = 30`、姿态阈值、有限值检查、关节位置和速度限制不变。
- [ ] **步骤 4:运行局部测试并确认通过**
```bash
python3 -m pytest src/xr_rm_teleop/test/test_placo_transforms.py -q
```
预期:该文件全部测试通过;1.5 mm 残差被接受,2.1 mm 残差仍在 30 次后被拒绝。
- [ ] **步骤 5:提交 QP 修改**
```bash
git add src/xr_rm_teleop/xr_rm_teleop/placo_ik_solver.py src/xr_rm_teleop/test/test_placo_transforms.py
git commit -m "fix: 放宽 RM75 QP 位置收敛阈值"
```
### 任务 2:修正睿尔曼 UDP 实时上报周期单位
**文件:**
- 修改:`xr_rm_teleop/test/test_initial_joint_pose.py`
- 修改:`xr_rm_teleop/xr_rm_teleop/realman_adapter.py:190-196`
- [ ] **步骤 1:将现有连接测试改为周期换算参数化测试**
`test_connect_configures_udp_feedback_and_waits_for_first_frame` 改为:
```python
@pytest.mark.parametrize(
("cycle_ms", "sdk_cycle"),
[(5, 1), (10, 2)],
)
def test_connect_converts_udp_feedback_cycle_to_sdk_units(
monkeypatch,
cycle_ms,
sdk_cycle,
) -> None:
fake_sdk = _install_fake_sdk(monkeypatch)
adapter = RealManAdapter(
"127.0.0.1",
8080,
0,
"192.168.192.148",
8090,
realtime_push_cycle_ms=cycle_ms,
configure_safety_limits=False,
)
adapter.connect()
arm = fake_sdk.RoboticArm.instance
assert arm is not None
assert arm.config.args == (
sdk_cycle,
True,
8090,
0,
"192.168.192.148",
)
assert arm.callback is adapter._realtime_callback
assert adapter.get_latest_joint_state() is not None
assert not hasattr(adapter, "_feedback_thread")
```
- [ ] **步骤 2:运行参数化测试并确认当前实现失败**
```bash
python3 -m pytest src/xr_rm_teleop/test/test_initial_joint_pose.py::test_connect_converts_udp_feedback_cycle_to_sdk_units -q
```
预期:两个用例均失败;当前代码把 5 和 10 直接传给 SDK,而预期分别为 1 和 2。
- [ ] **步骤 3:在 SDK 边界执行单位换算**
`RealManAdapter.connect()` 创建 `rm_realtime_push_config_t` 时修改第一个参数:
```python
config = rm_realtime_push_config_t(
self._realtime_push_cycle_ms // 5,
True,
self._realtime_push_port,
0,
self._realtime_push_host_ip,
)
```
构造函数已有“正的 5 ms 整数倍”校验,因此不新增辅助函数或重复校验。启动日志继续
输出项目参数的真实毫秒值。
- [ ] **步骤 4:运行适配器测试并确认通过**
```bash
python3 -m pytest src/xr_rm_teleop/test/test_initial_joint_pose.py -q
```
预期:该文件全部测试通过;mock 测试仍不依赖厂商 SDK。
- [ ] **步骤 5:提交周期换算修改**
```bash
git add src/xr_rm_teleop/xr_rm_teleop/realman_adapter.py src/xr_rm_teleop/test/test_initial_joint_pose.py
git commit -m "fix: 修正 RM75 UDP 上报周期单位"
```
### 任务 3:在 UDP 超时日志中打印反馈年龄
**文件:**
- 修改:`xr_rm_teleop/test/test_joint_control.py`
- 修改:`xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py:1036-1044`
- [ ] **步骤 1:扩展现有短暂超时测试,捕获并断言日志**
`test_short_udp_timeout_repeats_last_limited_target_without_query` 中创建遥操对象后加入:
```python
warnings = []
teleop.get_logger = lambda: SimpleNamespace(
warn=lambda message: warnings.append(message)
)
```
在现有断言末尾加入:
```python
assert warnings == [
"right_rm75 UDP关节反馈超时(age=200.0 ms),保持最后安全目标。"
]
```
- [ ] **步骤 2:运行测试并确认当前实现失败**
```bash
python3 -m pytest src/xr_rm_teleop/test/test_joint_control.py::test_short_udp_timeout_repeats_last_limited_target_without_query -q
```
预期:失败;当前日志中没有 `age=200.0 ms`
- [ ] **步骤 3:给首次超时警告增加实际反馈年龄**
`_handle_stale_joint_feedback()` 中仅修改现有警告:
```python
self.get_logger().warn(
f"{self._arm_name} UDP关节反馈超时"
f"age={age * 1000.0:.1f} ms),保持最后安全目标。"
)
```
不改变 `_joint_feedback_ready` 的一次性日志条件、最后安全目标重发、500 ms
重新同步、Grip 重使能和故障锁存逻辑。
- [ ] **步骤 4:运行关节控制测试并确认通过**
```bash
python3 -m pytest src/xr_rm_teleop/test/test_joint_control.py -q
```
预期:该文件全部测试通过。
- [ ] **步骤 5:提交诊断日志修改**
```bash
git add src/xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py src/xr_rm_teleop/test/test_joint_control.py
git commit -m "fix: 补充 RM75 UDP 超时反馈年龄"
```
### 任务 4:完整回归与 mock 启动验证
**文件:**
- 不修改生产代码。
- [ ] **步骤 1:运行 `xr_rm_teleop` 全部测试**
```bash
python3 -m pytest src/xr_rm_teleop/test -q
```
预期:全部通过,无失败或错误。
- [ ] **步骤 2:单独运行姿态控制测试**
```bash
python3 -m pytest src/xr_rm_teleop/test/test_orientation_control.py -q
```
预期:全部通过。
- [ ] **步骤 3:构建完整工作空间**
```bash
colcon build --symlink-install
```
预期:`xr_rm_interfaces``xr_rm_input``xr_rm_teleop``xr_rm_bringup`
全部构建成功。
- [ ] **步骤 4:使用右臂 mock 启动统一 launch**
```bash
timeout 15s ros2 launch xr_rm_bringup arm_debug.launch.py arm:=right use_mock:=true
```
预期:节点正常启动,无 Python 异常或厂商 SDK 导入错误;因 `timeout` 主动终止,
命令退出码可以是 124。禁止将 `use_mock` 改为 `false`
- [ ] **步骤 5:检查最终差异**
```bash
git status --short
git diff HEAD~3 --check
git diff HEAD~3 --stat
```
预期:除本实施计划文档外,代码差异仅包含计划列出的 6 个代码/测试文件;无空白
错误,不包含 YAML、launch、UI、依赖或用户其他改动。
## 真机验收
自动验证完成后,由用户在安全条件下启动真机右臂模式并观察:
1. `feedback_interval mean` 从约 25 ms 降到接近 5 ms
2. 正常遥操不再频繁触发 `UDP关节反馈超时`
3. 反馈确实超过 120 ms 时,日志显示实际 `age`,且仍保持最后安全目标;
4. 位置残差小于 2 mm 时不再出现 QP 未收敛警告;
5. 若仍频繁出现超过 120 ms 的中断,保留当前阈值,依据日志继续排查网络、SDK
回调或控制器固件。
@@ -0,0 +1,650 @@
# XRoboToolkit 手柄输入扩展 Implementation Plan
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
**Goal:** 将 XRoboToolkit 左右手柄摇杆、主键和副键加入现有 `XrController` 链路,同时保持 Grip、Trigger、位姿和遥操作行为不变。
**Architecture:** 直接扩展现有 ROS2 消息,继续使用当前 bridge 的嵌套 UDP `buttons` 结构,由 receiver 将按钮展平到消息字段。新增字段按可选输入解析,旧数据包或非法新增字段回退到安全默认值,不新增话题、依赖或控制分支。
**Tech Stack:** Ubuntu 22.04、ROS2 Humble、Python 3.10、ament/colcon、pytest、XRoboToolkit PC-Service Python binding。
## Global Constraints
- 所有构建、测试和运行命令在 `/home/robot/WS_xr` 执行,并先运行 `source /opt/ros/humble/setup.bash`
- `XrController.msg` 的字段和顺序必须与批准的设计完全一致,不增加菜单键、摇杆按键、模拟 Grip/Trigger、SDK 时间戳或序号。
- 保持现有 `grip``trigger``pose` 语义及控制行为不变。
- 不新增依赖、ROS2 话题、节点或 LeRobot 录制实现。
- 不修改 `xr_rm_teleop` 控制代码、机械臂 YAML、安全限位、超时或停止逻辑。
- 启动验证只使用 `use_mock:=true`,不得连接真机、移动机械臂或操作夹爪。
- 新增和修改的 Markdown 文档使用中文。
- Superpowers 工作流只允许创建本地 Git 提交;禁止 push、合并本地分支、合并 PR 或执行任何远程写操作。
- 每次提交只暂存当前任务列出的文件,不包含用户的其他工作区改动。
---
### Task 1: 扩展 `XrController` 消息接口
**Files:**
- Modify: `src/xr_rm_interfaces/msg/XrController.msg`
**Interfaces:**
- Consumes: 现有 `std_msgs/Header``geometry_msgs/Pose``hand/grip/trigger/pose` 字段。
- Produces: `XrController.primary: bool``secondary: bool``axis: float32[2]`,供 Task 2 的 receiver 赋值。
- [ ] **Step 1: 记录旧接口缺少新增字段**
在工作空间根目录执行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
source install/setup.bash
python3 - <<'PY'
from xr_rm_interfaces.msg import XrController
expected = [
"header",
"hand",
"grip",
"trigger",
"primary",
"secondary",
"axis",
"pose",
]
actual = list(XrController.get_fields_and_field_types())
assert actual == expected, actual
PY
```
Expected: FAIL;旧接口输出
`['header', 'hand', 'grip', 'trigger', 'pose']`
- [ ] **Step 2: 用批准的顺序修改消息定义**
`src/xr_rm_interfaces/msg/XrController.msg` 完整替换为:
```text
std_msgs/Header header
string hand
bool grip
float32 trigger
bool primary
bool secondary
float32[2] axis
geometry_msgs/Pose pose
```
- [ ] **Step 3: 构建消息包**
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
colcon build --symlink-install --packages-select xr_rm_interfaces
```
Expected: `xr_rm_interfaces` 构建成功,无 rosidl 错误。
- [ ] **Step 4: 验证生成接口字段和顺序**
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
source install/setup.bash
python3 - <<'PY'
from xr_rm_interfaces.msg import XrController
expected = [
"header",
"hand",
"grip",
"trigger",
"primary",
"secondary",
"axis",
"pose",
]
actual = list(XrController.get_fields_and_field_types())
assert actual == expected, actual
assert XrController.get_fields_and_field_types()["axis"] == "float[2]"
PY
```
Expected: PASS,无输出。
- [ ] **Step 5: 提交消息接口**
```bash
cd /home/robot/WS_xr/src
git add xr_rm_interfaces/msg/XrController.msg
git commit -m "feat: 扩展 XR 手柄消息"
```
Expected: 只提交 `XrController.msg`;不执行 push 或 merge。
---
### Task 2: 透传摇杆与主副按键
**Files:**
- Create: `src/xr_rm_input/test/test_controller_fields.py`
- Modify: `src/xr_rm_input/xr_rm_input/xrobotoolkit_to_udp_bridge.py`
- Modify: `src/xr_rm_input/xr_rm_input/udp_controller_receiver.py`
**Interfaces:**
- Consumes: Task 1 生成的 `XrController.primary``secondary``axis`
- Produces:
- `_buttons_payload(*, primary: Callable[[], Any], secondary: Callable[[], Any]) -> dict[str, bool]`
- `_controller_payload(*, hand: str, pose: Any, axis: Any, buttons: dict[str, bool], grip_pressed: bool, trigger_pressed: bool, pose_valid: bool = True) -> dict[str, Any]`
- `UdpControllerReceiver._optional_axis(value: Any) -> list[float]`
- `UdpControllerReceiver._optional_buttons(value: Any) -> tuple[bool, bool]`
- [ ] **Step 1: 新增失败测试**
创建 `src/xr_rm_input/test/test_controller_fields.py`
```python
import math
from types import SimpleNamespace
from builtin_interfaces.msg import Time
from xr_rm_input.udp_controller_receiver import UdpControllerReceiver
from xr_rm_input.xrobotoolkit_to_udp_bridge import (
_buttons_payload,
_controller_payload,
_stop_controller_payload,
)
def _receiver_without_socket() -> UdpControllerReceiver:
receiver = object.__new__(UdpControllerReceiver)
receiver._quat_order = "xyzw"
receiver.get_clock = lambda: SimpleNamespace(
now=lambda: SimpleNamespace(to_msg=lambda: Time())
)
return receiver
def test_bridge_payload_contains_only_selected_controller_inputs() -> None:
buttons = _buttons_payload(
primary=lambda: True,
secondary=lambda: False,
)
payload = _controller_payload(
hand="left",
pose=[1.0, 2.0, 3.0, 0.0, 0.0, 0.0, 1.0],
axis=[2.0, -2.0],
buttons=buttons,
grip_pressed=True,
trigger_pressed=False,
)
assert payload == {
"hand": "left",
"grip": True,
"trigger": 0.0,
"pos": [1.0, 2.0, 3.0],
"quat": [0.0, 0.0, 0.0, 1.0],
"pose_valid": True,
"pose_source": "xrobotoolkit",
"axis": [1.0, -1.0],
"buttons": {
"primary": True,
"secondary": False,
},
}
def test_stop_payload_uses_neutral_selected_inputs() -> None:
payload = _stop_controller_payload("right")
assert payload["axis"] == [0.0, 0.0]
assert payload["buttons"] == {
"primary": False,
"secondary": False,
}
assert "grip_value" not in payload
assert "trigger_value" not in payload
def test_receiver_publishes_selected_controller_inputs() -> None:
msg = _receiver_without_socket()._payload_to_msg(
{
"grip": True,
"trigger": 1.0,
"axis": [2.0, -2.0],
"buttons": {
"primary": True,
"secondary": False,
},
"pos": [1.0, 2.0, 3.0],
"quat": [0.0, 0.0, 0.0, 1.0],
},
"left",
)
assert msg.primary is True
assert msg.secondary is False
assert list(msg.axis) == [1.0, -1.0]
def test_receiver_defaults_invalid_optional_inputs() -> None:
msg = _receiver_without_socket()._payload_to_msg(
{
"grip": True,
"trigger": 0.4,
"axis": [math.nan, 0.0],
"buttons": [],
"pos": [1.0, 2.0, 3.0],
"quat": [0.0, 0.0, 0.0, 1.0],
},
"right",
)
assert msg.primary is False
assert msg.secondary is False
assert list(msg.axis) == [0.0, 0.0]
assert msg.grip is True
assert abs(msg.trigger - 0.4) < 1e-6
assert msg.pose.position.x == 1.0
assert msg.pose.position.y == 2.0
assert msg.pose.position.z == 3.0
def test_receiver_defaults_missing_legacy_optional_inputs() -> None:
msg = _receiver_without_socket()._payload_to_msg(
{
"grip": True,
"trigger": 0.0,
"pos": [0.0, 1.0, 0.0],
"quat": [0.0, 0.0, 0.0, 1.0],
},
"left",
)
assert msg.primary is False
assert msg.secondary is False
assert list(msg.axis) == [0.0, 0.0]
assert msg.grip is True
```
- [ ] **Step 2: 运行测试并确认失败**
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
source install/setup.bash
pytest src/xr_rm_input/test/test_controller_fields.py -v
```
Expected: FAIL;旧 `_buttons_payload` 仍要求 `grip/menu/axis_click`,且 receiver
尚无 `_optional_axis``_optional_buttons`
- [ ] **Step 3: 精简 bridge payload**
`xrobotoolkit_to_udp_bridge.py` 中将 `_controller_payload` 改为:
```python
def _controller_payload(
*,
hand: str,
pose: Any,
axis: Any,
buttons: dict[str, bool],
grip_pressed: bool,
trigger_pressed: bool,
pose_valid: bool = True,
) -> dict[str, Any]:
pos, quat = (
_pose_to_pos_quat(pose)
if pose_valid
else (ZERO_POS.copy(), IDENTITY_QUAT.copy())
)
return {
"hand": hand,
"grip": pose_valid and grip_pressed,
"trigger": 1.0 if pose_valid and trigger_pressed else 0.0,
"pos": pos,
"quat": quat,
"pose_valid": pose_valid,
"pose_source": POSE_SOURCE,
"axis": _safe_axis(axis),
"buttons": buttons,
}
```
`_stop_controller_payload` 的输入部分改为:
```python
"axis": [0.0, 0.0],
"buttons": {
"primary": False,
"secondary": False,
},
```
并删除 `grip_value``trigger_value``buttons.grip``buttons.menu`
`buttons.axis_click` 输出。
`_buttons_payload` 改为:
```python
def _buttons_payload(
*,
primary: Callable[[], Any],
secondary: Callable[[], Any],
) -> dict[str, bool]:
return {
"primary": _safe_bool(primary),
"secondary": _safe_bool(secondary),
}
```
修改主循环的左手调用:
```python
"left": _controller_payload(
hand="left",
pose=xrt.get_left_controller_pose(),
axis=xrt.get_left_axis(),
buttons=_buttons_payload(
primary=xrt.get_X_button,
secondary=xrt.get_Y_button,
),
grip_pressed=left_grip,
trigger_pressed=left_trigger,
),
```
修改主循环的右手调用:
```python
"right": _controller_payload(
hand="right",
pose=xrt.get_right_controller_pose(),
axis=xrt.get_right_axis(),
buttons=_buttons_payload(
primary=xrt.get_A_button,
secondary=xrt.get_B_button,
),
grip_pressed=right_grip,
trigger_pressed=right_trigger,
),
```
保留主循环中 `get_left/right_grip()``get_left/right_trigger()` 和现有滞回
开关;仅从 `_controller_payload` 参数及 UDP 输出中删除原始模拟量。
- [ ] **Step 4: 为 receiver 增加容错解析**
`udp_controller_receiver.py` 导入区增加:
```python
import math
```
`_payload_to_msg` 中读取新增可选字段:
```python
axis = self._optional_axis(payload.get("axis"))
primary, secondary = self._optional_buttons(payload.get("buttons"))
```
在现有 `msg.grip``msg.trigger` 赋值后加入:
```python
msg.primary = primary
msg.secondary = secondary
msg.axis = axis
```
`_vector3` 附近增加两个无状态解析方法:
```python
@staticmethod
def _optional_axis(value: Any) -> list[float]:
try:
axis = [float(item) for item in value]
except (TypeError, ValueError):
return [0.0, 0.0]
if len(axis) != 2 or not all(math.isfinite(item) for item in axis):
return [0.0, 0.0]
return [
min(max(axis[0], -1.0), 1.0),
min(max(axis[1], -1.0), 1.0),
]
@classmethod
def _optional_buttons(cls, value: Any) -> tuple[bool, bool]:
if not isinstance(value, Mapping):
return False, False
return (
cls._as_bool(value.get("primary", False)),
cls._as_bool(value.get("secondary", False)),
)
```
不要把新增字段加入现有 pose 诊断条件;它们无效时不得改变 `grip`
- [ ] **Step 5: 运行新增测试**
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
source install/setup.bash
pytest src/xr_rm_input/test/test_controller_fields.py -v
```
Expected: `5 passed`
- [ ] **Step 6: 运行 Python 语法检查**
```bash
cd /home/robot/WS_xr
python3 -m py_compile \
src/xr_rm_input/xr_rm_input/xrobotoolkit_to_udp_bridge.py \
src/xr_rm_input/xr_rm_input/udp_controller_receiver.py \
src/xr_rm_input/test/test_controller_fields.py
```
Expected: PASS,无输出。
- [ ] **Step 7: 提交 bridge、receiver 和测试**
```bash
cd /home/robot/WS_xr/src
git add \
xr_rm_input/xr_rm_input/xrobotoolkit_to_udp_bridge.py \
xr_rm_input/xr_rm_input/udp_controller_receiver.py \
xr_rm_input/test/test_controller_fields.py
git commit -m "feat: 发布 XR 手柄摇杆与按键"
```
Expected: 只提交列出的三个文件;不执行 push 或 merge。
---
### Task 3: 更新文档并完成工作空间验证
**Files:**
- Modify: `src/README.md`
- Modify: `src/AGENTS.md`
**Interfaces:**
- Consumes: Task 1 的最终 `XrController` 格式和 Task 2 的 UDP JSON。
- Produces: 当前手柄接口说明,以及对后续 Superpowers 任务生效的本地 Git 边界。
- [ ] **Step 1: 更新 README 的 Git 约束**
在 README 的环境准备之前增加:
```markdown
## Superpowers Git 约束
使用 Superpowers 执行任务时,只允许按 skill 工作流创建本地 Git 提交。
禁止执行 `git push`、合并本地分支、合并 PR 或其他远程写操作。skill 如需
独立 worktree 或配套本地分支,可以创建,但不得将其合并到其他分支。
```
- [ ] **Step 2: 更新 README 的当前 UDP 示例**
先修正 README 顶部的当前范围和项目结构:
- 将“自定义 PICO 4 Ultra UDP Sender Unity 工程”完成项替换为
“XRoboToolkit bridge 读取左右手柄 pose、Grip、Trigger、摇杆和主副按键”。
- 从项目结构树删除当前仓库中不存在的
`docs/pico_udp_sender_ubuntu22_setup.md` 和整个 `unity/` 子树。
- 保留官方 XRoboToolkit APK、PC-Service、`PXREAClientUnity`
`RobotLinuxDemo` 的运行说明;这些是外部工具,不是仓库内已删除的 Unity 工程。
将“UDP 数据格式”开头改为“当前 XRoboToolkit bridge 每个周期发送一个双手柄
JSON 包”,并将示例替换为:
```json
{
"t": 12.345,
"source_time": 12.345,
"seq": 42,
"frame_id": "xr_world",
"controllers": {
"left": {
"hand": "left",
"grip": true,
"trigger": 0.0,
"axis": [0.2, -0.4],
"buttons": {
"primary": true,
"secondary": false
},
"pos": [-0.12, 1.05, 0.30],
"quat": [0.0, 0.0, 0.0, 1.0],
"pose_valid": true,
"pose_source": "xrobotoolkit"
},
"right": {
"hand": "right",
"grip": true,
"trigger": 1.0,
"axis": [-0.1, 0.3],
"buttons": {
"primary": false,
"secondary": true
},
"pos": [0.12, 1.05, 0.30],
"quat": [0.0, 0.0, 0.0, 1.0],
"pose_valid": true,
"pose_source": "xrobotoolkit"
}
}
}
```
字段说明更新为:
```markdown
- `t` / `source_time`:bridge 的 PC 单调时间,用于诊断发送周期。
- `seq`bridge 递增的 UDP 包序号,bridge 重启后重新计数。
- `frame_id`:默认 `xr_world`,会写入 `XrController.header.frame_id`
- `grip`:运动使能。`true` 时进入相对位姿控制,`false` 时停止。
- `trigger`:经过 bridge 滞回处理的 `0.0/1.0` 值;上升沿切换对应夹爪状态。
- `axis`:摇杆 `[x, y]`,每个分量限制在 `-1.0``1.0`
- `buttons.primary`:左手 X 键或右手 A 键。
- `buttons.secondary`:左手 Y 键或右手 B 键。
- `pos`:手柄位置,长度 3。
- `quat`:手柄姿态四元数,默认按 `xyzw` 解析。
- `pose_valid`:姿态是否可信;`false` 时接收端强制 `grip=false`
- `pose_source`:当前 bridge 使用 `xrobotoolkit`
```
补充说明:`axis``buttons.primary``buttons.secondary` 会进入
`XrController`;旧 UDP 包缺少这些字段时分别回退为 `[0,0]``false`
`false`。删除已经不存在的自定义 Unity 工程和安装文档链接,但保留 receiver
对旧格式字段的兼容说明。
将故障排查中的旧 Unity HUD 提示替换为:
```markdown
- 确认 `xrobotoolkit_to_udp_bridge` 没有持续打印 SDK read failedSDK
读取失败时 bridge 会发送 `pose_valid=false` 的停止包。
```
- [ ] **Step 3: 更新 AGENTS 的 Superpowers Git 规则**
将 AGENTS“Git 与提交”中的 Superpowers 段落改为:
```markdown
使用 Superpowers 执行任务时,只允许按相关 skill 工作流创建本地 Git 提交;
禁止执行 `git push`、合并本地分支、合并 PR 或其他远程写操作。相关 skill
如需独立 worktree 或配套本地分支,可以创建,但不得将其合并到其他分支。
其他情况下,除非用户明确要求,不要自动创建分支。
```
- [ ] **Step 4: 运行输入包测试**
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
source install/setup.bash
pytest src/xr_rm_input/test/test_controller_fields.py -v
```
Expected: `5 passed`
- [ ] **Step 5: 运行完整工作空间构建**
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
colcon build --symlink-install
```
Expected: `xr_rm_interfaces``xr_rm_input``xr_rm_teleop`
`xr_rm_bringup` 全部构建成功。
- [ ] **Step 6: 重新 source 后验证接口和遥操作回归**
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
source install/setup.bash
ros2 interface show xr_rm_interfaces/msg/XrController
pytest src/xr_rm_teleop/test/test_orientation_control.py -v
```
Expected: 接口按 `header/hand/grip/trigger/primary/secondary/axis/pose` 顺序
显示;姿态控制测试全部通过。
- [ ] **Step 7: 使用 mock 验证统一启动入口**
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
source install/setup.bash
timeout --signal=INT 8s ros2 launch xr_rm_bringup arm_debug.launch.py \
arm:=right use_mock:=true
```
Expected: `udp_controller_receiver``single_arm_velocity_teleop` 正常启动;
不出现消息类型、Placo 或 traceback 错误。`timeout` 到期退出属于预期。
- [ ] **Step 8: 检查 diff 和格式**
```bash
cd /home/robot/WS_xr/src
git diff --check
git status --short
```
Expected: `git diff --check` 无输出;只剩 README、AGENTS 的计划内文档改动。
- [ ] **Step 9: 提交文档**
```bash
cd /home/robot/WS_xr/src
git add README.md AGENTS.md
git commit -m "docs: 更新手柄输入与 Superpowers 规则"
```
Expected: 只提交 README 和 AGENTS;不执行 push 或 merge。
@@ -0,0 +1,486 @@
# 手柄主键回初始位姿实施计划
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
**Goal:** 左手 X 键和右手 A 键分别让对应机械臂安全回到配置的初始关节位姿,并同步三份机械臂配置中的新关节角。
**Architecture:** 继续使用现有左右手柄独立话题和单臂遥操作节点,不增加协调节点。遥操作节点检测自身 `XrController.primary` 的上升沿,先停止当前遥操作,再调用真机或 mock 适配器的同名回位方法并重新同步关节状态。
**Tech Stack:** Ubuntu 22.04、ROS2 Humble、Python 3、rclpy、pytest、ament/colcon、RealMan Python API2(仅真机运行时)。
## 全局约束
- 构建、测试和运行命令在 `/home/robot/WS_xr` 执行,并先运行 `source /opt/ros/humble/setup.bash`
- 所有自动验证使用 mock 或假对象,不连接真机、不移动机械臂、不操作夹爪。
- 保留工作空间与圆柱限位、线速度与角速度限制、指令超时和安全停止逻辑。
- `configure_safety_limits` 保持启用;`move_to_initial_pose_on_connect` 默认值保持 `false`
- mock 模式不得导入或依赖睿尔曼厂商 SDK,不新增 RealMan 连接。
- 只修改完成本功能所需文件,不新增依赖、节点、话题、服务或配置项。
- 左臂初始关节角(度):`[-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55]`
- 右臂初始关节角(度):`[-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35]`
---
### Task 1: 复用适配器初始位姿运动
**Files:**
- Modify: `src/xr_rm_teleop/xr_rm_teleop/realman_adapter.py:42-82`
- Modify: `src/xr_rm_teleop/xr_rm_teleop/realman_adapter.py:178-182`
- Modify: `src/xr_rm_teleop/xr_rm_teleop/realman_adapter.py:454-459`
- Test: `src/xr_rm_teleop/test/test_initial_joint_pose.py:13-35`
**Interfaces:**
- Consumes: 现有 `initial_joint_pose: list[float]`(度)和 `init_move_speed: int`
- Produces: `MockRealManAdapter.move_to_initial_pose() -> None`
- Produces: `RealManAdapter.move_to_initial_pose() -> None`
- [ ] **Step 1: 先写失败测试**
将真机测试改为调用公开方法,并增加 mock 恢复初始关节角的测试:
```python
def test_initial_pose_uses_joint_move_only() -> None:
class FakeArm:
def __init__(self) -> None:
self.calls = []
def rm_movej(self, *args):
self.calls.append(args)
return 0
joints = [-167.21, 28.48, 28.21, 61.35, -14.40, 84.49, -124.51]
adapter = RealManAdapter(
"127.0.0.1",
8080,
0,
"127.0.0.1",
8090,
initial_joint_pose=joints,
)
adapter._arm = FakeArm()
adapter.move_to_initial_pose()
assert adapter._arm.calls == [(joints, 20, 0, 0, 1)]
def test_mock_initial_pose_restores_configured_joints() -> None:
initial_degrees = [-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55]
adapter = MockRealManAdapter(initial_degrees)
adapter.send_joint_target([0.0] * 7, follow=False)
adapter.move_to_initial_pose()
assert adapter.read_joint_state().positions == pytest.approx(
[math.radians(value) for value in initial_degrees]
)
```
- [ ] **Step 2: 运行测试并确认按预期失败**
Run:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
python3 -m pytest src/xr_rm_teleop/test/test_initial_joint_pose.py \
-k 'initial_pose_uses_joint_move_only or mock_initial_pose_restores_configured_joints' -v
```
Expected: FAIL,两个适配器都还没有公开的 `move_to_initial_pose` 方法。
- [ ] **Step 3: 写最小实现**
在 mock 中保存初始弧度值并实现恢复:
```python
self._initial_joint_positions = [
math.radians(value) for value in initial_joint_degrees
]
self._joint_positions = list(self._initial_joint_positions)
```
```python
def move_to_initial_pose(self) -> None:
self._joint_positions = list(self._initial_joint_positions)
self.last_joint_target = list(self._joint_positions)
```
将真机 `_move_to_initial_pose` 改为公开方法,并保留原有阻塞式关节运动:
```python
def move_to_initial_pose(self) -> None:
self._require_arm()
if self._initial_joint_pose is None:
raise RuntimeError("启用初始位姿移动时必须配置 initial_joint_pose")
ret = self._arm.rm_movej(
self._initial_joint_pose,
self._init_move_speed,
0,
0,
1,
)
self._check_return(ret, "rm_movej(initial_joint_pose)")
```
同时把 `connect()` 中的启动回位调用改为:
```python
if self._move_to_initial_pose_on_connect:
self.move_to_initial_pose()
```
- [ ] **Step 4: 运行测试并确认通过**
Run:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
python3 -m pytest src/xr_rm_teleop/test/test_initial_joint_pose.py \
-k 'initial_pose_uses_joint_move_only or mock_initial_pose_restores_configured_joints' -v
```
Expected: PASS。
- [ ] **Step 5: 创建本地提交**
```bash
cd /home/robot/WS_xr/src
git add xr_rm_teleop/xr_rm_teleop/realman_adapter.py \
xr_rm_teleop/test/test_initial_joint_pose.py
git commit -m "feat: 复用适配器初始位姿运动"
```
### Task 2: 在遥操作节点处理主键上升沿
**Files:**
- Modify: `src/xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py:276-299`
- Modify: `src/xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py:514-534`
- Test: `src/xr_rm_teleop/test/test_joint_control.py:16-114`
**Interfaces:**
- Consumes: `XrController.primary: bool`
- Consumes: Task 1 的 `adapter.move_to_initial_pose() -> None`
- Produces: `SingleArmVelocityTeleop._handle_initial_pose_button(msg: XrController) -> None`
- [ ] **Step 1: 先写主键边沿失败测试**
`test_joint_control.py` 增加测试辅助函数和成功路径测试:
```python
def _primary_button_teleop(*, move_error=None):
events = []
errors = []
snapshot = JointStateSnapshot([0.2] * 7, time.monotonic())
class Adapter:
def move_to_initial_pose(self):
events.append("move")
if move_error is not None:
raise move_error
def read_joint_state(self):
events.append("read")
return snapshot
teleop = object.__new__(SingleArmVelocityTeleop)
teleop._arm_name = "right_rm75"
teleop._adapter = Adapter()
teleop._last_primary_pressed = None
teleop._grip_rearm_required = False
teleop._safe_stop = lambda reset_active: events.append(
("stop", reset_active)
)
teleop._reset_joint_state = lambda value: events.append(("sync", value))
teleop._handle_trigger_gripper = lambda msg: None
teleop.get_clock = lambda: SimpleNamespace(now=lambda: FakeTime())
teleop.get_logger = lambda: SimpleNamespace(
info=lambda message: None,
error=lambda message: errors.append(message),
)
return teleop, events, errors, snapshot
def test_primary_button_rising_edge_moves_once_and_resyncs() -> None:
teleop, events, _, snapshot = _primary_button_teleop()
released = SimpleNamespace(primary=False)
pressed = SimpleNamespace(primary=True)
teleop._on_controller(released)
teleop._on_controller(pressed)
teleop._on_controller(pressed)
teleop._on_controller(released)
teleop._on_controller(pressed)
expected_once = [
("stop", True),
"move",
"read",
("sync", snapshot),
]
assert events == expected_once * 2
assert teleop._grip_rearm_required
```
- [ ] **Step 2: 运行测试并确认按预期失败**
Run:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
python3 -m pytest src/xr_rm_teleop/test/test_joint_control.py \
-k primary_button_rising_edge_moves_once_and_resyncs -v
```
Expected: FAIL,因为 `_on_controller` 尚未处理 `primary`
- [ ] **Step 3: 写最小成功实现**
在节点状态中增加与现有 trigger 相同的首次采样保护:
```python
self._last_primary_pressed: bool | None = None
```
在现有回调中接入主键处理:
```python
def _on_controller(self, msg: XrController) -> None:
self._last_msg = msg
self._last_msg_time = self.get_clock().now()
self._handle_initial_pose_button(msg)
self._handle_trigger_gripper(msg)
```
增加主键上升沿处理;首次采样只建立状态,避免节点启动时按键已经按住而意外运动:
```python
def _handle_initial_pose_button(self, msg: XrController) -> None:
if self._last_primary_pressed is None:
self._last_primary_pressed = msg.primary
return
rising_edge = msg.primary and not self._last_primary_pressed
self._last_primary_pressed = msg.primary
if not rising_edge:
return
self._grip_rearm_required = True
self._safe_stop(reset_active=True)
self._adapter.move_to_initial_pose()
self._reset_joint_state(self._adapter.read_joint_state())
self.get_logger().info(f"{self._arm_name} 已回到初始位姿。")
```
- [ ] **Step 4: 运行测试并确认通过**
Run:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
python3 -m pytest src/xr_rm_teleop/test/test_joint_control.py \
-k primary_button_rising_edge_moves_once_and_resyncs -v
```
Expected: PASS。
- [ ] **Step 5: 先写失败路径测试**
```python
def test_primary_button_move_failure_logs_and_stays_stopped() -> None:
failure = RuntimeError("rm_movej failed")
teleop, events, errors, _ = _primary_button_teleop(
move_error=failure
)
teleop._on_controller(SimpleNamespace(primary=False))
teleop._on_controller(SimpleNamespace(primary=True))
assert events == [("stop", True), "move"]
assert teleop._grip_rearm_required
assert errors == [
"right_rm75 回初始位姿失败:rm_movej failed"
]
```
- [ ] **Step 6: 运行失败路径测试并确认按预期失败**
Run:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
python3 -m pytest src/xr_rm_teleop/test/test_joint_control.py \
-k primary_button_move_failure_logs_and_stays_stopped -v
```
Expected: FAIL,并抛出 `RuntimeError: rm_movej failed`
- [ ] **Step 7: 增加最小异常处理**
`try/except` 包住回位和状态同步,失败时记录错误并保持已经设置的停止与 Grip
重新使能状态:
```python
try:
self._adapter.move_to_initial_pose()
self._reset_joint_state(self._adapter.read_joint_state())
except Exception as exc:
self.get_logger().error(
f"{self._arm_name} 回初始位姿失败:{exc}"
)
return
self.get_logger().info(f"{self._arm_name} 已回到初始位姿。")
```
- [ ] **Step 8: 运行两条主键测试并确认通过**
Run:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
python3 -m pytest src/xr_rm_teleop/test/test_joint_control.py -k primary_button -v
```
Expected: PASS。
- [ ] **Step 9: 创建本地提交**
```bash
cd /home/robot/WS_xr/src
git add xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py \
xr_rm_teleop/test/test_joint_control.py
git commit -m "feat: 添加手柄主键回初始位姿"
```
### Task 3: 同步三份初始位姿配置
**Files:**
- Modify: `src/xr_rm_bringup/config/left_arm_rm75.yaml:57`
- Modify: `src/xr_rm_bringup/config/right_arm_rm75.yaml:57`
- Modify: `src/xr_rm_bringup/config/dual_arm_rm75.yaml:64`
- Modify: `src/xr_rm_bringup/config/dual_arm_rm75.yaml:121`
**Interfaces:**
- Consumes: 用户确认的左右臂 7 个关节角,单位为度。
- Produces: 单臂和双臂模式一致的对应臂 `initial_joint_pose`
- [ ] **Step 1: 只替换四处初始位姿**
```yaml
# left_arm_rm75.yaml
initial_joint_pose: [-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55]
# right_arm_rm75.yaml
initial_joint_pose: [-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35]
# dual_arm_rm75.yaml / left_arm_teleop
initial_joint_pose: [-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55]
# dual_arm_rm75.yaml / right_arm_teleop
initial_joint_pose: [-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35]
```
- [ ] **Step 2: 解析 YAML 并验证四处值**
Run:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
python3 - <<'PY'
from pathlib import Path
import yaml
config_dir = Path("src/xr_rm_bringup/config")
left = [-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55]
right = [-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35]
left_single = yaml.safe_load((config_dir / "left_arm_rm75.yaml").read_text())
right_single = yaml.safe_load((config_dir / "right_arm_rm75.yaml").read_text())
dual = yaml.safe_load((config_dir / "dual_arm_rm75.yaml").read_text())
assert left_single["single_arm_velocity_teleop"]["ros__parameters"]["initial_joint_pose"] == left
assert right_single["single_arm_velocity_teleop"]["ros__parameters"]["initial_joint_pose"] == right
assert dual["left_arm_teleop"]["ros__parameters"]["initial_joint_pose"] == left
assert dual["right_arm_teleop"]["ros__parameters"]["initial_joint_pose"] == right
PY
```
Expected: exit code 0,无输出。
- [ ] **Step 3: 确认没有改动其他 YAML 参数**
Run:
```bash
cd /home/robot/WS_xr/src
git diff --word-diff=plain -- \
xr_rm_bringup/config/left_arm_rm75.yaml \
xr_rm_bringup/config/right_arm_rm75.yaml \
xr_rm_bringup/config/dual_arm_rm75.yaml
```
Expected: 只有四个 `initial_joint_pose` 列表发生变化。
- [ ] **Step 4: 创建本地提交**
```bash
cd /home/robot/WS_xr/src
git add xr_rm_bringup/config/left_arm_rm75.yaml \
xr_rm_bringup/config/right_arm_rm75.yaml \
xr_rm_bringup/config/dual_arm_rm75.yaml
git commit -m "config: 更新左右臂初始位姿"
```
### Task 4: 完整验证
**Files:**
- Verify: `src/xr_rm_teleop/test/test_initial_joint_pose.py`
- Verify: `src/xr_rm_teleop/test/test_joint_control.py`
- Verify: `src/xr_rm_teleop/test/test_orientation_control.py`
- Verify: 全部四个 ROS2 包
**Interfaces:**
- Consumes: Tasks 13 的本地提交。
- Produces: mock 测试与 ROS2 构建通过的可验证结果。
- [ ] **Step 1: 运行遥操作相关测试**
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
python3 -m pytest src/xr_rm_teleop/test/test_initial_joint_pose.py \
src/xr_rm_teleop/test/test_joint_control.py \
src/xr_rm_teleop/test/test_orientation_control.py
```
Expected: PASS,无 error 或 warning。
- [ ] **Step 2: 构建工作空间**
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
colcon build --symlink-install
```
Expected: `xr_rm_interfaces``xr_rm_input``xr_rm_teleop``xr_rm_bringup`
构建完成,无失败包。
- [ ] **Step 3: 检查最终范围**
```bash
cd /home/robot/WS_xr/src
git status --short
git log -6 --oneline
```
Expected: 工作区干净;只有设计、计划、适配器、遥操作节点、两份测试和三份 YAML
配置的相关本地提交,不存在远程写操作。
@@ -0,0 +1,870 @@
# 双 RM75 逆解模型替换实施计划
> **面向执行代理:** 必须逐项执行本计划,并使用 `superpowers:test-driven-development`;可选择 `superpowers:subagent-driven-development`(推荐)或 `superpowers:executing-plans`。
**目标:** 让单臂和双臂遥操作统一加载 `dual_rm75`,左右节点分别使用本侧局部 base→TCP 相对任务求解 7 个关节,并同步前方工作空间与真机 TCP 配置。
**架构:** 保留 `left_arm_teleop``right_arm_teleop` 两个独立节点和 RealMan 连接。每个节点创建独立 `PlacoIkSolver`,加载同一双臂 URDF,固定浮动基座、mask 另一臂关节,并通过当前侧关节名查询 q/v offset。节点继续在各自局部基坐标系生成目标,现有 PICO 映射与安全链路不变。
**技术栈:** Ubuntu 22.04、ROS2 Humble、Python 3.10、ament_python、Placo 0.9.4、NumPy、pytest、colcon。
---
## 执行约束
- 所有构建、测试和启动命令均在 `/home/robot/WS_xr` 执行,并先运行:
```bash
source /opt/ros/humble/setup.bash
```
- 真实 Placo 测试使用 `/home/robot/miniconda3/envs/xr/bin/python`,不能把跳过测试当作通过。
- 启动验收只允许 `use_mock:=true`,不得连接真机、移动机械臂或操作夹爪。
- 不修改 `configure_safety_limits: true`、`move_to_initial_pose_on_connect: false`、左右节点名或现有限速/超时/安全停止逻辑。
- 不增加碰撞约束、新依赖、第三个控制节点或公共坐标系控制路径。
- 每个实现任务只提交列出的文件,不提交无关工作树内容。
- `setup.py` 和 launch 路径属于配置集成;按已确认的测试设计使用完整构建、安装
资源检查和 mock 启动验收,不增加读取源码字符串的脆弱测试。
## 文件结构
**修改:**
- `xr_rm_teleop/xr_rm_teleop/placo_ik_solver.py`:选择左右运动链、查询 offset、建立相对位姿任务。
- `xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py`:把当前侧名称传给求解器。
- `xr_rm_teleop/test/test_placo_transforms.py`:双臂 URDF、左右 offset、局部位姿和真实 Placo 收敛回归。
- `xr_rm_teleop/test/placo_ik_smoke.py`:左右分支手工性能冒烟脚本。
- `xr_rm_teleop/test/test_initial_joint_pose.py`:真机外设选择与三份工作空间配置回归。
- `xr_rm_teleop/setup.py`:安装双臂 URDF 和混合大小写 STL。
- `xr_rm_bringup/launch/arm_debug.launch.py`:单臂/双臂统一选择双臂 URDF。
- `xr_rm_bringup/config/dual_arm_rm75.yaml`:左右局部 Y 上界改为 `0.10`。
- `xr_rm_bringup/config/left_arm_rm75.yaml`:左臂局部 Y 上界改为 `0.10`。
- `xr_rm_bringup/config/right_arm_rm75.yaml`:右臂局部 Y 上界改为 `0.10`。
- `xr_rm_bringup/config/peripherals_rm75.yaml`:同步右臂 omnipic 和左臂编号 2 实际工具的 TCP。
- `README.md`:更新模型、局部坐标与配置说明。
**不创建新的生产模块或依赖。**
### 任务一:用回归测试锁定外设 TCP 与前方工作空间
**文件:**
- 修改:`xr_rm_teleop/test/test_initial_joint_pose.py`
- 修改:`xr_rm_bringup/config/peripherals_rm75.yaml`
- 修改:`xr_rm_bringup/config/dual_arm_rm75.yaml`
- 修改:`xr_rm_bringup/config/left_arm_rm75.yaml`
- 修改:`xr_rm_bringup/config/right_arm_rm75.yaml`
- [ ] **步骤 1:先写失败的真实配置测试**
在 `test_initial_joint_pose.py` 顶部补充导入:
```python
from pathlib import Path
import yaml
from xr_rm_teleop.fun_peripheral import (
PeripheralConfig,
_configure_tool_frame,
load_peripheral_config,
)
```
删除原来单行的 `PeripheralConfig, _configure_tool_frame` 导入,随后在
`test_peripheral_config_exposes_selected_tool()` 后加入:
```python
CONFIG_DIR = Path(__file__).resolve().parents[2] / "xr_rm_bringup" / "config"
def test_deployed_peripheral_config_matches_dual_urdf_tcps() -> None:
path = CONFIG_DIR / "peripherals_rm75.yaml"
left = load_peripheral_config(str(path), "left")
right = load_peripheral_config(str(path), "right")
assert left.scissorgripper == 2
assert left.tool_name == "minisci"
assert left.tool_pose == pytest.approx(
[0.0, 0.0, 0.165, 0.0, 0.0, 0.0, 1.0]
)
assert right.scissorgripper == 1
assert right.tool_name == "omnipic"
assert right.tool_pose == pytest.approx(
[0.0, 0.0, 0.14, 0.0, 0.0, 0.0, 1.0]
)
@pytest.mark.parametrize(
("filename", "node_name"),
[
("left_arm_rm75.yaml", "single_arm_velocity_teleop"),
("right_arm_rm75.yaml", "single_arm_velocity_teleop"),
("dual_arm_rm75.yaml", "left_arm_teleop"),
("dual_arm_rm75.yaml", "right_arm_teleop"),
],
)
def test_deployed_workspaces_keep_only_ten_centimeters_behind(
filename: str,
node_name: str,
) -> None:
with (CONFIG_DIR / filename).open("r", encoding="utf-8") as stream:
parameters = yaml.safe_load(stream)[node_name]["ros__parameters"]
assert parameters["workspace_min"] == [-0.70, -0.70, 0.10]
assert parameters["workspace_max"] == [0.70, 0.10, 0.75]
```
- [ ] **步骤 2:运行测试并确认按预期失败**
运行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
pytest \
src/xr_rm_teleop/test/test_initial_joint_pose.py::test_deployed_peripheral_config_matches_dual_urdf_tcps \
src/xr_rm_teleop/test/test_initial_joint_pose.py::test_deployed_workspaces_keep_only_ten_centimeters_behind \
-v
```
预期:FAIL;当前左臂 `minisci.pose.z` 为 `0.19`、右臂 `omnipic.pose.z` 为
`0.16`,三份配置的 `workspace_max[1]` 为 `0.70`。
- [ ] **步骤 3:做最小配置修改**
在 `peripherals_rm75.yaml` 中只修改:
```yaml
omnipic:
pose: [0.0, 0.0, 0.14, 0.0, 0.0, 0.0, 1.0]
minisci:
pose: [0.0, 0.0, 0.165, 0.0, 0.0, 0.0, 1.0]
```
保持以下内容不变:
```yaml
scissor:
pose: [0.0, 0.0, 0.19, 0.0, 0.0, 0.0, 1.0]
arms:
left:
scissorgripper: 2
right:
scissorgripper: 1
```
在 `left_arm_rm75.yaml`、`right_arm_rm75.yaml` 以及 `dual_arm_rm75.yaml` 的左右
节点参数中只把:
```yaml
workspace_max: [0.70, 0.70, 0.75]
```
改为:
```yaml
workspace_max: [0.70, 0.10, 0.75]
```
- [ ] **步骤 4:运行配置测试并确认通过**
运行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
pytest src/xr_rm_teleop/test/test_initial_joint_pose.py -v
```
预期:该文件全部通过,左臂索引仍为 `2`。
- [ ] **步骤 5:提交配置与测试**
```bash
git add \
src/xr_rm_teleop/test/test_initial_joint_pose.py \
src/xr_rm_bringup/config/peripherals_rm75.yaml \
src/xr_rm_bringup/config/dual_arm_rm75.yaml \
src/xr_rm_bringup/config/left_arm_rm75.yaml \
src/xr_rm_bringup/config/right_arm_rm75.yaml
git commit -m "config: 同步双臂 TCP 与前方工作空间"
```
### 任务二:为双臂局部相对逆解建立失败测试
**文件:**
- 修改:`xr_rm_teleop/test/test_placo_transforms.py`
- [ ] **步骤 1:把旧单臂 URDF 结构测试替换为双臂结构测试**
在测试文件导入中加入 `QP_ORIENTATION_TOLERANCE_RAD`,并定义模型路径:
```python
from xr_rm_teleop.placo_ik_solver import (
QP_ORIENTATION_TOLERANCE_RAD,
QP_POSITION_TOLERANCE_M,
PlacoIkSolver,
_validated_transform,
)
DUAL_URDF_PATH = (
Path(__file__).resolve().parents[1]
/ "models"
/ "dual_rm75"
/ "Dual_arm.urdf"
)
```
用下面测试替换 `test_fixed_urdf_has_seven_moving_joints_and_omnipicker_tcp()`
```python
def test_dual_urdf_has_two_rm75_chains_and_tool_tcps() -> None:
root = ElementTree.parse(DUAL_URDF_PATH).getroot()
moving_joint_names = [
joint.attrib["name"]
for joint in root.findall("joint")
if joint.attrib["type"] != "fixed"
]
assert moving_joint_names == [
*[f"omnipic_joint_{index}" for index in range(1, 8)],
*[f"scissor_joint_{index}" for index in range(1, 8)],
]
assert all(
mesh.attrib["filename"].startswith("meshes/")
for mesh in root.findall(".//mesh")
)
expected_fixed_joints = {
"omnipic_base_mount_joint": (
"dual_arm_base_link",
"omnipic_base_link",
None,
),
"scissor_base_mount_joint": (
"dual_arm_base_link",
"scissor_base_link",
None,
),
"omnipic_OmniPic_tcp_fixed": (
"omnipic_gripper_link",
"omnipic_OmniPic_tcp",
"0 0 0.14",
),
"scissor_scissor_tcp_fixed": (
"scissor_scissor_link",
"scissor_scissor_tcp",
"0 0 0",
),
"scissor_scissor_fixed_joint": (
"scissor_link_7",
"scissor_scissor_link",
"0 0 0.165",
),
}
for name, (parent, child, xyz) in expected_fixed_joints.items():
joint = root.find(f"joint[@name='{name}']")
assert joint is not None
assert joint.attrib["type"] == "fixed"
assert joint.find("parent").attrib["link"] == parent
assert joint.find("child").attrib["link"] == child
if xyz is not None:
assert joint.find("origin").attrib["xyz"] == xyz
```
- [ ] **步骤 2:增加左右求解器、offset 与相对位姿测试**
用下面代码替换 `_rm75_placo_solver()` 和旧的单臂收敛测试:
```python
ARM_CASES = [
pytest.param(
"left",
[-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55],
list(range(14, 21)),
list(range(13, 20)),
"omnipic",
id="left",
),
pytest.param(
"right",
[-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35],
list(range(7, 14)),
list(range(6, 13)),
"scissor",
id="right",
),
]
def _dual_placo_solver(
arm: str,
joint_degrees: list[float],
) -> tuple[PlacoIkSolver, list[float]]:
pytest.importorskip("placo")
joints = [math.radians(value) for value in joint_degrees]
return PlacoIkSolver(str(DUAL_URDF_PATH), 1.0 / 90.0, arm), joints
@pytest.mark.parametrize(
("arm", "joint_degrees", "q_offsets", "v_offsets", "inactive_prefix"),
ARM_CASES,
)
def test_solver_uses_arm_specific_offsets(
arm: str,
joint_degrees: list[float],
q_offsets: list[int],
v_offsets: list[int],
inactive_prefix: str,
) -> None:
del inactive_prefix
solver, _ = _dual_placo_solver(arm, joint_degrees)
assert solver._q_offsets.tolist() == q_offsets
assert solver._v_offsets.tolist() == v_offsets
@pytest.mark.parametrize(
("arm", "joint_degrees", "q_offsets", "v_offsets", "inactive_prefix"),
ARM_CASES,
)
def test_joint_state_pose_is_relative_to_selected_arm_base(
arm: str,
joint_degrees: list[float],
q_offsets: list[int],
v_offsets: list[int],
inactive_prefix: str,
) -> None:
del q_offsets, v_offsets, inactive_prefix
solver, joints = _dual_placo_solver(arm, joint_degrees)
actual = solver.update_joint_state(joints)
expected = (
np.linalg.inv(solver._robot.get_T_world_frame(solver._base_frame))
@ solver._robot.get_T_world_frame(solver._tcp_frame)
)
assert actual == pytest.approx(expected)
@pytest.mark.parametrize(
("arm", "joint_degrees", "q_offsets", "v_offsets", "inactive_prefix"),
ARM_CASES,
)
def test_qp_solve_converges_without_moving_inactive_arm(
arm: str,
joint_degrees: list[float],
q_offsets: list[int],
v_offsets: list[int],
inactive_prefix: str,
) -> None:
del q_offsets, v_offsets
solver, joints = _dual_placo_solver(arm, joint_degrees)
inactive_offsets = [
solver._robot.get_joint_offset(f"{inactive_prefix}_joint_{index}")
for index in range(1, 8)
]
inactive_before = solver._robot.state.q[inactive_offsets].copy()
start_pose = solver.update_joint_state(joints)
target_pose = start_pose.copy()
target_pose[0, 3] += 0.01
result = solver.solve(target_pose)
reached_pose = solver.update_joint_state(result)
rotation_delta = target_pose[:3, :3] @ reached_pose[:3, :3].T
orientation_error = math.acos(
float(
np.clip(
(np.trace(rotation_delta) - 1.0) * 0.5,
-1.0,
1.0,
)
)
)
assert len(result) == 7
assert np.isfinite(result).all()
assert np.linalg.norm(
target_pose[:3, 3] - reached_pose[:3, 3]
) <= QP_POSITION_TOLERANCE_M
assert orientation_error <= QP_ORIENTATION_TOLERANCE_RAD
assert solver._robot.state.q[inactive_offsets] == pytest.approx(
inactive_before
)
def test_solver_rejects_unknown_arm() -> None:
pytest.importorskip("placo")
with pytest.raises(ValueError, match="arm must be left or right"):
PlacoIkSolver(str(DUAL_URDF_PATH), 1.0 / 90.0, "middle")
```
- [ ] **步骤 3:运行新测试并确认按预期失败**
运行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
/home/robot/miniconda3/envs/xr/bin/python -m pytest \
src/xr_rm_teleop/test/test_placo_transforms.py -v
```
预期:FAIL;当前 `PlacoIkSolver` 不接受 `arm` 参数,仍要求单臂 q shape 和
`joint_17`。
### 任务三:实现最小双臂分支相对求解器
**文件:**
- 修改:`xr_rm_teleop/xr_rm_teleop/placo_ik_solver.py`
- 修改:`xr_rm_teleop/test/test_placo_transforms.py`
- 修改:`xr_rm_teleop/test/placo_ik_smoke.py`
- [ ] **步骤 1:替换单臂固定常量**
把 `RM75_JOINT_NAMES` 和 `RM75_Q_SLICE` 替换为:
```python
ARM_CHAINS = {
"left": (
"scissor_base_link",
"scissor_scissor_tcp",
"scissor",
"omnipic",
),
"right": (
"omnipic_base_link",
"omnipic_OmniPic_tcp",
"omnipic",
"scissor",
),
}
DUAL_RM75_JOINT_NAMES = [
*[f"omnipic_joint_{index}" for index in range(1, 8)],
*[f"scissor_joint_{index}" for index in range(1, 8)],
]
```
- [ ] **步骤 2:按名称选择当前分支并建立相对任务**
将 `PlacoIkSolver.__init__()` 签名改为:
```python
def __init__(
self,
urdf_path: str,
dt: float,
arm: str,
) -> None:
```
在 `dt` 校验后先选择固定分支:
```python
if arm not in ARM_CHAINS:
raise ValueError("arm must be left or right")
self._base_frame, self._tcp_frame, prefix, inactive_prefix = ARM_CHAINS[arm]
self._joint_names = [f"{prefix}_joint_{index}" for index in range(1, 8)]
inactive_joint_names = [
f"{inactive_prefix}_joint_{index}" for index in range(1, 8)
]
```
加载 `RobotWrapper` 后,用下面代码替换单臂 q shape、关节顺序、offset 和限位初始化:
```python
if self._robot.state.q.shape != (21,):
raise RuntimeError(
f"expected Placo q shape (21,), got {self._robot.state.q.shape}"
)
if list(self._robot.joint_names()) != DUAL_RM75_JOINT_NAMES:
raise RuntimeError(
"unexpected dual RM75 joint order: "
f"{list(self._robot.joint_names())}"
)
self._q_offsets = np.asarray(
[self._robot.get_joint_offset(name) for name in self._joint_names],
dtype=int,
)
self._v_offsets = np.asarray(
[self._robot.get_joint_v_offset(name) for name in self._joint_names],
dtype=int,
)
if len(set(self._q_offsets.tolist())) != 7:
raise RuntimeError(f"invalid RM75 q offsets: {self._q_offsets.tolist()}")
if len(set(self._v_offsets.tolist())) != 7:
raise RuntimeError(f"invalid RM75 v offsets: {self._v_offsets.tolist()}")
self._joint_limits = np.asarray(
[self._robot.get_joint_limits(name) for name in self._joint_names]
)
self._velocity_limits = np.asarray(
[self._robot.model.velocityLimit[index] for index in self._v_offsets]
)
self._actual_joints: np.ndarray | None = None
```
用下面代码替换任务创建:
```python
self._solver = placo.KinematicsSolver(self._robot)
self._solver.dt = dt
self._solver.mask_fbase(True)
for name in inactive_joint_names:
self._solver.mask_dof(name)
self._solver.enable_velocity_limits(True)
self._frame_task = self._solver.add_relative_frame_task(
self._base_frame,
self._tcp_frame,
np.eye(4),
)
self._frame_task.configure("rm75_relative_frame", "soft", 1.0)
self._solver.add_kinetic_energy_regularization_task(1e-6)
```
- [ ] **步骤 3:让反馈和结果使用当前侧 offset 与局部位姿**
在 `update_joint_state()` 中用下面逻辑替换固定切片和绝对 TCP 查询:
```python
self._robot.state.q[self._q_offsets] = values
self._robot.update_kinematics()
base_to_tool = (
np.linalg.inv(self._robot.get_T_world_frame(self._base_frame))
@ self._robot.get_T_world_frame(self._tcp_frame)
)
if is_first_feedback:
self._frame_task.T_a_b = base_to_tool.copy()
return base_to_tool.copy()
```
在 `solve()` 中把任务目标与两处结果读取分别改为:
```python
self._frame_task.T_a_b = _validated_transform(target_tool_pose)
result = np.asarray(
self._robot.state.q[self._q_offsets],
dtype=float,
).copy()
```
迭代后的结果读取使用同一段 `self._q_offsets` 代码。`base_configuration`、目标误差、
结果校验和收敛循环保持不变。
- [ ] **步骤 4:更新无真实 Placo 的小型求解测试桩**
在 `test_qp_solve_accepts_position_error_within_two_millimeters()` 和
`test_qp_solve_rejects_position_error_above_two_millimeters()` 中设置:
```python
solver._q_offsets = np.arange(7, 14)
solver._robot = SimpleNamespace(
state=SimpleNamespace(q=np.zeros(21)),
)
solver._frame_task = SimpleNamespace(T_a_b=None)
```
第二个测试继续给 `_robot` 增加原有 `update_kinematics=lambda: None`,其他桩保持
原样。这样测试仍只覆盖 2 mm 收敛边界,不伪造 Placo 相对任务。
- [ ] **步骤 5:运行真实 Placo 测试并确认转绿**
运行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
/home/robot/miniconda3/envs/xr/bin/python -m pytest \
src/xr_rm_teleop/test/test_placo_transforms.py -v
```
预期:全部通过;左右真实 Placo 用例均执行,不能显示 skipped。
- [ ] **步骤 6:更新手工 Placo 冒烟脚本**
把 `placo_ik_smoke.py` 的 `CASES` 更新为当前左右初始角:
```python
CASES = {
"left": [-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55],
"right": [-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35],
}
TOOL_CHAINS = {
"left": ("scissor_base_link", "scissor_link_7", 0.165),
"right": ("omnipic_base_link", "omnipic_link_7", 0.14),
}
```
两处求解器构造都改为:
```python
PlacoIkSolver(str(urdf_path), 1.0 / 125.0, arm)
```
把固定 `link_7`/`0.16` 检查替换为:
```python
base_frame, flange_frame, tcp_length = TOOL_CHAINS[arm]
world_to_base = drift_solver._robot.get_T_world_frame(base_frame)
world_to_flange = drift_solver._robot.get_T_world_frame(flange_frame)
base_to_flange = np.linalg.inv(world_to_base) @ world_to_flange
flange_to_tcp = np.linalg.inv(base_to_flange) @ stationary_target
assert np.allclose(flange_to_tcp[:3, 3], [0.0, 0.0, tcp_length])
assert np.allclose(flange_to_tcp[:3, :3], np.eye(3), atol=1e-5)
```
- [ ] **步骤 7:运行冒烟脚本**
运行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
PYTHONPATH=src/xr_rm_teleop \
/home/robot/miniconda3/envs/xr/bin/python \
src/xr_rm_teleop/test/placo_ik_smoke.py \
src/xr_rm_teleop/models/dual_rm75/Dual_arm.urdf
```
预期:左右各输出一行有限误差与耗时统计;位置误差不超过 `0.005 m`、姿态误差
不超过 ``、静止漂移不超过 `0.05°`。
- [ ] **步骤 8:提交求解器与测试**
```bash
git add \
src/xr_rm_teleop/xr_rm_teleop/placo_ik_solver.py \
src/xr_rm_teleop/test/test_placo_transforms.py \
src/xr_rm_teleop/test/placo_ik_smoke.py
git commit -m "feat: 使用双 RM75 局部相对逆解"
```
### 任务四:接入节点、安装空间与统一 launch
**文件:**
- 修改:`xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py`
- 修改:`xr_rm_teleop/setup.py`
- 修改:`xr_rm_bringup/launch/arm_debug.launch.py`
- [ ] **步骤 1:把节点当前侧传给求解器**
将节点中的求解器构造改为:
```python
self._ik_solver = PlacoIkSolver(
str(self.get_parameter("robot_urdf_path").value),
self._dt,
peripheral_arm,
)
```
复用已经用于外设加载的 `peripheral_arm`,不增加新的 ROS 参数。
- [ ] **步骤 2:安装双臂模型资源**
在 `xr_rm_teleop/setup.py` 的 `data_files` 中增加:
```python
(
f"share/{package_name}/models/dual_rm75",
["models/dual_rm75/Dual_arm.urdf"],
),
(
f"share/{package_name}/models/dual_rm75/meshes",
glob("models/dual_rm75/meshes/*.STL")
+ glob("models/dual_rm75/meshes/*.stl"),
),
```
保留旧模型安装项,避免破坏仓库中其他手工路径;不修改锁文件或依赖。
- [ ] **步骤 3:让所有 launch 模式选择双臂 URDF**
将 `_rm75_urdf()` 改名并替换为:
```python
def _dual_rm75_urdf() -> PathJoinSubstitution:
return PathJoinSubstitution([
FindPackageShare("xr_rm_teleop"),
"models",
"dual_rm75",
"Dual_arm.urdf",
])
```
把单臂节点和两个双臂节点中的:
```python
"robot_urdf_path": _rm75_urdf(),
```
全部替换为:
```python
"robot_urdf_path": _dual_rm75_urdf(),
```
- [ ] **步骤 4:构建完整工作空间**
运行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
colcon build --symlink-install
```
预期:退出码 `0`,四个 ROS2 包构建成功。
- [ ] **步骤 5:验证安装空间包含完整模型**
运行:
```bash
cd /home/robot/WS_xr
test -f install/xr_rm_teleop/share/xr_rm_teleop/models/dual_rm75/Dual_arm.urdf
find install/xr_rm_teleop/share/xr_rm_teleop/models/dual_rm75/meshes \
-maxdepth 1 -type f | sort
```
预期:`test` 退出码 `0`;列表包含 `base_link.STL`、`OmniPic.stl`、
`scissor.stl`、`dual_arm_base.stl` 和 7 个 link 网格等现有资源。
- [ ] **步骤 6:运行双臂 mock 启动验收**
运行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
source install/setup.bash
timeout 15s ros2 launch xr_rm_bringup arm_debug.launch.py \
arm:=both use_mock:=true
```
预期:日志显示 `left_rm75`、`right_rm75` 两个 Placo QP 节点启动,无模型路径、
q shape、关节名、frame 或 traceback 错误。`timeout` 到期的退出码 `124` 属于预期;
不得改用 `use_mock:=false`。
- [ ] **步骤 7:提交接入修改**
```bash
git add \
src/xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py \
src/xr_rm_teleop/setup.py \
src/xr_rm_bringup/launch/arm_debug.launch.py
git commit -m "feat: 接入双 RM75 逆解模型"
```
### 任务五:更新文档并完成全量验证
**文件:**
- 修改:`README.md`
- [ ] **步骤 1:更新项目结构和模型说明**
在 README 的模型树中保留旧模型并增加:
```text
│ ├── rm75/ # 旧 RM75 模型资源(launch 不再选用)
│ ├── rm75_omnipicker/ # 旧单臂 OmniPicker 模型资源
│ └── dual_rm75/ # 当前左右臂统一使用的双 RM75 URDF 与网格
```
把“Placo 使用 `rm75_omnipicker` 和统一 `omnipicker_tcp`”段落替换为:
```markdown
Placo 使用 `xr_rm_teleop/models/dual_rm75/Dual_arm.urdf`。左右控制节点分别创建
独立求解器:左臂控制 `scissor_base_link` 到 `scissor_scissor_tcp`,右臂控制
`omnipic_base_link` 到 `omnipic_OmniPic_tcp`,并 mask 另一侧关节。节点目标仍在
各自局部基坐标系表达,不把现有 PICO 映射改为公共坐标系。
两侧局部 `-Y` 都指向机器人前方,工作空间在局部 `+Y` 后方只保留 `0.10 m`。
左臂局部 `+X/+Y/+Z` 分别向下/向后/向左外侧;右臂分别向上/向后/向右外侧。
真机工具坐标使用 URDF TCP:左臂硬件编号保持 `2`,实际选择的 `minisci` 工具
长度为 `0.165 m`;右臂编号保持 `1``omnipic` 工具长度为 `0.14 m`。
```
不要把“当前没有双臂碰撞检测”的安全提示改成已完成。
- [ ] **步骤 2:运行相关 Python 测试**
运行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
pytest src/xr_rm_teleop/test/test_initial_joint_pose.py -v
pytest src/xr_rm_teleop/test/test_orientation_control.py -v
/home/robot/miniconda3/envs/xr/bin/python -m pytest \
src/xr_rm_teleop/test/test_placo_transforms.py -v
```
预期:三个测试文件全部通过;真实 Placo 左右用例均执行。
- [ ] **步骤 3:重新构建工作空间**
运行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
colcon build --symlink-install
```
预期:退出码 `0`。
- [ ] **步骤 4:重新运行最终 mock 验收**
运行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
source install/setup.bash
timeout 15s ros2 launch xr_rm_bringup arm_debug.launch.py \
arm:=both use_mock:=true
```
预期:两个节点均启动且没有 traceback;退出码 `124` 仅由 `timeout` 产生。
- [ ] **步骤 5:检查最终范围和格式**
运行:
```bash
cd /home/robot/WS_xr/src
git diff --check
git status --short
git diff --stat
```
预期:无空白错误;变更仅包含本计划列出的求解器、测试、launch、安装、四份配置、
README 和 Superpowers 文档。
- [ ] **步骤 6:提交 README**
```bash
git add README.md
git commit -m "docs: 更新双 RM75 逆解说明"
```
## 完成标准
- 单臂和双臂 launch 均只选择安装空间中的 `dual_rm75/Dual_arm.urdf`。
- 左右节点是独立求解器实例,各自使用正确 base、TCP、q/v offset 和相对位姿任务。
- 当前侧小幅可达目标收敛,另一侧关节不漂移。
- 左臂硬件编号保持 `2`,实际工具 TCP 为 `0.165 m`;右臂编号保持 `1`TCP 为
`0.14 m`。
- 三份控制配置的局部 Y 范围为 `[-0.70, 0.10]`,其他安全参数不变。
- 相关测试、完整构建和 `arm:=both use_mock:=true` 启动验收取得新鲜证据。
- 未连接真机,未增加碰撞控制、依赖或无关重构。
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,176 @@
# RM75 QP 阈值与 UDP 反馈周期修复设计
## 背景
右臂真机在 90 Hz、`follow: false` 遥操过程中频繁出现两类警告:
```text
QP did not converge after 30 iterations:
position_error=0.001245~0.001609 m
UDP关节反馈超时,保持最后安全目标。
```
现场 timing 日志同时表明:
- 控制回调最大约 5.1 ms,没有耗尽 11.111 ms 周期;
- UDP 反馈间隔均值约 25 ms,即实际约 40 Hz;
- UDP 间隔存在 37~71 ms 的明显抖动;
- UDP 短暂超时后约 44 ms 收到新帧,但现有安全状态机要求先松开 Grip。
因此,控制线程计算量不是这两类警告的原因。
## 根因
### QP 近阈值失败
当前 QP 最多迭代 30 次,并要求:
```text
位置误差 <= 1 mm
姿态误差 <= 0.005 rad
```
现场失败时姿态误差约 0.0007 rad,已经满足要求;位置误差仅比 1 mm 高
0.245~0.609 mm。30 次迭代中的每一步已经通过关节有限值、关节位置限制和单步
速度限制校验,但最终结果仍因严格的 1 mm 判定被整体丢弃。
用户已明确确认 2 mm 位置残差可接受;该数值也与现有 1 mm 手柄位置死区处于
同一量级。将位置收敛阈值改为 2 mm,可以接收现场这类安全的近收敛
结果,同时继续拒绝此前出现过的 7.5 mm 等明显未收敛结果。
### UDP 周期单位错误
项目参数 `realtime_push_cycle_ms` 的单位是毫秒,三份机械臂配置均填写 `5`
当前适配器把这个值原样传给:
```python
rm_realtime_push_config_t(cycle, ...)
```
但睿尔曼 SDK 的 `cycle` 单位不是毫秒,而是 5 ms 的倍数。因此:
```text
当前传入 cycle=5
实际周期 = 5 × 5 ms = 25 ms
实际频率 = 40 Hz
```
这与现场 `feedback_interval mean≈25 ms` 完全一致。期望 5 ms 上报时,SDK
参数应为 `cycle=1`
在 120 ms 反馈超时窗口内,25 ms 上报只有约 5 次发送机会;修正为 5 ms 后有
约 24 次发送机会,能显著提高对偶发丢包和调度抖动的容忍度。若网络或 SDK
回调整体停顿超过 120 ms,仍应触发现有安全超时。
## 目标
- QP 位置收敛阈值由 1 mm 调整为 2 mm;
- `realtime_push_cycle_ms: 5` 实际配置成 SDK `cycle=1`,恢复 5 ms 上报;
- UDP 超时警告打印触发时的实际反馈年龄;
- 保持控制频率 90 Hz 和 `follow: false`
- 保持 UDP 短超时保持、持续超时重同步、Grip 重使能、CANFD 恢复和故障锁存;
- 保留工作空间、圆柱、TCP、姿态和关节安全限制。
## 不在本次范围
- 不增加 QP 最大迭代次数;
- 不修改姿态收敛阈值;
- 不放宽 `command_timeout_sec=0.12`
- 不修改 `feedback_resync_timeout_sec=0.5`
- 不允许短超时后自动恢复 Grip
- 不修改三份机械臂 YAML
- 不修改 UDP 目标 IP、端口、线程模式或增加新连接;
- 不处理网卡、交换机或控制器固件问题;
- 不修改用户当前未提交的 `right_arm_rm75.yaml` 参数调整。
## 修改方案
### QP 收敛
`placo_ik_solver.py` 中只修改:
```python
QP_POSITION_TOLERANCE_M = 2e-3
```
30 次迭代、逐步关节安全校验、姿态阈值和未收敛异常格式保持不变。
### UDP 周期换算
保留公开参数 `realtime_push_cycle_ms` 的毫秒语义和“正数且为 5 ms 倍数”的现有
校验。构造 SDK 配置时执行:
```python
sdk_cycle = self._realtime_push_cycle_ms // 5
```
示例:
| 项目参数 | SDK `cycle` | 实际周期 |
|---:|---:|---:|
| 5 ms | 1 | 5 ms |
| 10 ms | 2 | 10 ms |
| 25 ms | 5 | 25 ms |
启动日志仍打印毫秒值,避免把 SDK 内部单位暴露为用户配置。
### UDP 超时日志
首次进入短暂超时时打印:
```text
right_rm75 UDP关节反馈超时(age=xxx.x ms),保持最后安全目标。
```
日志只增加诊断值,不改变节流、保持目标、QP 停止和 Grip 重使能行为。
## 数据流与安全
正常路径:
```text
YAML 5 ms
→ 适配器换算 SDK cycle=1
→ 控制器约每 5 ms UDP 上报
→ 回调校验并缓存 joint_position
→ 90 Hz 控制读取最新实际反馈
→ 最多 30 次 QP,位置阈值 2 mm
→ 现有关节提前制动限幅
→ rm_movej_canfd(..., follow=false)
```
反馈年龄超过 120 ms 时仍停止生成新目标和 QP,以 90 Hz 重发最后安全目标,并
要求 Grip 松开后重新使能。达到 500 ms 时仍只尝试一次
`rm_get_joint_degree()`;失败时仍停止并锁存故障。
## 测试与验证
自动测试:
1. 增加 QP 1.5 mm 位置残差的行为测试,验证其被 2 mm 阈值接受;
2. 保留明显未收敛结果抛出异常的行为;
3. 修改 SDK 配置测试,验证项目 5 ms 参数传入 SDK 时为 `cycle=1`
4. 增加 10 ms 到 `cycle=2` 的换算覆盖;
5. 验证 UDP 超时日志包含实际反馈年龄;
6. 运行 `xr_rm_teleop` 全部测试和姿态控制测试;
7. 运行 `colcon build --symlink-install`
8. 使用 `arm_debug.launch.py arm:=right use_mock:=true`验证启动路径。
真机由用户验证:
- 连续 timing 窗口中 `feedback_interval mean` 从约 25 ms 降到接近 5 ms
- 正常遥操不再频繁出现 UDP 超时;
- 位置残差小于 2 mm 时不再出现 QP 未收敛警告;
- 真正超过 120 ms 的反馈中断仍打印带 `age` 的警告并执行现有安全保持;
- 若修正后仍频繁出现超过 120 ms 的中断,再依据 `age` 和间隔数据排查网络、
SDK 回调或控制器固件,不继续盲目放宽超时。
## 文件范围
- 修改 `xr_rm_teleop/xr_rm_teleop/placo_ik_solver.py`
- 修改 `xr_rm_teleop/xr_rm_teleop/realman_adapter.py`
- 修改 `xr_rm_teleop/xr_rm_teleop/single_arm_velocity_teleop.py`
- 修改相关现有测试;
- 新增本中文设计文档和后续中文实施计划;
- 不修改 YAML、launch、UI 或依赖。
@@ -0,0 +1,140 @@
# XRoboToolkit 手柄输入扩展设计
## 背景
当前 `xrobotoolkit_to_udp_bridge` 已从 XRoboToolkit PC-Service SDK 读取左右
手柄摇杆、主键和副键,但 `udp_controller_receiver` 只把 `grip``trigger`
和位姿写入 `XrController`,其余信息在 UDP 到 ROS2 的转换中丢失。
后续项目会使用 LeRobot 同时记录相机、RM75 状态和手柄输入。本次只补齐当前
明确需要的手柄字段,不实现 LeRobot 录制,不改变现有机械臂控制逻辑。
## 目标
- 将左右手柄摇杆、主键和副键发布到现有 `XrController` 话题。
- 保持现有 `grip``trigger``pose` 的语义及控制行为不变。
- 兼容不包含新增字段的旧 UDP 数据包。
- 使用现有节点、消息和 UDP 协议,不增加依赖或新话题。
- 更新 README 和 AGENTS,记录接口及 Superpowers 的 Git 操作边界。
## 不在本次范围
- Grip 和 Trigger 原始模拟量。
- 菜单键、摇杆按键、SDK 时间戳和 bridge 序号。
- 头显位姿、26 点手部骨骼、身体追踪和 Motion Tracker。
- LeRobot 数据集录制、相机同步和 RM75 状态采集。
- 任何机械臂控制参数、安全逻辑或真机行为修改。
## 方案选择
采用直接扩展 `XrController` 的方案。相比新增 `sensor_msgs/Joy` 话题,该方案
不需要额外同步左右手柄话题;相比继续只保留 UDP JSON,它能让 ROS2 和后续
LeRobot 适配层直接读取类型明确的数据。
修改消息定义后必须重新构建并重启相关节点。重新构建后的现有遥操作代码仍只读取
原字段,不需要修改控制逻辑。
## ROS2 消息格式
`XrController.msg` 使用以下固定顺序:
```text
std_msgs/Header header
string hand
bool grip
float32 trigger
bool primary
bool secondary
float32[2] axis
geometry_msgs/Pose pose
```
字段语义:
- `primary`:左手 X 键,右手 A 键。
- `secondary`:左手 Y 键,右手 B 键。
- `axis`:对应手柄摇杆的 `[x, y]`,每个分量限制在 `[-1.0, 1.0]`
## 数据流
正常链路保持不变:
```text
XRoboToolkit PC-Service SDK
→ xrobotoolkit_to_udp_bridge
→ UDP JSON
→ udp_controller_receiver
→ /xr/left_controller、/xr/right_controller
→ single_arm_velocity_teleop
```
bridge 继续读取 Grip 和 Trigger 模拟量并应用现有滞回,只是不再把未使用的
`grip_value``trigger_value``menu``axis_click` 放入 UDP JSON。
UDP 中的按钮继续使用现有嵌套结构:
```json
{
"grip": true,
"trigger": 0.0,
"axis": [0.2, -0.4],
"buttons": {
"primary": true,
"secondary": false
},
"pos": [0.0, 1.0, 0.0],
"quat": [0.0, 0.0, 0.0, 1.0]
}
```
`udp_controller_receiver` 将嵌套按钮展平到 ROS2 消息字段。现有遥操作节点忽略
新增字段,因此目标位姿、夹爪触发和安全停止路径均不变化。
## 兼容与异常处理
- 旧 UDP 包缺少 `axis``buttons` 时,发布
`axis=[0.0, 0.0]``primary=false``secondary=false`
- 新增可选字段格式错误时使用上述默认值,不丢弃有效的 Grip、Trigger 和位姿。
- bridge 和 receiver 均将摇杆分量限制在 `[-1.0, 1.0]`
- 旧包中存在 `menu``axis_click` 或其他按钮字段时忽略,不报错。
- `sample_udp_sender` 保持旧格式,用它验证向后兼容,不为本次需求增加新参数。
## 文件范围
- `xr_rm_interfaces/msg/XrController.msg`
- `xr_rm_input/xr_rm_input/xrobotoolkit_to_udp_bridge.py`
- `xr_rm_input/xr_rm_input/udp_controller_receiver.py`
- `xr_rm_input/test/` 下的一份最小兼容性测试
- `README.md`
- `AGENTS.md`
不修改 `xr_rm_teleop` 控制实现及三个机械臂 YAML。
## README 与 AGENTS 规则
README 增加新的手柄字段、UDP 格式和兼容行为说明。
AGENTS 和 README 同时明确:使用 Superpowers 执行任务时,只允许按 skill
工作流创建本地 Git 提交;不得推送、合并或执行其他远程写操作。skill 如需本地
worktree 或配套分支,可以创建,但不得将其合并到其他分支。
## 验证
自动验证包括:
- bridge 生成的 UDP payload 只包含确认保留的按钮和摇杆字段。
- 左手 X/Y 与右手 A/B 正确映射到 `primary/secondary`
- receiver 正确发布新增字段。
- 旧 UDP 包继续发布,新增字段使用默认值。
- 非法新增字段不会阻断现有 Grip、Trigger 和位姿。
-`/home/robot/WS_xr` source ROS2 Humble 后运行相关 pytest。
- 运行 `colcon build --symlink-install`
运行验证只使用 mock,不连接真机、不移动机械臂、不操作夹爪。
## Git 边界
本设计和后续实现可以按 Superpowers 流程创建本地提交。禁止执行 `git push`
创建或合并 PR、合并本地分支以及任何远程写操作。
@@ -0,0 +1,73 @@
# 手柄主键回初始位姿设计
## 背景与目标
有线连接已基本解决 UDP 超时和逆解失败问题。本次只增加一个明确操作:
点击当前机械臂对应手柄的主键,使该机械臂按已配置的关节角回到初始位姿。
- 右臂模式:右手 A 键控制右臂,左手 X 键无效。
- 左臂模式:左手 X 键控制左臂,右手 A 键无效。
- 双臂模式:右手 A 键控制右臂,左手 X 键控制左臂。
## 最小方案
`XrController.primary` 已表示左手 X 键或右手 A 键。每个遥操作节点继续只订阅
自身的手柄话题,并在 `primary` 上升沿调用适配器的初始位姿运动:
```text
左手 X → /xr/left_controller → left_arm_teleop → 左臂初始位姿
右手 A → /xr/right_controller → right_arm_teleop → 右臂初始位姿
```
单臂模式只启动对应节点,因此另一只手柄天然无效;双臂模式下两个节点独立处理,
无需新增协调节点、话题、服务或配置项。
## 运动与安全行为
- 只在按键从未按下变为按下时触发,持续按住不重复执行。
- 回位前调用现有安全停止逻辑,退出当前相对位姿遥操作。
- 使用更新后的 `initial_joint_pose` 和现有 `init_move_speed`
- 复用现有 `rm_movej(..., block=1)` 阻塞运动,完成后重新同步关节状态和 QP 状态。
- 回位后必须先松开 Grip,才能重新进入遥操作。
- 回位失败时记录错误并保持停止,不自动重试。
- mock 模式只更新模拟关节状态,不导入或调用厂商 SDK。
## 初始位姿配置
关节角单位沿用现有 YAML,均为度:
- 左臂:`[-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55]`
- 右臂:`[-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35]`
`left_arm_rm75.yaml` 使用左臂值,`right_arm_rm75.yaml` 使用右臂值;
`dual_arm_rm75.yaml` 中左右节点分别使用对应值。三个文件中的 IP、坐标映射、
工作空间、安全限制及其他控制参数保持不变。
## 代码范围
-`realman_adapter.py` 为真机和 mock 提供同名的公开回位方法,真机实现复用现有
私有初始位姿运动代码。
-`single_arm_velocity_teleop.py` 的现有手柄回调中增加主键上升沿处理。
- 在现有测试文件中增加最小的适配器回位和按键边沿测试。
- 同步 `left_arm_rm75.yaml``right_arm_rm75.yaml``dual_arm_rm75.yaml` 中的
`initial_joint_pose`
不修改消息定义、UDP 输入节点、launch、三个 YAML 中的其他参数、安全限位或
夹爪控制。
## 验证
- 测试主键首次按下触发一次,持续按住不重复触发,松开后可以再次触发。
- 测试 mock 回位后恢复配置的初始关节角。
- 测试真机适配器仍只调用既有的关节运动命令;测试使用假 SDK 对象,不连接真机。
- 检查单臂和双臂配置中的左右初始位姿与上述值一致。
-`/home/robot/WS_xr` 执行:
```bash
source /opt/ros/humble/setup.bash
python3 -m pytest src/xr_rm_teleop/test/test_initial_joint_pose.py
python3 -m pytest src/xr_rm_teleop/test/test_orientation_control.py
colcon build --symlink-install
```
全部验证使用 mock 或假对象,不连接真机、不移动机械臂、不操作夹爪。
@@ -0,0 +1,180 @@
# 双 RM75 逆解模型替换设计
## 背景与目标
当前左右遥操作节点都加载单臂 `rm75_omnipicker` URDF,求解器将 7 个关节名、
`q[7:14]``omnipicker_tcp` 写死。项目新增的
`xr_rm_teleop/models/dual_rm75/Dual_arm.urdf` 包含真实双臂布局:物理左臂为
scissor 分支,物理右臂为 omnipic 分支,主要活动区域位于机器人前方。
本次变更目标是:
- 单臂和双臂调试都加载同一份 `dual_rm75` 模型;
- 左右节点继续独立控制各自的 RM75,只求解当前侧 7 个关节;
- 保留左右臂各自的局部控制坐标系和现有 PICO 映射;
- 使用 URDF 中的 TCP 长度,并同步真机外设工具坐标;
- 把局部后方工作空间余量限制为 `0.10 m`
- 保留现有速度、工作空间、圆柱、超时和安全停止逻辑。
本次不增加双臂碰撞规避、公共坐标系目标、双臂协同任务,不合并左右控制节点,
也不连接或移动真机。
## 方案选择
采用“完整双臂 URDF + 两个独立局部相对位姿任务”。
未采用以下方案:
1. 公共坐标系绝对位姿任务:需要重写 PICO 映射和现有安全限位,改动范围过大。
2. 从双臂模型拆出两份单臂 URDF:会产生重复模型和后续同步风险。
## 坐标系与控制语义
`dual_arm_base_link` 是完整模型的公共根坐标系。左右控制节点仍以各自机械臂基座
作为控制和安全坐标系:
| 机械臂 | 局部基坐标系 | TCP | 活动关节 |
|---|---|---|---|
| 左臂 | `scissor_base_link` | `scissor_scissor_tcp` | `scissor_joint_1``scissor_joint_7` |
| 右臂 | `omnipic_base_link` | `omnipic_OmniPic_tcp` | `omnipic_joint_1``omnipic_joint_7` |
以公共坐标系 `+X` 向机器人右侧、`+Y` 向前、`+Z` 向上为参照,URDF 中局部轴
朝向如下:
| 局部轴 | 左臂 `scissor_base_link` | 右臂 `omnipic_base_link` |
|---|---|---|
| `+X` | 向下 | 向上 |
| `+Y` | 向后 | 向后 |
| `+Z` | 向左、远离机身 | 向右、远离机身 |
| `-Y` | 向前 | 向前 |
现有左右 `xr_to_robot_matrix` 继续把 PICO 相对位置和相对旋转映射到对应局部基
坐标系。节点产生的目标仍是 `T_base_tcp`,不显式转换成
`dual_arm_base_link` 下的绝对目标。
## 求解器设计
左右节点使用同一个 `PlacoIkSolver` 类,但每个节点创建自己的求解器实例、机器人
状态和 QP 任务。两个实例都加载完整 `Dual_arm.urdf`,不共享可变状态。
求解器构造时接收 `arm=left|right`,按固定映射选择局部基坐标系、TCP、当前侧
关节和另一侧关节。每个实例执行以下设置:
1. 使用 `mask_fbase(True)` 固定 Placo 浮动基座;
2. mask 另一侧全部 7 个关节;
3. 使用 Placo 原生
`add_relative_frame_task(base_frame, tcp_frame, target)` 创建局部 TCP 任务;
4. 保留速度限制、动能正则化、最多 30 次有界迭代和现有收敛阈值。
双臂模型的 Placo 状态为 21 个 q 分量:7 个浮动基座分量、右臂 7 个关节、
左臂 7 个关节。求解器不再使用固定 `q[7:14]`,而是通过当前侧关节名查询:
- `get_joint_offset()`:定位实际关节反馈和逆解结果在 q 中的位置;
- `get_joint_v_offset()`:定位对应的 URDF 关节速度上限。
当前 URDF 中右臂 q/v offset 分别为 `713`/`612`,左臂分别为
`1420`/`1319`;实现仍通过名称查询并对这些预期结果做回归测试。
查询 offset 不放宽模型校验。求解器仍检查完整左右关节集合、当前侧恰好 7 个关节、
offset 唯一有效,以及所需 base 和 TCP 均存在。
`update_joint_state()` 只写入当前侧 7 个关节反馈,并返回当前 TCP 相对当前侧基座的
`T_base_tcp``solve()` 接受相同坐标语义的目标,设置相对位姿任务并只返回当前侧
7 个关节结果。另一侧关节保持 mask,不参与本实例求解。
## 启动、安装与配置
`arm_debug.launch.py``arm:=left|right|both` 全部使用:
```text
xr_rm_teleop/models/dual_rm75/Dual_arm.urdf
```
双臂模式继续保留 `left_arm_teleop``right_arm_teleop` 节点名,`use_mock` 默认
保持 `true``setup.py` 安装 `Dual_arm.urdf` 以及 `dual_rm75/meshes` 中现有的
`.STL``.stl` 文件,不新增依赖。
三份控制配置的局部工作空间统一为:
```yaml
workspace_min: [-0.70, -0.70, 0.10]
workspace_max: [0.70, 0.10, 0.75]
```
其中两侧局部 `-Y` 都是机器人前方,`+Y` 后方最多保留 `0.10 m` 余量。其他工作
空间轴、圆柱限位、线速度、角速度、关节速度、关节加速度和指令超时参数不变。
真机外设配置采用 URDF TCP 长度,但保留当前硬件选择编号:
```yaml
tools_in_ee:
scissor:
pose: [0.0, 0.0, 0.19, 0.0, 0.0, 0.0, 1.0]
omnipic:
pose: [0.0, 0.0, 0.14, 0.0, 0.0, 0.0, 1.0]
minisci:
pose: [0.0, 0.0, 0.165, 0.0, 0.0, 0.0, 1.0]
arms:
left:
scissorgripper: 2
right:
scissorgripper: 1
```
左臂保留编号 `2`,继续使用控制器 DO3/DO4;该编号按当前配置顺序选中
`minisci` 工具坐标,因此更新 `minisci.pose.z`。右臂编号 `1` 继续选中
`omnipic`。URDF 的左分支名 `scissor_*` 与真机外设编号/配置键是两套既有命名,
不据此改写硬件编号。两侧负载参数和未选中 `scissor.pose` 保持不变。
README 同步说明新模型路径、左右分支/TCP、局部坐标轴和前方工作区。
## 校验与故障处理
模型路径、arm、关节、frame 或 offset 校验失败时,节点在创建 RealMan 适配器前
终止启动,不连接真机。
运行期间保留现有行为:
- 关节反馈必须包含 7 个有限数值;
- TCP 目标必须是有限、合法的齐次变换和旋转矩阵;
- QP 结果必须满足当前侧 URDF 关节位置和单周期速度限制;
- QP 不收敛时保持上一组有效关节目标;
- 反馈异常、反馈超时、XR 超时、Grip 松开和节点退出时执行现有安全停止;
- `configure_safety_limits` 保持 `true`
- `move_to_initial_pose_on_connect` 默认保持 `false`
完整 URDF 虽包含两臂碰撞几何,本次不启用碰撞约束。真机验证不在本次执行范围;
后续首次真机验证必须分别验证两臂并保持物理隔离。
## 测试与验收
采用现有 pytest、Placo 0.9.4 和 ROS2 构建流程,不新增测试框架。
自动化测试覆盖:
- 双臂 URDF 的 14 个活动关节、base、TCP、固定挂载和 TCP 长度;
- 左右实例选择正确的关节、q/v offset 和相对任务 frame
- 当前实例只更新和返回本侧 7 个关节,另一侧保持不动;
- 左右初始关节反馈能得到有限的局部 `T_base_tcp`
- 左右小幅可达目标能够收敛,结果满足位置、姿态和关节限制;
- 非法目标、未初始化求解和不收敛故障路径;
- 左臂编号 `2` 实际选择 `minisci` 且 TCP 为 `0.165 m`
- 右臂编号 `1` 实际选择 `omnipic` 且 TCP 为 `0.14 m`
- 三份配置的局部 Y 上界均为 `0.10 m`
所有命令在 `/home/robot/WS_xr` 执行,并先加载 ROS2 Humble
```bash
source /opt/ros/humble/setup.bash
/home/robot/miniconda3/envs/xr/bin/python -m pytest \
src/xr_rm_teleop/test/test_placo_transforms.py -v
pytest src/xr_rm_teleop/test/test_orientation_control.py
colcon build --symlink-install
source install/setup.bash
timeout 15s ros2 launch xr_rm_bringup arm_debug.launch.py \
arm:=both use_mock:=true
```
最后一条命令只验证安装空间中的新模型能被两个 mock 节点加载;`timeout` 到期退出
属于预期。整个验收过程不得使用 `use_mock:=false`
@@ -0,0 +1,249 @@
# 双臂 MuJoCo 运动学遥操作设计
## 背景与目标
当前项目已经通过 PICO/XR 手柄、两个独立的单臂遥操作节点和 Placo QP 完成双
RM75 遥操作。左右节点共同加载
`xr_rm_teleop/models/dual_rm75/Dual_arm.urdf`,但现有 `use_mock:=true` 只在内存中
保存关节状态,没有可视化模型。
本次变更增加一个独立的 MuJoCo 运动学仿真包,使双臂在不连接真机时可以由 PICO
遥操作并可视化,也允许连接真机时把实际关节反馈同步显示在 MuJoCo 中。仿真用于更
方便地观察和改进现有 QP 算法,不替代现有控制与安全链路。
首版目标:
- 直接加载现有双臂 URDF,保持它是唯一模型源;
- 复用现有 PICO 输入、目标生成、工作空间限制和 Placo QP;
- 使用一个 MuJoCo 进程显示完整 14 关节双臂模型;
- 无真机时显示 Mock 关节状态,连接真机时显示实际关节反馈;
- 支持 Mock 模式下用左手 X、右手 A 立即 Reset 对应机械臂;
- 保持当前 mock、真机和夹爪功能的默认行为不变。
首版不实现 MuJoCo 动力学、执行器、接触、碰撞约束、双臂协同 QP、轨迹记录或
MuJoCo 对真机的任何控制。
## 目录与包边界
新增独立的 `ament_python``xr_rm_mujoco`,运行配置仍统一由
`xr_rm_bringup` 管理:
```text
src/
├── xr_rm_mujoco/
│ ├── package.xml
│ ├── setup.py
│ ├── setup.cfg
│ ├── resource/
│ │ └── xr_rm_mujoco
│ ├── xr_rm_mujoco/
│ │ ├── __init__.py
│ │ └── dual_arm_simulator.py
│ └── test/
│ └── test_dual_arm_simulator.py
├── xr_rm_bringup/
│ ├── config/
│ │ ├── dual_arm_rm75.yaml
│ │ └── dual_arm_mujoco.yaml
│ └── launch/
│ └── arm_debug.launch.py
└── xr_rm_teleop/
├── models/
│ └── dual_rm75/
│ └── Dual_arm.urdf
└── xr_rm_teleop/
└── single_arm_velocity_teleop.py
```
各部分职责:
- `xr_rm_mujoco` 只加载模型、接收关节状态、更新 MuJoCo `qpos` 和刷新画面;
- `xr_rm_teleop` 继续负责 PICO 映射、目标滤波、安全限幅、QP 和适配器选择,只
增加关节目标及当前关节状态发布;
- `xr_rm_bringup` 保持唯一遥操作 launch 入口,并保存 MuJoCo 运行参数;
- `Dual_arm.urdf` 和现有 meshes 保持原位置,不复制或生成持久化 MJCF;
- 不拆出新的 description 包,不增加第二套遥操作实现。
## 模型与 MuJoCo 更新方式
`dual_arm_simulator` 从安装空间解析
`xr_rm_teleop/models/dual_rm75/Dual_arm.urdf`,MuJoCo 直接加载该文件及其相对路径
网格。节点按 URDF 关节名称查找 MuJoCo qpos 地址,不写死 14 个数组下标。
左右首帧合法关节状态到达后,节点把状态写入相应 `qpos`,调用 `mj_forward()`
更新运动学,再由被动 viewer 显示。首版不调用 `mj_step()` 推进动力学,MuJoCo
不会生成控制量或新的关节运动。
画面按 `60 Hz` 刷新。`xr_rm_bringup/config/dual_arm_mujoco.yaml` 首版只包含:
```yaml
dual_arm_simulator:
ros__parameters:
render_rate_hz: 60.0
```
初始关节角不在该文件中重复配置。
## ROS 话题与状态来源
左右遥操作节点使用标准 `sensor_msgs/msg/JointState` 发布:
| 话题 | 内容 |
|---|---|
| `/xr_rm/left_rm75/joint_states` | 左臂当前适配器反馈 |
| `/xr_rm/right_rm75/joint_states` | 右臂当前适配器反馈 |
| `/xr_rm/left_rm75/joint_target` | 左臂经关节限速后实际下发的目标 |
| `/xr_rm/right_rm75/joint_target` | 右臂经关节限速后实际下发的目标 |
MuJoCo 只订阅两个 `joint_states` 话题。`joint_target` 用于后续记录和比较,不驱动
MuJoCo。消息必须携带对应侧完整的 7 个关节名称和位置,MuJoCo 按名称映射,不能
依赖消息数组顺序。
状态来源由现有 `use_mock` 唯一决定:
```text
use_mock:=true
PICO → Placo QP → MockRealManAdapter → joint_states → MuJoCo
use_mock:=false
PICO → Placo QP → RealManAdapter → 真机
真机实时反馈 → joint_states → MuJoCo
```
每个遥操作节点只创建一种适配器。真机连接或反馈失败时不得创建、切换或回退到
Mock。MuJoCo 不需要独立的状态来源参数;同一状态话题发现多个发布者时输出明确
报警,防止同时运行两套 launch 造成状态混合。
## 更新频率
两侧 `dual_arm_rm75.yaml``control_rate_hz` 均为 `90.0`
- Mock 模式:Mock 状态在遥操作节点的 `90 Hz` 控制周期中读取并发布,MuJoCo
名义关节接收频率为 `90 Hz`
- 真机模式:RealMan 的 `realtime_push_cycle_ms: 5` 使适配器原始反馈名义频率为
`200 Hz`,遥操作节点在 `90 Hz` 控制周期取最新快照并发布,因此 MuJoCo 名义
关节接收频率仍为 `90 Hz`
- 画面独立按 `render_rate_hz: 60.0` 刷新,每帧显示当时最新的 14 关节状态。
以上是名义频率,实际频率会受系统调度影响,运行时使用 `ros2 topic hz` 检查。
## 初始姿态与 A/X Reset
`dual_arm_rm75.yaml` 继续作为双臂初始姿态和控制限制的唯一配置源。Mock 适配器
创建时已经读取对应节点的 `initial_joint_pose`,将角度转换成弧度并作为初始关节
状态。左右遥操作节点初始化完成后立即各发布一帧状态,因此无真机 MuJoCo 的默认
姿态就是 YAML 中的左右初始姿态。
现有 `XrController.primary` 和按键上升沿逻辑继续复用:
```text
左手 X → 左臂立即 Reset 到左臂 initial_joint_pose
右手 A → 右臂立即 Reset 到右臂 initial_joint_pose
同时按 X、A → 双臂分别立即 Reset
```
Mock Reset 不生成平滑轨迹,而是立即更新对应 7 个关节并发布新状态。Reset 前先
退出旧的相对位姿控制;如果 Grip 仍保持按下,下一控制周期使用“当前手柄姿态 +
Reset 后机械臂姿态”自动建立新基准,随后可以继续遥操作,不要求先松开 Grip,
也不能沿用 Reset 前的相对位姿基准。
真机的 A/X 回位行为保持现状:调用 RealMan 初始位姿运动,完成后重新同步反馈,
并要求先松开 Grip 才能重新使能。该差异只由 `use_mock` 决定。
三份 RM75 配置中的 `move_to_initial_pose_on_connect` 默认继续保持 `false`。MuJoCo
初始显示和按键 Reset 都不依赖该开关,连接真机时不得默认自动移动双臂。
## 控制限制与安全隔离
Mock + MuJoCo 继续执行 `dual_arm_rm75.yaml` 中现有的软件控制约束:
- `workspace_min``workspace_max``cyl_radius_limit` 和低位圆柱限制;
- `max_linear_speed``max_orientation_speed`
- `joint_max_speed``joint_max_acc`
- Placo 的关节位置、速度和求解收敛检查;
- Grip 运动门控、XR/反馈超时、QP 失败保持和安全停止。
MuJoCo 直接显示已经受限的离散关节状态,本身不额外模拟连续动力学。
`max_line_speed``max_angular_speed``max_line_acc``max_angular_acc` 以及
`configure_safety_limits` 是 RealMan 控制器配置,只在真机适配器中调用;这不影响
上述对 Mock 同样生效的软件限位。
MuJoCo 节点只订阅状态,不发布机器人控制指令,不导入 RealMan SDK,也不创建新的
RealMan 连接。MuJoCo 启动失败、运行异常或窗口关闭不得改变真机命令、安全停止或
夹爪行为。
## 启动设计
继续使用唯一入口 `xr_rm_bringup/launch/arm_debug.launch.py`,增加默认关闭的
`use_mujoco` 参数:
| `use_mock` | `use_mujoco` | 行为 |
|---|---|---|
| `true` | `false` | 现有内存 Mock,无 MuJoCo |
| `true` | `true` | Mock + MuJoCo 双臂显示 |
| `false` | `false` | 现有双臂真机遥操作 |
| `false` | `true` | 双臂真机遥操作 + 实际反馈同步显示 |
`use_mujoco` 不参与适配器选择。首版只接受
`arm:=both use_mujoco:=true`,避免单臂启动时另一侧状态和初始姿态不明确。
无真机使用方式:
```bash
ros2 launch xr_rm_bringup arm_debug.launch.py \
arm:=both use_mock:=true use_mujoco:=true
```
真机同步显示方式:
```bash
ros2 launch xr_rm_bringup arm_debug.launch.py \
arm:=both use_mock:=false use_mujoco:=true
```
第二条命令会连接并控制真机,只能在完成现有真机安全检查后使用。所有自动化和首次
集成验收只运行 `use_mock:=true`
MuJoCo 进程使用项目现有的 XR Conda Python,因为本机 MuJoCo 与 Placo 均安装在
该环境中。未启用 `use_mujoco` 时不启动或导入 MuJoCo,新包不能让现有 mock 模式
强制依赖厂商 SDK。
## 校验与异常处理
- URDF、网格或 MuJoCo 加载失败:MuJoCo 节点明确报错并退出,现有遥操节点不改变;
- 收到关节缺失、重复、数量错误或包含 NaN/Inf 的消息:拒绝整帧并保持上一姿态;
- 尚未收齐左右首帧状态:等待并报告缺失侧,不把零位姿冒充有效初始姿态;
- 任一侧状态暂时中断:保持该侧最后有效姿态,不生成运动、不切换来源;
- 同一状态话题存在多个发布者:输出明确报警;
- viewer 关闭:只结束 MuJoCo 显示,不触发或改变机器人运动。
## 测试与验收
使用现有 pytest、ROS2 Humble 和 colcon,不增加测试框架,不连接真机。
最小自动化覆盖:
- MuJoCo 可以直接加载现有双臂 URDF;
- 14 个活动关节名称与左右 qpos 映射正确,消息顺序变化不会串臂;
- YAML 初始角度经 Mock 转换后能正确写入 MuJoCo
- 非法关节消息不会部分污染当前状态;
- Mock A/X Reset 后回到对应 YAML 姿态;
- Reset 时 Grip 保持按下能够重新锚定并继续控制;
- 真机路径仍保留 Grip 松开后重新使能要求;
- `use_mujoco` 默认关闭,现有三种 mock/真机启动行为不变。
在工作空间根目录执行:
```bash
cd /home/robot/WS_xr
source /opt/ros/humble/setup.bash
/home/robot/miniconda3/envs/xr/bin/python -m pytest \
src/xr_rm_mujoco/test/test_dual_arm_simulator.py -v
pytest src/xr_rm_teleop/test/test_joint_control.py -v
pytest src/xr_rm_teleop/test/test_orientation_control.py -v
colcon build --symlink-install
```
构建后只用 Mock 启动并通过 PICO 或 sample UDP 检查:左右模型初始姿态、独立运动、
A/X Reset、Reset 后继续遥操作、话题频率和关闭 viewer 后遥操作节点状态。不得在
自动化验收中使用 `use_mock:=false`
@@ -0,0 +1,4 @@
# 双 RM75 MuJoCo 运动学显示参数。初始姿态和控制限制仍由 dual_arm_rm75.yaml 管理。
dual_arm_simulator:
ros__parameters:
render_rate_hz: 60.0
+28 -28
View File
@@ -16,23 +16,23 @@ left_arm_teleop:
feedback_resync_timeout_sec: 0.5
# 位姿目标生成与平滑参数。
scale: 0.75
scale: 0.7
deadband_m: 0.001
target_filter_alpha: 0.65
target_filter_alpha_fast: 0.9
target_filter_fast_threshold_m: 0.03
max_linear_speed: 0.2
max_linear_speed: 0.15
enable_position_axes: [true, true, true]
enable_orientation_control: true
enable_orientation_axes: [true, true, true]
orientation_deadband_rad: 0.005
orientation_filter_alpha: 0.65
max_orientation_speed: 0.5
workspace_min: [-0.70, -0.60, 0.10]
workspace_max: [0.70, 0.40, 0.70]
cyl_radius_limit: [0.20, 0.60]
low_z_threshold: 0.20
low_z_min_radius: 0.21
workspace_min: [-0.70, -0.70, 0.10]
workspace_max: [0.70, 0.10, 0.75]
cyl_radius_limit: [0.10, 0.80]
low_z_threshold: 0.1
low_z_min_radius: 0.1
# PICO/OpenXR 位置坐标:+X 向右,+Y 向上,+Z 向后。
# 映射关系:机器人位移增量 = [-手柄y, 手柄z, -手柄x]。
@@ -45,7 +45,7 @@ left_arm_teleop:
realtime_push_host_ip: 192.168.192.148
realtime_push_port: 8089
realtime_push_cycle_ms: 5
avoid_singularity: 0
avoid_singularity: 1
follow: false
canfd_trajectory_mode: 2
canfd_radio: 0
@@ -54,14 +54,14 @@ left_arm_teleop:
enable_trigger_gripper_control: true
trigger_close_threshold: 0.95
configure_peripheral_on_connect: true
max_line_speed: 1.0
max_angular_speed: 1.5
max_line_acc: 1.0
max_angular_acc: 2.0
max_line_speed: 0.25
max_angular_speed: 0.6
max_line_acc: 1.3
max_angular_acc: 3.0
joint_max_speed: 180.0
joint_max_acc: 180.0
joint_max_acc: 300.0
move_to_initial_pose_on_connect: false
initial_joint_pose: [-167.21, 28.48, 28.21, 61.35, -14.40, 84.49, -124.51]
initial_joint_pose: [-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55]
init_move_speed: 20
debug_topic_prefix: /xr_rm
@@ -73,23 +73,23 @@ right_arm_teleop:
command_timeout_sec: 0.12
feedback_resync_timeout_sec: 0.5
scale: 0.75
scale: 0.7
deadband_m: 0.001
target_filter_alpha: 0.65
target_filter_alpha_fast: 0.9
target_filter_fast_threshold_m: 0.03
max_linear_speed: 0.2
target_filter_fast_threshold_m: 0.05
max_linear_speed: 0.15
enable_position_axes: [true, true, true]
enable_orientation_control: true
enable_orientation_axes: [true, true, true]
orientation_deadband_rad: 0.005
orientation_filter_alpha: 0.65
max_orientation_speed: 0.5
workspace_min: [-0.70, -0.60, 0.10]
workspace_max: [0.70, 0.40, 0.70]
cyl_radius_limit: [0.20, 0.60]
low_z_threshold: 0.20
low_z_min_radius: 0.21
workspace_min: [-0.70, -0.70, 0.10]
workspace_max: [0.70, 0.10, 0.75]
cyl_radius_limit: [0.10, 0.80]
low_z_threshold: 0.1
low_z_min_radius: 0.1
# PICO/OpenXR 位置坐标:+X 向右,+Y 向上,+Z 向后。
# 映射关系:机器人位移增量 = [手柄y, 手柄z, 手柄x]。
@@ -111,13 +111,13 @@ right_arm_teleop:
enable_trigger_gripper_control: true
trigger_close_threshold: 0.95
configure_peripheral_on_connect: true
max_line_speed: 1.0
max_angular_speed: 1.5
max_line_acc: 1.0
max_angular_acc: 2.0
max_line_speed: 0.25
max_angular_speed: 0.6
max_line_acc: 1.3
max_angular_acc: 3.0
joint_max_speed: 180.0
joint_max_acc: 180.0
joint_max_acc: 300.0
move_to_initial_pose_on_connect: false
initial_joint_pose: [-25.60, 34.09, -19.55, 71.59, 16.97, 80.98, 59.67]
initial_joint_pose: [-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35]
init_move_speed: 20
debug_topic_prefix: /xr_rm
+14 -14
View File
@@ -10,23 +10,23 @@ single_arm_velocity_teleop:
feedback_resync_timeout_sec: 0.5
# 手柄相对位姿 -> 目标 TCP 位姿;随后做目标低通、姿态低通和单帧步长限制。
scale: 1.0
scale: 0.7
deadband_m: 0.001
target_filter_alpha: 0.65
target_filter_alpha_fast: 0.9
target_filter_fast_threshold_m: 0.03
max_linear_speed: 0.3
max_linear_speed: 0.15
enable_position_axes: [true, true, true]
enable_orientation_control: true
enable_orientation_axes: [true, true, true]
orientation_deadband_rad: 0.005
orientation_filter_alpha: 0.65
max_orientation_speed: 0.5
workspace_min: [-0.70, -0.60, 0.10]
workspace_max: [0.70, 0.40, 0.70]
cyl_radius_limit: [0.20, 0.60]
low_z_threshold: 0.20
low_z_min_radius: 0.21
workspace_min: [-0.70, -0.70, 0.10]
workspace_max: [0.70, 0.10, 0.75]
cyl_radius_limit: [0.10, 0.80]
low_z_threshold: 0.1
low_z_min_radius: 0.1
# 映射关系:机器人位移增量 = [-手柄y, 手柄z, -手柄x]。
xr_to_robot_matrix: [0.0, -1.0, 0.0,
@@ -38,7 +38,7 @@ single_arm_velocity_teleop:
realtime_push_host_ip: 192.168.192.148
realtime_push_port: 8089
realtime_push_cycle_ms: 5
avoid_singularity: 0
avoid_singularity: 1
follow: false
canfd_trajectory_mode: 2
canfd_radio: 0
@@ -47,13 +47,13 @@ single_arm_velocity_teleop:
enable_trigger_gripper_control: true
trigger_close_threshold: 0.95
configure_peripheral_on_connect: true
max_line_speed: 1.0
max_angular_speed: 1.5
max_line_acc: 1.0
max_angular_acc: 2.0
max_line_speed: 0.25
max_angular_speed: 0.6
max_line_acc: 1.3
max_angular_acc: 3.0
joint_max_speed: 180.0
joint_max_acc: 180.0
joint_max_acc: 300.0
move_to_initial_pose_on_connect: false
initial_joint_pose: [-79.55, -9.99, 71.01, 101.45, 95.07, -84.47, -74.52]
initial_joint_pose: [-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55]
init_move_speed: 20
debug_topic_prefix: /xr_rm
+4 -4
View File
@@ -9,14 +9,14 @@ set_initial_tool_state: false
tools_in_ee:
scissor:
# x, y, z, qx, qy, qz, qw
pose: [0.0, 0.0, 0.19, 0.0, 0.0, 0.0, 1.0]
pose: [0.0, 0.0, 0.165, 0.0, 0.0, 0.0, 1.0]
# mass, center_x, center_y, center_z, reserved...
load: [0.66, 0.0, 0.0, 0.06, 0.0, 0.0, 0.0]
omnipic:
pose: [0.0, 0.0, 0.16, 0.0, 0.0, 0.0, 1.0]
pose: [0.0, 0.0, 0.14, 0.0, 0.0, 0.0, 1.0]
load: [0.43, 0.0, 0.0, 0.06, 0.0, 0.0, 0.0]
minisci:
pose: [0.0, 0.0, 0.19, 0.0, 0.0, 0.0, 1.0]
pose: [0.0, 0.0, 0.165, 0.0, 0.0, 0.0, 1.0]
load: [0.46, 0.0, 0.0, 0.06, 0.0, 0.0, 0.0]
no_tool:
pose: [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0]
@@ -24,6 +24,6 @@ tools_in_ee:
arms:
left:
scissorgripper: 2
scissorgripper: 0
right:
scissorgripper: 1
+2 -2
View File
@@ -22,7 +22,7 @@ single_arm_velocity_teleop:
orientation_filter_alpha: 0.65
max_orientation_speed: 0.5
workspace_min: [-0.70, -0.70, 0.10]
workspace_max: [0.70, 0.70, 0.75]
workspace_max: [0.70, 0.10, 0.75]
cyl_radius_limit: [0.10, 0.80]
low_z_threshold: 0.1
low_z_min_radius: 0.1
@@ -54,6 +54,6 @@ single_arm_velocity_teleop:
joint_max_speed: 180.0
joint_max_acc: 300.0
move_to_initial_pose_on_connect: false
initial_joint_pose: [-90.14, 3.76, -86.89, 87.89, -96.53, -79.62, -90.04]
initial_joint_pose: [-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35]
init_move_speed: 20
debug_topic_prefix: /xr_rm
+38 -8
View File
@@ -8,7 +8,7 @@
from pathlib import Path
from launch import LaunchDescription
from launch.actions import DeclareLaunchArgument, OpaqueFunction
from launch.actions import DeclareLaunchArgument, OpaqueFunction, Shutdown
from launch.substitutions import LaunchConfiguration, PathJoinSubstitution
from launch_ros.actions import Node
from launch_ros.substitutions import FindPackageShare
@@ -31,13 +31,12 @@ def _config_file(name: str) -> PathJoinSubstitution:
])
def _rm75_urdf() -> PathJoinSubstitution:
def _dual_rm75_urdf() -> PathJoinSubstitution:
return PathJoinSubstitution([
FindPackageShare("xr_rm_teleop"),
"models",
"rm75_omnipicker",
"urdf",
"RM75-B_OmniPicker_fixed.urdf",
"dual_rm75",
"Dual_arm.urdf",
])
@@ -48,6 +47,9 @@ def _udp_receiver_node() -> Node:
executable="udp_controller_receiver",
name="udp_controller_receiver",
output="screen",
on_exit=Shutdown(
reason="XR UDP receiver exited; stopping arm_debug launch"
),
parameters=[{
"udp_host": LaunchConfiguration("udp_host"),
"udp_port": LaunchConfiguration("udp_port"),
@@ -58,6 +60,26 @@ def _udp_receiver_node() -> Node:
)
def _mujoco_node() -> Node:
"""启动只读双臂 MuJoCo 运动学显示节点。"""
return Node(
package="xr_rm_mujoco",
executable="dual_arm_simulator",
name="dual_arm_simulator",
output="screen",
prefix=[XR_PYTHON],
parameters=[
_config_file("dual_arm_mujoco.yaml"),
{"robot_urdf_path": _dual_rm75_urdf()},
],
)
def _validate_mujoco_mode(arm: str, use_mujoco: bool) -> None:
if use_mujoco and arm != "both":
raise ValueError("use_mujoco:=true requires arm:=both")
def _single_arm_node(
arm: str,
use_mock: bool,
@@ -75,7 +97,7 @@ def _single_arm_node(
_config_file(config_name),
{
"use_mock": use_mock,
"robot_urdf_path": _rm75_urdf(),
"robot_urdf_path": _dual_rm75_urdf(),
"peripheral_config_file": _config_file("peripherals_rm75.yaml"),
"peripheral_arm": arm,
"tool_command_topic": f"/xr_rm/{arm_name}/tool_enable",
@@ -102,7 +124,7 @@ def _dual_arm_nodes(use_mock: bool) -> list[Node]:
config_file,
{
"use_mock": use_mock,
"robot_urdf_path": _rm75_urdf(),
"robot_urdf_path": _dual_rm75_urdf(),
"peripheral_config_file": _config_file("peripherals_rm75.yaml"),
"peripheral_arm": "left",
"tool_command_topic": "/xr_rm/left_rm75/tool_enable",
@@ -119,7 +141,7 @@ def _dual_arm_nodes(use_mock: bool) -> list[Node]:
config_file,
{
"use_mock": use_mock,
"robot_urdf_path": _rm75_urdf(),
"robot_urdf_path": _dual_rm75_urdf(),
"peripheral_config_file": _config_file("peripherals_rm75.yaml"),
"peripheral_arm": "right",
"tool_command_topic": "/xr_rm/right_rm75/tool_enable",
@@ -139,15 +161,21 @@ def _launch_setup(context, *args, **kwargs):
)
arm = LaunchConfiguration("arm").perform(context).strip().lower()
use_mock = _as_bool(LaunchConfiguration("use_mock").perform(context))
use_mujoco = _as_bool(
LaunchConfiguration("use_mujoco").perform(context)
)
if arm not in ("left", "right", "both"):
raise ValueError("arm must be one of: left, right, both")
_validate_mujoco_mode(arm, use_mujoco)
nodes = [_udp_receiver_node()]
if arm == "both":
nodes.extend(_dual_arm_nodes(use_mock))
else:
nodes.append(_single_arm_node(arm, use_mock))
if use_mujoco:
nodes.append(_mujoco_node())
return nodes
@@ -157,6 +185,8 @@ def generate_launch_description() -> LaunchDescription:
DeclareLaunchArgument("arm", default_value="right"),
# true 时只跑 mock,不连接 RM75false 时通过 RealMan SDK 连接真机。
DeclareLaunchArgument("use_mock", default_value="true"),
# true 时额外启动只读 MuJoCo 双臂显示,默认不改变现有启动行为。
DeclareLaunchArgument("use_mujoco", default_value="false"),
# UDP 监听参数,需要与 PICO 端或 sample_udp_sender 保持一致。
DeclareLaunchArgument("udp_host", default_value="0.0.0.0"),
DeclareLaunchArgument("udp_port", default_value="15000"),
+1
View File
@@ -10,6 +10,7 @@
<buildtool_depend>ament_cmake</buildtool_depend>
<exec_depend>xr_rm_input</exec_depend>
<exec_depend>xr_rm_mujoco</exec_depend>
<exec_depend>xr_rm_teleop</exec_depend>
<exec_depend>python3-tk</exec_depend>
@@ -0,0 +1,43 @@
import importlib.util
from pathlib import Path
import pytest
from launch import LaunchContext
from launch.actions import DeclareLaunchArgument, Shutdown
from launch.utilities import perform_substitutions
MODULE_PATH = Path(__file__).parents[1] / "launch" / "arm_debug.launch.py"
SPEC = importlib.util.spec_from_file_location("arm_debug_launch", MODULE_PATH)
arm_debug_launch = importlib.util.module_from_spec(SPEC)
assert SPEC.loader is not None
SPEC.loader.exec_module(arm_debug_launch)
def test_launch_declares_mujoco_disabled_by_default() -> None:
description = arm_debug_launch.generate_launch_description()
arguments = {
entity.name: entity
for entity in description.entities
if isinstance(entity, DeclareLaunchArgument)
}
assert "use_mujoco" in arguments
assert perform_substitutions(
LaunchContext(),
arguments["use_mujoco"].default_value,
) == "false"
def test_mujoco_mode_requires_both_arms() -> None:
arm_debug_launch._validate_mujoco_mode("both", True)
arm_debug_launch._validate_mujoco_mode("left", False)
with pytest.raises(ValueError, match="arm:=both"):
arm_debug_launch._validate_mujoco_mode("left", True)
def test_udp_receiver_exit_shuts_down_launch() -> None:
receiver = arm_debug_launch._udp_receiver_node()
assert isinstance(receiver._ExecuteLocal__on_exit, Shutdown)
@@ -13,6 +13,100 @@ assert SPEC.loader is not None
SPEC.loader.exec_module(launcher_ui)
class LauncherCommandsTest(unittest.TestCase):
def test_modes_expose_the_confirmed_command_matrix(self) -> None:
expected_titles = {
"Simulation": [
"Dual Arm Mock Launch",
"XRobotoolkit UDP Bridge (90 Hz)",
"Sample UDP Sender (Both Staggered, 60s)",
"Open Controller Hz Monitor",
"Open ROS Topic/Node List Monitor",
"Open Controller Topic Monitor",
],
"MuJoCo": [
"Dual Arm MuJoCo Mock Launch",
"Dual Arm MuJoCo Real Hardware Launch",
"XRobotoolkit UDP Bridge (90 Hz)",
"Open Controller Hz Monitor",
"Open ROS Topic/Node List Monitor",
"Open Controller Topic Monitor",
],
"Real Hardware": [
"Ping Left RM75",
"Ping Right RM75",
"Left Arm RealMan Launch",
"Right Arm RealMan Launch",
"Dual Arm RealMan Launch",
"XRobotoolkit UDP Bridge (90 Hz)",
"Left Gripper Open",
"Left Gripper Close",
"Right Gripper Open",
"Right Gripper Close",
"Open ROS Topic/Node List Monitor",
"Open Controller Topic Monitor",
],
"Diagnostics": [
"ROS Doctor Report",
"XR-RM Bringup Prefix",
"XR-RM Input Prefix",
"XR-RM Teleop Prefix",
"XR-RM MuJoCo Prefix",
"Open Controller Position Monitor",
"Open Controller Hz Monitor",
"Open ROS Topic/Node List Monitor",
"Open Controller Topic Monitor",
],
}
self.assertEqual(launcher_ui.MODES, list(expected_titles))
for mode, titles in expected_titles.items():
actual = [
indexed_title.split(". ", 1)[1]
for indexed_title, _command in launcher_ui.build_commands_by_mode(mode)
]
self.assertEqual(actual, titles)
def test_mujoco_launches_distinguish_mock_and_real_hardware(self) -> None:
commands = dict(launcher_ui.build_commands_by_mode("MuJoCo"))
self.assertIn(
"arm:=both use_mock:=true use_mujoco:=true",
commands["1. Dual Arm MuJoCo Mock Launch"],
)
self.assertIn(
"arm:=both use_mock:=false use_mujoco:=true",
commands["2. Dual Arm MuJoCo Real Hardware Launch"],
)
def test_cmd_vel_monitor_is_completely_removed(self) -> None:
self.assertFalse(hasattr(launcher_ui, "CMD_VEL_MONITOR_ACTION"))
for mode in launcher_ui.MODES:
self.assertNotIn("cmd_vel", repr(launcher_ui.build_commands_by_mode(mode)))
def test_environment_check_includes_mujoco_package(self) -> None:
app = object.__new__(launcher_ui.LauncherApp)
app.workspace_root = launcher_ui._find_workspace_root()
app.terminal_command = lambda _title, _script: ["terminal"]
app.x_terminal_target = lambda: "terminator"
checked_packages = []
app._ros_package_available = lambda package: checked_packages.append(package) or True
app.show_text_dialog = lambda *_args: None
app.status = mock.Mock()
with mock.patch.object(
launcher_ui.shutil,
"which",
return_value="/usr/bin/x-terminal-emulator",
):
app.check_prerequisites()
self.assertEqual(
checked_packages,
["xr_rm_bringup", "xr_rm_input", "xr_rm_teleop", "xr_rm_mujoco"],
)
class LauncherCleanupTest(unittest.TestCase):
def test_xrobotoolkit_cleanup_policy_only_stops_service_on_window_close(self) -> None:
stop_all_patterns = set(
@@ -89,6 +183,34 @@ class LauncherCleanupTest(unittest.TestCase):
],
)
def test_stop_all_and_window_close_stop_mujoco(self) -> None:
for stop_pc_service in (False, True):
app = object.__new__(launcher_ui.LauncherApp)
app.status = mock.Mock()
app.close_related_terminal_windows = lambda: 0
def fake_check_output(command, **_kwargs):
if command == ["pgrep", "-f", "dual_arm_simulator"]:
return "404\n"
raise subprocess.CalledProcessError(1, command)
with (
mock.patch.object(
launcher_ui.subprocess,
"check_output",
side_effect=fake_check_output,
),
mock.patch.object(launcher_ui.os, "kill") as kill,
mock.patch.object(launcher_ui.time, "sleep"),
):
app.stop_launched_processes(
confirm=False,
notify=False,
stop_pc_service=stop_pc_service,
)
kill.assert_called_once_with(404, signal.SIGTERM)
if __name__ == "__main__":
unittest.main()
+60 -124
View File
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
"""XR-RM 桌面调试启动器。
提供 Tkinter 图形界面,按“仿真/左臂/右臂/双臂/诊断”组织常用 ROS2
launch、sample_udp_sender、topic 监控和环境检查命令,降低现场调试时的命令输入成本。
提供 Tkinter 图形界面,按“仿真/MuJoCo/真机/诊断”组织常用 ROS2 launch、
sample_udp_sender、topic 监控和环境检查命令,降低现场调试时的命令输入成本。
"""
from __future__ import annotations
@@ -44,8 +44,6 @@ SAMPLE_SENDER_ARGS = (
TERMINAL_TITLE_PREFIX = "XR-RM Terminal - "
TOPIC_MONITOR_TITLE = "XR-RM Topic Monitor"
TOPIC_MONITOR_ACTION = "__xr_rm_topic_monitor__"
CMD_VEL_MONITOR_TITLE = "XR-RM Target Velocity Monitor"
CMD_VEL_MONITOR_ACTION = "__xr_rm_cmd_vel_monitor__"
ROS_GRAPH_MONITOR_TITLE = "XR-RM ROS Graph Monitor"
ROS_GRAPH_MONITOR_ACTION = "__xr_rm_ros_graph_monitor__"
@@ -54,11 +52,6 @@ TOPIC_MONITORS = [
("Right Controller", "/xr/right_controller"),
]
CMD_VEL_MONITORS = [
("Left Target Vel", "/xr_rm/left_rm75/cmd_vel"),
("Right Target Vel", "/xr_rm/right_rm75/cmd_vel"),
]
CONTROLLER_POSITION_MONITOR_TITLE = "XR-RM Controller Position Monitor"
CONTROLLER_POSITION_MONITOR_ACTION = "__xr_rm_controller_position_monitor__"
CONTROLLER_HZ_MONITOR_TITLE = "XR-RM Controller Hz Monitor"
@@ -81,9 +74,8 @@ ROS_GRAPH_MONITORS = [
MODES = [
"Simulation",
"Left Arm",
"Right Arm",
"Dual Arm",
"MuJoCo",
"Real Hardware",
"Diagnostics",
]
@@ -177,21 +169,6 @@ def _source_lines(workspace_root: Path) -> list[str]:
return lines
def _one_click_mock(arm: str, hand: str) -> str:
sender_seconds = SAMPLE_SENDER_STAGGERED_SECONDS if hand == "both" else SAMPLE_SENDER_SECONDS
both_mode = "staggered" if hand == "both" else "synchronized"
return "\n".join([
f"ros2 launch xr_rm_bringup arm_debug.launch.py arm:={arm} use_mock:=true &",
"launch_pid=$!",
"sleep 2",
_sample_udp_sender_command(hand, sender_seconds, both_mode),
"echo",
"echo 'Sample sender finished. The launch process is still running in this terminal.'",
"echo 'Press Ctrl-C here, or use the cleanup button in the launcher, to stop it.'",
"wait \"$launch_pid\"",
])
def _diagnostic_commands() -> list[tuple[str, str]]:
return [
("Open ROS Topic/Node List Monitor", ROS_GRAPH_MONITOR_ACTION),
@@ -202,14 +179,9 @@ def _topic_monitor_item() -> tuple[str, str]:
return ("Open Controller Topic Monitor", TOPIC_MONITOR_ACTION)
def _cmd_vel_monitor_item() -> tuple[str, str]:
return ("Open Target Velocity Monitor", CMD_VEL_MONITOR_ACTION)
def _is_topic_monitor_action(action: str) -> bool:
return action in (
TOPIC_MONITOR_ACTION,
CMD_VEL_MONITOR_ACTION,
CONTROLLER_POSITION_MONITOR_ACTION,
CONTROLLER_HZ_MONITOR_ACTION,
)
@@ -232,14 +204,6 @@ def _topic_monitor_spec(action: str) -> tuple[str, list[tuple[str, str]], str, s
"xr_rm_controller_hz_monitor_",
"controller hz topic",
)
if action == CMD_VEL_MONITOR_ACTION:
return (
CMD_VEL_MONITOR_TITLE,
[(title, f"ros2 topic echo {topic}") for title, topic in CMD_VEL_MONITORS],
"xr_rm_cmd_vel_monitor",
"xr_rm_cmd_vel_monitor_",
"target velocity topic",
)
return (
TOPIC_MONITOR_TITLE,
[(title, f"ros2 topic echo {topic}") for title, topic in TOPIC_MONITORS],
@@ -249,16 +213,10 @@ def _topic_monitor_spec(action: str) -> tuple[str, list[tuple[str, str]], str, s
)
def _finalize_items(
items: list[tuple[str, str]],
one_click: tuple[str, str] | None = None,
) -> list[tuple[str, str]]:
def _finalize_items(items: list[tuple[str, str]]) -> list[tuple[str, str]]:
final_items = items + _diagnostic_commands() + [
_topic_monitor_item(),
_cmd_vel_monitor_item(),
]
if one_click is not None:
final_items.append(one_click)
return _with_index(final_items)
@@ -266,25 +224,64 @@ def build_commands_by_mode(mode: str) -> list[tuple[str, str]]:
# UI 列表只维护命令模板;真正执行时统一套上工作空间 source 和终端包装。
if mode == "Simulation":
items = [
("Left Arm Mock Launch", "ros2 launch xr_rm_bringup arm_debug.launch.py arm:=left use_mock:=true"),
("Right Arm Mock Launch", "ros2 launch xr_rm_bringup arm_debug.launch.py arm:=right use_mock:=true"),
("Dual Arm Mock Launch", "ros2 launch xr_rm_bringup arm_debug.launch.py arm:=both use_mock:=true"),
("XRobotoolkit UDP Bridge (90 Hz)", _xrobotoolkit_bridge_command()),
(
"Sample UDP Sender (Left, 30s)",
_sample_udp_sender_command("left"),
),
(
"Sample UDP Sender (Right, 30s)",
_sample_udp_sender_command("right"),
),
(
"Sample UDP Sender (Both Staggered, 60s)",
_sample_udp_sender_command("both", SAMPLE_SENDER_STAGGERED_SECONDS, "staggered"),
),
("One-Click Left Mock Demo", _one_click_mock("left", "left")),
("One-Click Right Mock Demo", _one_click_mock("right", "right")),
("One-Click Dual Mock Demo", _one_click_mock("both", "both")),
(
"Open Controller Hz Monitor",
CONTROLLER_HZ_MONITOR_ACTION,
),
]
elif mode == "MuJoCo":
items = [
(
"Dual Arm MuJoCo Mock Launch",
"ros2 launch xr_rm_bringup arm_debug.launch.py "
"arm:=both use_mock:=true use_mujoco:=true",
),
(
"Dual Arm MuJoCo Real Hardware Launch",
"ros2 launch xr_rm_bringup arm_debug.launch.py "
"arm:=both use_mock:=false use_mujoco:=true",
),
("XRobotoolkit UDP Bridge (90 Hz)", _xrobotoolkit_bridge_command()),
(
"Open Controller Hz Monitor",
CONTROLLER_HZ_MONITOR_ACTION,
),
]
elif mode == "Real Hardware":
items = [
("Ping Left RM75", f"ping -c 4 {DEFAULT_LEFT_IP}"),
("Ping Right RM75", f"ping -c 4 {DEFAULT_RIGHT_IP}"),
(
"Left Arm RealMan Launch",
"ros2 launch xr_rm_bringup arm_debug.launch.py arm:=left use_mock:=false",
),
(
"Right Arm RealMan Launch",
"ros2 launch xr_rm_bringup arm_debug.launch.py arm:=right use_mock:=false",
),
(
"Dual Arm RealMan Launch",
"ros2 launch xr_rm_bringup arm_debug.launch.py arm:=both use_mock:=false",
),
("XRobotoolkit UDP Bridge (90 Hz)", _xrobotoolkit_bridge_command()),
("Left Gripper Open", _tool_command("left", True)),
("Left Gripper Close", _tool_command("left", False)),
("Right Gripper Open", _tool_command("right", True)),
("Right Gripper Close", _tool_command("right", False)),
]
else:
items = [
("ROS Doctor Report", "ros2 doctor --report"),
("XR-RM Bringup Prefix", "ros2 pkg prefix xr_rm_bringup"),
("XR-RM Input Prefix", "ros2 pkg prefix xr_rm_input"),
("XR-RM Teleop Prefix", "ros2 pkg prefix xr_rm_teleop"),
("XR-RM MuJoCo Prefix", "ros2 pkg prefix xr_rm_mujoco"),
(
"Open Controller Position Monitor",
CONTROLLER_POSITION_MONITOR_ACTION,
@@ -294,64 +291,7 @@ def build_commands_by_mode(mode: str) -> list[tuple[str, str]]:
CONTROLLER_HZ_MONITOR_ACTION,
),
]
one_click = None
elif mode == "Left Arm":
items = [
("Ping Left RM75", f"ping -c 4 {DEFAULT_LEFT_IP}"),
(
"Left Arm RealMan Launch",
"ros2 launch xr_rm_bringup arm_debug.launch.py arm:=left use_mock:=false",
),
("XRobotoolkit UDP Bridge (90 Hz)", _xrobotoolkit_bridge_command()),
("Left Tool Open", _tool_command("left", True)),
("Left Tool Close", _tool_command("left", False)),
(
"Sample UDP Sender (Left, 30s)",
_sample_udp_sender_command("left"),
),
]
one_click = None
elif mode == "Right Arm":
items = [
("Ping Right RM75", f"ping -c 4 {DEFAULT_RIGHT_IP}"),
(
"Right Arm RealMan Launch",
"ros2 launch xr_rm_bringup arm_debug.launch.py arm:=right use_mock:=false",
),
("XRobotoolkit UDP Bridge (90 Hz)", _xrobotoolkit_bridge_command()),
("Right Tool Open", _tool_command("right", True)),
("Right Tool Close", _tool_command("right", False)),
(
"Sample UDP Sender (Right, 30s)",
_sample_udp_sender_command("right"),
),
]
one_click = None
elif mode == "Dual Arm":
items = [
("Ping Left RM75", f"ping -c 4 {DEFAULT_LEFT_IP}"),
("Ping Right RM75", f"ping -c 4 {DEFAULT_RIGHT_IP}"),
(
"Dual Arm RealMan Launch",
"ros2 launch xr_rm_bringup arm_debug.launch.py arm:=both use_mock:=false",
),
("XRobotoolkit UDP Bridge (90 Hz)", _xrobotoolkit_bridge_command()),
(
"Sample UDP Sender (Both Staggered, 60s)",
_sample_udp_sender_command("both", SAMPLE_SENDER_STAGGERED_SECONDS, "staggered"),
),
]
one_click = None
else:
items = [
("ROS Doctor Report", "ros2 doctor --report"),
("XR-RM Bringup Prefix", "ros2 pkg prefix xr_rm_bringup"),
("XR-RM Input Prefix", "ros2 pkg prefix xr_rm_input"),
("XR-RM Teleop Prefix", "ros2 pkg prefix xr_rm_teleop"),
("XRobotoolkit UDP Bridge (90 Hz)", _xrobotoolkit_bridge_command()),
]
one_click = None
return _finalize_items(items, one_click)
return _finalize_items(items)
class LauncherApp:
@@ -608,7 +548,7 @@ class LauncherApp:
else:
warnings.append("[WARN] Could not identify x-terminal-emulator target.")
for package in ("xr_rm_bringup", "xr_rm_input", "xr_rm_teleop"):
for package in ("xr_rm_bringup", "xr_rm_input", "xr_rm_teleop", "xr_rm_mujoco"):
if self._ros_package_available(package):
ok.append(f"[OK] ROS package available: {package}")
else:
@@ -1254,7 +1194,6 @@ class LauncherApp:
title_patterns = (
TERMINAL_TITLE_PREFIX,
TOPIC_MONITOR_TITLE,
CMD_VEL_MONITOR_TITLE,
CONTROLLER_POSITION_MONITOR_TITLE,
CONTROLLER_HZ_MONITOR_TITLE,
ROS_GRAPH_MONITOR_TITLE,
@@ -1326,24 +1265,21 @@ class LauncherApp:
*_xrobotoolkit_cleanup_patterns(stop_pc_service=stop_pc_service),
TERMINAL_TITLE_PREFIX,
TOPIC_MONITOR_TITLE,
CMD_VEL_MONITOR_TITLE,
ROS_GRAPH_MONITOR_TITLE,
"xr_rm_topic_monitor_",
"xr_rm_cmd_vel_monitor_",
"xr_rm_controller_position_monitor_",
"xr_rm_controller_hz_monitor_",
"xr_rm_ros_graph_monitor_",
"udp_controller_receiver",
"sample_udp_sender",
"single_arm_velocity_teleop",
"dual_arm_simulator",
"ros2 topic echo /xr/left_controller --field pose.position",
"ros2 topic echo /xr/right_controller --field pose.position",
"ros2 topic echo /xr/left_controller",
"ros2 topic echo /xr/right_controller",
"ros2 topic hz /xr/left_controller",
"ros2 topic hz /xr/right_controller",
"ros2 topic echo /xr_rm/left_rm75/cmd_vel",
"ros2 topic echo /xr_rm/right_rm75/cmd_vel",
"ros2 topic list",
"ros2 node list",
]
+122
View File
@@ -0,0 +1,122 @@
import math
from types import SimpleNamespace
from builtin_interfaces.msg import Time
from xr_rm_input.udp_controller_receiver import UdpControllerReceiver
from xr_rm_input.xrobotoolkit_to_udp_bridge import (
_buttons_payload,
_controller_payload,
_stop_controller_payload,
)
def _receiver_without_socket() -> UdpControllerReceiver:
receiver = object.__new__(UdpControllerReceiver)
receiver._quat_order = "xyzw"
receiver.get_clock = lambda: SimpleNamespace(
now=lambda: SimpleNamespace(to_msg=lambda: Time())
)
return receiver
def test_bridge_payload_contains_only_selected_controller_inputs() -> None:
buttons = _buttons_payload(
primary=lambda: True,
secondary=lambda: False,
)
payload = _controller_payload(
hand="left",
pose=[1.0, 2.0, 3.0, 0.0, 0.0, 0.0, 1.0],
axis=[2.0, -2.0],
buttons=buttons,
grip_pressed=True,
trigger_pressed=False,
)
assert payload == {
"hand": "left",
"grip": True,
"trigger": 0.0,
"pos": [1.0, 2.0, 3.0],
"quat": [0.0, 0.0, 0.0, 1.0],
"pose_valid": True,
"pose_source": "xrobotoolkit",
"axis": [1.0, -1.0],
"buttons": {
"primary": True,
"secondary": False,
},
}
def test_stop_payload_uses_neutral_selected_inputs() -> None:
payload = _stop_controller_payload("right")
assert payload["axis"] == [0.0, 0.0]
assert payload["buttons"] == {
"primary": False,
"secondary": False,
}
assert "grip_value" not in payload
assert "trigger_value" not in payload
def test_receiver_publishes_selected_controller_inputs() -> None:
msg = _receiver_without_socket()._payload_to_msg(
{
"grip": True,
"trigger": 1.0,
"axis": [2.0, -2.0],
"buttons": {
"primary": True,
"secondary": False,
},
"pos": [1.0, 2.0, 3.0],
"quat": [0.0, 0.0, 0.0, 1.0],
},
"left",
)
assert msg.primary is True
assert msg.secondary is False
assert list(msg.axis) == [1.0, -1.0]
def test_receiver_defaults_invalid_optional_inputs() -> None:
msg = _receiver_without_socket()._payload_to_msg(
{
"grip": True,
"trigger": 0.4,
"axis": [math.nan, 0.0],
"buttons": [],
"pos": [1.0, 2.0, 3.0],
"quat": [0.0, 0.0, 0.0, 1.0],
},
"right",
)
assert msg.primary is False
assert msg.secondary is False
assert list(msg.axis) == [0.0, 0.0]
assert msg.grip is True
assert abs(msg.trigger - 0.4) < 1e-6
assert msg.pose.position.x == 1.0
assert msg.pose.position.y == 2.0
assert msg.pose.position.z == 3.0
def test_receiver_defaults_missing_legacy_optional_inputs() -> None:
msg = _receiver_without_socket()._payload_to_msg(
{
"grip": True,
"trigger": 0.0,
"pos": [0.0, 1.0, 0.0],
"quat": [0.0, 0.0, 0.0, 1.0],
},
"left",
)
assert msg.primary is False
assert msg.secondary is False
assert list(msg.axis) == [0.0, 0.0]
assert msg.grip is True
@@ -1,10 +1,11 @@
"""XR 手柄 UDP 接收节点。
UDP JSON 数据包中解析左右手柄位姿握持键和扳机值并发布为
`xr_rm_interfaces/XrController` 消息供遥操作和夹爪节点订阅
UDP JSON 数据包中解析左右手柄位姿GripTrigger摇杆和主副按键
并发布为 `xr_rm_interfaces/XrController` 消息供遥操作和夹爪节点订阅
"""
import json
import math
import socket
from collections.abc import Iterable, Mapping
from typing import Any
@@ -124,6 +125,8 @@ class UdpControllerReceiver(Node):
pos, quat = self._extract_pose(payload)
if len(pos) != 3 or len(quat) != 4:
raise ValueError("expected pos[3] and quat[4]")
axis = self._optional_axis(payload.get("axis"))
primary, secondary = self._optional_buttons(payload.get("buttons"))
msg = XrController()
msg.header.stamp = self.get_clock().now().to_msg()
@@ -144,6 +147,9 @@ class UdpControllerReceiver(Node):
msg.grip = grip
msg.trigger = self._clamp_float(payload.get("trigger", 0.0), 0.0, 1.0)
msg.primary = primary
msg.secondary = secondary
msg.axis = axis
msg.pose.position.x = float(pos[0])
msg.pose.position.y = float(pos[1])
msg.pose.position.z = float(pos[2])
@@ -213,6 +219,28 @@ class UdpControllerReceiver(Node):
raise ValueError("expected 3D position")
return [float(item) for item in vector]
@staticmethod
def _optional_axis(value: Any) -> list[float]:
try:
axis = [float(item) for item in value]
except (TypeError, ValueError):
return [0.0, 0.0]
if len(axis) != 2 or not all(math.isfinite(item) for item in axis):
return [0.0, 0.0]
return [
min(max(axis[0], -1.0), 1.0),
min(max(axis[1], -1.0), 1.0),
]
@classmethod
def _optional_buttons(cls, value: Any) -> tuple[bool, bool]:
if not isinstance(value, Mapping):
return False, False
return (
cls._as_bool(value.get("primary", False)),
cls._as_bool(value.get("secondary", False)),
)
def _quaternion(self, value: Any) -> list[float]:
if isinstance(value, Mapping):
if self._quat_order == "wxyz":
@@ -1,8 +1,8 @@
"""XRoboToolkit SDK 到当前 UDP controller JSON 协议的桥接脚本。
该脚本运行在安装了 `xrobotoolkit_sdk` Python 环境中从官方
XRoboToolkit PC-Service SDK 读取 PICO 左右手柄 pose / grip / trigger
再发送现有 `udp_controller_receiver` 兼容的 UDP JSON
XRoboToolkit PC-Service SDK 读取 PICO 左右手柄 poseGripTrigger
摇杆和主副按键再发送 `udp_controller_receiver` 兼容的 UDP JSON
"""
import argparse
@@ -94,8 +94,6 @@ def _controller_payload(
*,
hand: str,
pose: Any,
grip_value: Any,
trigger_value: Any,
axis: Any,
buttons: dict[str, bool],
grip_pressed: bool,
@@ -103,8 +101,6 @@ def _controller_payload(
pose_valid: bool = True,
) -> dict[str, Any]:
pos, quat = _pose_to_pos_quat(pose) if pose_valid else (ZERO_POS.copy(), IDENTITY_QUAT.copy())
grip_float = _clamp_float(grip_value, 0.0, 1.0)
trigger_float = _clamp_float(trigger_value, 0.0, 1.0)
return {
"hand": hand,
"grip": pose_valid and grip_pressed,
@@ -113,8 +109,6 @@ def _controller_payload(
"quat": quat,
"pose_valid": pose_valid,
"pose_source": POSE_SOURCE,
"grip_value": grip_float,
"trigger_value": trigger_float,
"axis": _safe_axis(axis),
"buttons": buttons,
}
@@ -129,15 +123,10 @@ def _stop_controller_payload(hand: str) -> dict[str, Any]:
"quat": IDENTITY_QUAT.copy(),
"pose_valid": False,
"pose_source": POSE_SOURCE,
"grip_value": 0.0,
"trigger_value": 0.0,
"axis": [0.0, 0.0],
"buttons": {
"grip": False,
"primary": False,
"secondary": False,
"menu": False,
"axis_click": False,
},
}
@@ -181,18 +170,12 @@ def _send_stop_packets(
def _buttons_payload(
*,
grip: bool,
primary: Callable[[], Any],
secondary: Callable[[], Any],
menu: Callable[[], Any],
axis_click: Callable[[], Any],
) -> dict[str, bool]:
return {
"grip": grip,
"primary": _safe_bool(primary),
"secondary": _safe_bool(secondary),
"menu": _safe_bool(menu),
"axis_click": _safe_bool(axis_click),
}
@@ -321,15 +304,10 @@ def main(argv: Sequence[str] | None = None) -> None:
"left": _controller_payload(
hand="left",
pose=xrt.get_left_controller_pose(),
grip_value=left_grip_value,
trigger_value=left_trigger_value,
axis=xrt.get_left_axis(),
buttons=_buttons_payload(
grip=left_grip,
primary=xrt.get_X_button,
secondary=xrt.get_Y_button,
menu=xrt.get_left_menu_button,
axis_click=xrt.get_left_axis_click,
),
grip_pressed=left_grip,
trigger_pressed=left_trigger,
@@ -337,15 +315,10 @@ def main(argv: Sequence[str] | None = None) -> None:
"right": _controller_payload(
hand="right",
pose=xrt.get_right_controller_pose(),
grip_value=right_grip_value,
trigger_value=right_trigger_value,
axis=xrt.get_right_axis(),
buttons=_buttons_payload(
grip=right_grip,
primary=xrt.get_A_button,
secondary=xrt.get_B_button,
menu=xrt.get_right_menu_button,
axis_click=xrt.get_right_axis_click,
),
grip_pressed=right_grip,
trigger_pressed=right_trigger,
+5
View File
@@ -1,5 +1,10 @@
std_msgs/Header header
string hand
bool grip
float32 trigger
bool primary
bool secondary
float32[2] axis
geometry_msgs/Pose pose
+24
View File
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>xr_rm_mujoco</name>
<version>0.1.0</version>
<description>MuJoCo kinematic visualization for the dual RM75 platform.</description>
<maintainer email="user@example.com">Yikai Fu</maintainer>
<license>Apache-2.0</license>
<buildtool_depend>ament_python</buildtool_depend>
<exec_depend>rclpy</exec_depend>
<exec_depend>sensor_msgs</exec_depend>
<exec_depend>xr_rm_teleop</exec_depend>
<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
<test_depend>python3-pytest</test_depend>
<test_depend>python3-yaml</test_depend>
<export>
<build_type>ament_python</build_type>
</export>
</package>
+1
View File
@@ -0,0 +1 @@
+4
View File
@@ -0,0 +1,4 @@
[develop]
script_dir=$base/lib/xr_rm_mujoco
[install]
install_scripts=$base/lib/xr_rm_mujoco
+28
View File
@@ -0,0 +1,28 @@
"""MuJoCo 双 RM75 运动学显示包安装配置。"""
from setuptools import setup
package_name = "xr_rm_mujoco"
setup(
name=package_name,
version="0.1.0",
packages=[package_name],
data_files=[
("share/ament_index/resource_index/packages", [f"resource/{package_name}"]),
(f"share/{package_name}", ["package.xml"]),
],
install_requires=["setuptools"],
zip_safe=True,
maintainer="Yikai Fu",
maintainer_email="user@example.com",
description="MuJoCo kinematic visualization for the dual RM75 platform.",
license="Apache-2.0",
tests_require=["pytest"],
entry_points={
"console_scripts": [
"dual_arm_simulator = xr_rm_mujoco.dual_arm_simulator:main",
],
},
)
+11
View File
@@ -0,0 +1,11 @@
"""让 ROS2 系统 pytest 复用项目固定 XR 环境中的 MuJoCo。"""
import sys
from pathlib import Path
XR_SITE_PACKAGES = Path(
"/home/robot/miniconda3/envs/xr/lib/python3.10/site-packages"
)
if XR_SITE_PACKAGES.is_dir():
sys.path.append(str(XR_SITE_PACKAGES))
@@ -0,0 +1,137 @@
import math
from pathlib import Path
from types import SimpleNamespace
from unittest.mock import Mock
import pytest
import yaml
from xr_rm_mujoco import dual_arm_simulator as simulator_module
from xr_rm_mujoco.dual_arm_simulator import (
ARM_JOINT_NAMES,
DualArmKinematicModel,
)
SRC_DIR = Path(__file__).resolve().parents[2]
URDF_PATH = (
SRC_DIR / "xr_rm_teleop" / "models" / "dual_rm75" / "Dual_arm.urdf"
)
DUAL_CONFIG_PATH = SRC_DIR / "xr_rm_bringup" / "config" / "dual_arm_rm75.yaml"
MUJOCO_CONFIG_PATH = (
SRC_DIR / "xr_rm_bringup" / "config" / "dual_arm_mujoco.yaml"
)
def test_dual_urdf_loads_with_expected_joint_mapping() -> None:
simulation = DualArmKinematicModel(str(URDF_PATH))
assert simulation.model.nq == 14
assert simulation.model.nv == 14
assert ARM_JOINT_NAMES == {
"left": tuple(f"scissor_joint_{index}" for index in range(1, 8)),
"right": tuple(f"omnipic_joint_{index}" for index in range(1, 8)),
}
assert not simulation.ready
def test_joint_messages_are_mapped_by_name_not_array_order() -> None:
simulation = DualArmKinematicModel(str(URDF_PATH))
names = list(reversed(ARM_JOINT_NAMES["left"]))
values = [float(index) / 10.0 for index in range(7)]
simulation.apply_arm_state("left", names, values)
by_name = dict(zip(names, values))
assert simulation.joint_positions("left") == pytest.approx(
[by_name[name] for name in ARM_JOINT_NAMES["left"]]
)
assert not simulation.ready
def test_yaml_initial_poses_populate_both_arms() -> None:
simulation = DualArmKinematicModel(str(URDF_PATH))
with DUAL_CONFIG_PATH.open(encoding="utf-8") as stream:
config = yaml.safe_load(stream)
for arm, node_name in (
("left", "left_arm_teleop"),
("right", "right_arm_teleop"),
):
degrees = config[node_name]["ros__parameters"]["initial_joint_pose"]
radians = [math.radians(value) for value in degrees]
simulation.apply_arm_state(arm, ARM_JOINT_NAMES[arm], radians)
assert simulation.joint_positions(arm) == pytest.approx(radians)
assert simulation.ready
def test_mujoco_config_contains_only_render_parameters() -> None:
with MUJOCO_CONFIG_PATH.open(encoding="utf-8") as stream:
parameters = yaml.safe_load(stream)["dual_arm_simulator"]["ros__parameters"]
assert parameters == {"render_rate_hz": 60.0}
def test_main_closes_viewer_cleanly_on_keyboard_interrupt(monkeypatch) -> None:
close_viewer = simulator_module.DualArmSimulator.close_viewer
viewer = Mock()
node = SimpleNamespace(_viewer=viewer, destroy_node=Mock())
node.close_viewer = lambda: close_viewer(node)
init = Mock()
spin = Mock(side_effect=KeyboardInterrupt)
sleep = Mock(side_effect=[KeyboardInterrupt, None])
monotonic = Mock(side_effect=[0.0, 0.0, 0.04])
shutdown = Mock()
monkeypatch.setattr(simulator_module, "DualArmSimulator", lambda: node)
monkeypatch.setattr(simulator_module.rclpy, "init", init)
monkeypatch.setattr(simulator_module.rclpy, "spin", spin)
monkeypatch.setattr(simulator_module.rclpy, "ok", lambda: True)
monkeypatch.setattr(simulator_module.time, "sleep", sleep)
monkeypatch.setattr(simulator_module.time, "monotonic", monotonic)
monkeypatch.setattr(simulator_module.rclpy, "shutdown", shutdown)
simulator_module.main(["--test"])
init.assert_called_once_with(args=["--test"])
spin.assert_called_once_with(node)
viewer.close.assert_called_once_with()
assert [call.args[0] for call in sleep.call_args_list] == pytest.approx(
[0.1, 0.06]
)
node.destroy_node.assert_called_once_with()
shutdown.assert_called_once_with()
assert node._viewer is None
@pytest.mark.parametrize(
("names", "positions", "match"),
[
(list(ARM_JOINT_NAMES["left"][:-1]), [0.0] * 6, "expected"),
(list(ARM_JOINT_NAMES["left"]), [0.0] * 6, "same length"),
(
[ARM_JOINT_NAMES["left"][0]] * 7,
[0.0] * 7,
"unique",
),
(
list(ARM_JOINT_NAMES["left"]),
[0.0] * 6 + [math.nan],
"finite",
),
],
)
def test_invalid_joint_state_is_rejected_without_partial_update(
names: list[str],
positions: list[float],
match: str,
) -> None:
simulation = DualArmKinematicModel(str(URDF_PATH))
valid = [0.1] * 7
simulation.apply_arm_state("left", ARM_JOINT_NAMES["left"], valid)
with pytest.raises(ValueError, match=match):
simulation.apply_arm_state("left", names, positions)
assert simulation.joint_positions("left") == pytest.approx(valid)
+1
View File
@@ -0,0 +1 @@
"""双 RM75 MuJoCo 运动学显示包。"""
@@ -0,0 +1,214 @@
"""使用现有双 RM75 URDF 的 MuJoCo 运动学状态映射。"""
from __future__ import annotations
import math
from pathlib import Path
import time
from typing import Callable
import mujoco
import mujoco.viewer
import rclpy
from rclpy.node import Node
from sensor_msgs.msg import JointState
ARM_JOINT_NAMES = {
"left": tuple(f"scissor_joint_{index}" for index in range(1, 8)),
"right": tuple(f"omnipic_joint_{index}" for index in range(1, 8)),
}
STATE_TOPICS = {
"left": "/xr_rm/left_rm75/joint_states",
"right": "/xr_rm/right_rm75/joint_states",
}
class DualArmKinematicModel:
"""加载双臂 URDF,并按关节名更新 MuJoCo qpos。"""
def __init__(self, urdf_path: str) -> None:
path = Path(urdf_path).expanduser().resolve()
if not path.is_file():
raise FileNotFoundError(f"dual RM75 URDF not found: {path}")
self.model = mujoco.MjModel.from_xml_path(str(path))
self.data = mujoco.MjData(self.model)
self._qpos_addresses: dict[str, dict[str, int]] = {}
self._received_arms: set[str] = set()
for arm, names in ARM_JOINT_NAMES.items():
addresses = {}
for name in names:
joint_id = mujoco.mj_name2id(
self.model,
mujoco.mjtObj.mjOBJ_JOINT,
name,
)
if joint_id < 0:
raise RuntimeError(f"MuJoCo joint not found: {name}")
if self.model.jnt_type[joint_id] != mujoco.mjtJoint.mjJNT_HINGE:
raise RuntimeError(f"MuJoCo joint must be hinge: {name}")
addresses[name] = int(self.model.jnt_qposadr[joint_id])
self._qpos_addresses[arm] = addresses
@property
def ready(self) -> bool:
return self._received_arms == set(ARM_JOINT_NAMES)
def apply_arm_state(
self,
arm: str,
names: list[str] | tuple[str, ...],
positions: list[float] | tuple[float, ...],
) -> None:
if arm not in ARM_JOINT_NAMES:
raise ValueError("arm must be left or right")
if len(names) != len(positions):
raise ValueError("joint names and positions must have the same length")
if len(set(names)) != len(names):
raise ValueError("joint names must be unique")
expected = set(ARM_JOINT_NAMES[arm])
if set(names) != expected:
raise ValueError(f"joint names must match expected {arm} joints")
values = [float(value) for value in positions]
if not all(math.isfinite(value) for value in values):
raise ValueError("joint positions must be finite")
by_name = dict(zip(names, values))
updates = [
(self._qpos_addresses[arm][name], by_name[name])
for name in ARM_JOINT_NAMES[arm]
]
for address, value in updates:
self.data.qpos[address] = value
mujoco.mj_forward(self.model, self.data)
self._received_arms.add(arm)
def joint_positions(self, arm: str) -> list[float]:
if arm not in ARM_JOINT_NAMES:
raise ValueError("arm must be left or right")
return [
float(self.data.qpos[self._qpos_addresses[arm][name]])
for name in ARM_JOINT_NAMES[arm]
]
class DualArmSimulator(Node):
"""订阅左右关节反馈并刷新一个 MuJoCo 双臂 viewer。"""
def __init__(
self,
viewer_factory: Callable = mujoco.viewer.launch_passive,
) -> None:
super().__init__("dual_arm_simulator")
self.declare_parameter("robot_urdf_path", "")
self.declare_parameter("render_rate_hz", 60.0)
render_rate_hz = float(self.get_parameter("render_rate_hz").value)
if not math.isfinite(render_rate_hz) or render_rate_hz <= 0.0:
raise ValueError("render_rate_hz must be finite and > 0")
self._kinematics = DualArmKinematicModel(
str(self.get_parameter("robot_urdf_path").value)
)
self._viewer_factory = viewer_factory
self._viewer = None
self._subscriptions = [
self.create_subscription(
JointState,
topic,
lambda message, selected_arm=arm: self._on_joint_state(
selected_arm,
message,
),
10,
)
for arm, topic in STATE_TOPICS.items()
]
self.create_timer(1.0 / render_rate_hz, self._render)
self.get_logger().info(
"MuJoCo 双臂节点已启动,等待左右关节状态,"
f"render_rate_hz={render_rate_hz:.1f}"
)
def _on_joint_state(self, arm: str, message: JointState) -> None:
try:
if self._viewer is None:
self._kinematics.apply_arm_state(
arm,
list(message.name),
list(message.position),
)
else:
with self._viewer.lock():
self._kinematics.apply_arm_state(
arm,
list(message.name),
list(message.position),
)
except (RuntimeError, ValueError) as exc:
self.get_logger().warn(
f"拒绝 {arm} 关节状态:{exc}",
throttle_duration_sec=1.0,
)
def _render(self) -> None:
for topic in STATE_TOPICS.values():
publisher_count = self.count_publishers(topic)
if publisher_count > 1:
self.get_logger().warn(
f"关节状态话题存在多个发布者:{topic}, count={publisher_count}",
throttle_duration_sec=5.0,
)
if not self._kinematics.ready:
return
if self._viewer is None:
self._viewer = self._viewer_factory(
self._kinematics.model,
self._kinematics.data,
)
if not self._viewer.is_running():
self.get_logger().info("MuJoCo viewer 已关闭。")
rclpy.shutdown()
return
self._viewer.sync()
def close_viewer(self) -> None:
if self._viewer is not None:
self._viewer.close()
# MuJoCo 在后台 daemon 线程释放 GLX;立即退出解释器会触发段错误。
deadline = time.monotonic() + 0.1
while True:
remaining = deadline - time.monotonic()
if remaining <= 0.0:
break
try:
time.sleep(remaining)
break
except KeyboardInterrupt:
continue
self._viewer = None
def main(args=None) -> None:
rclpy.init(args=args)
node = None
try:
node = DualArmSimulator()
rclpy.spin(node)
except KeyboardInterrupt:
pass
finally:
if node is not None:
node.close_viewer()
node.destroy_node()
if rclpy.ok():
rclpy.shutdown()
if __name__ == "__main__":
main()
+555
View File
@@ -0,0 +1,555 @@
<?xml version='1.0' encoding='utf-8'?>
<robot name="rm75_dual_arm">
<!--Shared supporting base. Adjust the two mount joint origins to match the CAD mounting frames.-->
<link name="dual_arm_base_link">
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/dual_arm_base.stl" scale="1 1 1" />
</geometry>
<material name="dual_arm_base_material">
<color rgba="0.5 0.5 0.5 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/dual_arm_base.stl" scale="1 1 1" />
</geometry>
</collision>
</link>
<link name="omnipic_base_link">
<inertial>
<origin xyz="0.00049987 5.2709E-05 0.060019" rpy="0 0 0" />
<mass value="1.862" />
<inertia ixx="0.0017232" ixy="-3.1058E-06" ixz="-3.7924E-05" iyy="0.0017051" iyz="1.3691E-06" izz="0.00090158" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/base_link.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/base_link.STL" />
</geometry>
</collision>
</link>
<link name="omnipic_link_1">
<inertial>
<origin xyz="0.000241 -0.013273 -0.00995" rpy="0 0 0" />
<mass value="1.574" />
<inertia ixx="0.002487573" ixy="0.000009663" ixz="-0.000007909" iyy="0.002321038" iyz="0.000179393" izz="0.001450554" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_1.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_1.STL" />
</geometry>
</collision>
</link>
<joint name="omnipic_joint_1" type="revolute">
<origin xyz="0 0 0.2405" rpy="0 0 0" />
<parent link="omnipic_base_link" />
<child link="omnipic_link_1" />
<axis xyz="0 0 1" />
<limit lower="-3.106" upper="3.106" effort="60" velocity="3.14" />
</joint>
<link name="omnipic_link_2">
<inertial>
<origin xyz="-0.000357 -0.106789 0.005329" rpy="0 0 0" />
<mass value="1.217" />
<inertia ixx="0.003494121" ixy="0.000002921" ixz="-0.000005613" iyy="0.000892721" iyz="-0.000583884" izz="0.003444080" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_2.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_2.STL" />
</geometry>
</collision>
</link>
<joint name="omnipic_joint_2" type="revolute">
<origin xyz="0 0 0" rpy="-1.5708 0 0" />
<parent link="omnipic_link_1" />
<child link="omnipic_link_2" />
<axis xyz="0 0 1" />
<limit lower="-2.2689" upper="2.2689" effort="60" velocity="3.14" />
</joint>
<link name="omnipic_link_3">
<inertial>
<origin xyz="0.000003 -0.01398 -0.011324" rpy="0 0 0" />
<mass value="1.11" />
<inertia ixx="0.001836663" ixy="0.000002259" ixz="-0.000004216" iyy="0.001498875" iyz="0.000037167" izz="0.001062545" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_3.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_3.STL" />
</geometry>
</collision>
</link>
<joint name="omnipic_joint_3" type="revolute">
<origin xyz="0 -0.256 0" rpy="1.5708 0 0" />
<parent link="omnipic_link_2" />
<child link="omnipic_link_3" />
<axis xyz="0 0 1" />
<limit lower="-3.106" upper="3.106" effort="30" velocity="3.14" />
</joint>
<link name="omnipic_link_4">
<inertial>
<origin xyz="-0.000005 -0.084658 0.004747" rpy="0 0 0" />
<mass value="0.685" />
<inertia ixx="0.001282444" ixy="-0.000000551" ixz="-0.000000630" iyy="0.000373013" iyz="-0.000232084" izz="0.001256177" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_4.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_4.STL" />
</geometry>
</collision>
</link>
<joint name="omnipic_joint_4" type="revolute">
<origin xyz="0 0 0" rpy="-1.5708 0 0" />
<parent link="omnipic_link_3" />
<child link="omnipic_link_4" />
<axis xyz="0 0 1" />
<limit lower="-2.356" upper="2.356" effort="30" velocity="3.14" />
</joint>
<link name="omnipic_link_5">
<inertial>
<origin xyz="0.000078 -0.012937 -0.008781" rpy="0 0 0" />
<mass value="0.619" />
<inertia ixx="0.000627336" ixy="0.000001636" ixz="-0.000001345" iyy="0.000542455" iyz="0.000034970" izz="0.000370291" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_5.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_5.STL" />
</geometry>
</collision>
</link>
<joint name="omnipic_joint_5" type="revolute">
<origin xyz="0 -0.21 0" rpy="1.5708 0 0" />
<parent link="omnipic_link_4" />
<child link="omnipic_link_5" />
<axis xyz="0 0 1" />
<limit lower="-3.106" upper="3.106" effort="10" velocity="3.14" />
</joint>
<link name="omnipic_link_6">
<inertial>
<origin xyz="-0.000014 -0.078524 0.002819" rpy="0 0 0" />
<mass value="0.602" />
<inertia ixx="0.000780774" ixy="-0.000000121" ixz="-0.000000469" iyy="0.000289973" iyz="-0.000120513" izz="0.000763955" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_6.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_6.STL" />
</geometry>
</collision>
</link>
<joint name="omnipic_joint_6" type="revolute">
<origin xyz="0 0 0" rpy="-1.5708 0 0" />
<parent link="omnipic_link_5" />
<child link="omnipic_link_6" />
<axis xyz="0 0 1" />
<limit lower="-2.234" upper="2.234" effort="10" velocity="3.14" />
</joint>
<link name="omnipic_link_7">
<inertial>
<origin xyz="0.001094 -0.000077 -0.010119" rpy="0 0 0" />
<mass value="0.107" />
<inertia ixx="0.000044123" ixy="-0.000000064" ixz="0.0000003" iyy="0.000035078" iyz="-0.000000029" izz="0.000065445" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_7.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_7.STL" />
</geometry>
</collision>
</link>
<joint name="omnipic_joint_7" type="revolute">
<origin xyz="0 -0.144 0" rpy="1.5708 0 0" />
<parent link="omnipic_link_6" />
<child link="omnipic_link_7" />
<axis xyz="0 0 1" />
<limit lower="-6.28" upper="6.28" effort="10" velocity="3.14" />
</joint>
<link name="omnipic_gripper_link">
<inertial>
<origin xyz="0 0 0" rpy="0 0 0" />
<mass value="0.1" />
<inertia ixx="0.0001" ixy="0" ixz="0" iyy="0.0001" iyz="0" izz="0.0001" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/OmniPic.stl" scale="1 1 1" />
</geometry>
<material name="omnipic_OmniPic_material">
<color rgba="0.7 0.7 0.7 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/OmniPic.stl" scale="1 1 1" />
</geometry>
</collision>
</link>
<joint name="omnipic_OmniPic_fixed_joint" type="fixed">
<parent link="omnipic_link_7" />
<child link="omnipic_gripper_link" />
<origin xyz="0 0 0" rpy="0 0 0" />
</joint>
<link name="omnipic_OmniPic_tcp" />
<joint name="omnipic_OmniPic_tcp_fixed" type="fixed">
<parent link="omnipic_gripper_link" />
<child link="omnipic_OmniPic_tcp" />
<origin xyz="0 0 0.14" rpy="0 0 0" />
</joint>
<!--Omnipic arm mount (physical right): edit xyz/rpy to match dual_arm_base.stl.-->
<joint name="omnipic_base_mount_joint" type="fixed">
<parent link="dual_arm_base_link" />
<child link="omnipic_base_link" />
<origin xyz="0.03 0 0" rpy="3.1416 -1.5708 0" />
</joint>
<link name="scissor_base_link">
<inertial>
<origin xyz="0.00049987 5.2709E-05 0.060019" rpy="0 0 0" />
<mass value="1.862" />
<inertia ixx="0.0017232" ixy="-3.1058E-06" ixz="-3.7924E-05" iyy="0.0017051" iyz="1.3691E-06" izz="0.00090158" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/base_link.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/base_link.STL" />
</geometry>
</collision>
</link>
<link name="scissor_link_1">
<inertial>
<origin xyz="0.000241 -0.013273 -0.00995" rpy="0 0 0" />
<mass value="1.574" />
<inertia ixx="0.002487573" ixy="0.000009663" ixz="-0.000007909" iyy="0.002321038" iyz="0.000179393" izz="0.001450554" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_1.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_1.STL" />
</geometry>
</collision>
</link>
<joint name="scissor_joint_1" type="revolute">
<origin xyz="0 0 0.2405" rpy="0 0 0" />
<parent link="scissor_base_link" />
<child link="scissor_link_1" />
<axis xyz="0 0 1" />
<limit lower="-3.106" upper="3.106" effort="60" velocity="3.14" />
</joint>
<link name="scissor_link_2">
<inertial>
<origin xyz="-0.000357 -0.106789 0.005329" rpy="0 0 0" />
<mass value="1.217" />
<inertia ixx="0.003494121" ixy="0.000002921" ixz="-0.000005613" iyy="0.000892721" iyz="-0.000583884" izz="0.003444080" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_2.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_2.STL" />
</geometry>
</collision>
</link>
<joint name="scissor_joint_2" type="revolute">
<origin xyz="0 0 0" rpy="-1.5708 0 0" />
<parent link="scissor_link_1" />
<child link="scissor_link_2" />
<axis xyz="0 0 1" />
<limit lower="-2.2689" upper="2.2689" effort="60" velocity="3.14" />
</joint>
<link name="scissor_link_3">
<inertial>
<origin xyz="0.000003 -0.01398 -0.011324" rpy="0 0 0" />
<mass value="1.11" />
<inertia ixx="0.001836663" ixy="0.000002259" ixz="-0.000004216" iyy="0.001498875" iyz="0.000037167" izz="0.001062545" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_3.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_3.STL" />
</geometry>
</collision>
</link>
<joint name="scissor_joint_3" type="revolute">
<origin xyz="0 -0.256 0" rpy="1.5708 0 0" />
<parent link="scissor_link_2" />
<child link="scissor_link_3" />
<axis xyz="0 0 1" />
<limit lower="-3.106" upper="3.106" effort="30" velocity="3.14" />
</joint>
<link name="scissor_link_4">
<inertial>
<origin xyz="-0.000005 -0.084658 0.004747" rpy="0 0 0" />
<mass value="0.685" />
<inertia ixx="0.001282444" ixy="-0.000000551" ixz="-0.000000630" iyy="0.000373013" iyz="-0.000232084" izz="0.001256177" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_4.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_4.STL" />
</geometry>
</collision>
</link>
<joint name="scissor_joint_4" type="revolute">
<origin xyz="0 0 0" rpy="-1.5708 0 0" />
<parent link="scissor_link_3" />
<child link="scissor_link_4" />
<axis xyz="0 0 1" />
<limit lower="-2.356" upper="2.356" effort="30" velocity="3.14" />
</joint>
<link name="scissor_link_5">
<inertial>
<origin xyz="0.000078 -0.012937 -0.008781" rpy="0 0 0" />
<mass value="0.619" />
<inertia ixx="0.000627336" ixy="0.000001636" ixz="-0.000001345" iyy="0.000542455" iyz="0.000034970" izz="0.000370291" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_5.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_5.STL" />
</geometry>
</collision>
</link>
<joint name="scissor_joint_5" type="revolute">
<origin xyz="0 -0.21 0" rpy="1.5708 0 0" />
<parent link="scissor_link_4" />
<child link="scissor_link_5" />
<axis xyz="0 0 1" />
<limit lower="-3.106" upper="3.106" effort="10" velocity="3.14" />
</joint>
<link name="scissor_link_6">
<inertial>
<origin xyz="-0.000014 -0.078524 0.002819" rpy="0 0 0" />
<mass value="0.602" />
<inertia ixx="0.000780774" ixy="-0.000000121" ixz="-0.000000469" iyy="0.000289973" iyz="-0.000120513" izz="0.000763955" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_6.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_6.STL" />
</geometry>
</collision>
</link>
<joint name="scissor_joint_6" type="revolute">
<origin xyz="0 0 0" rpy="-1.5708 0 0" />
<parent link="scissor_link_5" />
<child link="scissor_link_6" />
<axis xyz="0 0 1" />
<limit lower="-2.234" upper="2.234" effort="10" velocity="3.14" />
</joint>
<link name="scissor_link_7">
<inertial>
<origin xyz="0.001094 -0.000077 -0.010119" rpy="0 0 0" />
<mass value="0.107" />
<inertia ixx="0.000044123" ixy="-0.000000064" ixz="0.0000003" iyy="0.000035078" iyz="-0.000000029" izz="0.000065445" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_7.STL" />
</geometry>
<material name="">
<color rgba="1 1 1 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="meshes/link_7.STL" />
</geometry>
</collision>
</link>
<joint name="scissor_joint_7" type="revolute">
<origin xyz="0 -0.144 0" rpy="1.5708 0 0" />
<parent link="scissor_link_6" />
<child link="scissor_link_7" />
<axis xyz="0 0 1" />
<limit lower="-6.28" upper="6.28" effort="10" velocity="3.14" />
</joint>
<link name="scissor_scissor_link">
<inertial>
<origin xyz="0 0 0" rpy="0 0 0" />
<mass value="0.1" />
<inertia ixx="0.0001" ixy="0" ixz="0" iyy="0.0001" iyz="0" izz="0.0001" />
</inertial>
<visual>
<origin xyz="0 0 0" rpy="0 0 -1.5708" />
<geometry>
<mesh filename="meshes/scissor.stl" scale="1 1 1" />
</geometry>
<material name="scissor_scissor_material">
<color rgba="0.7 0.7 0.7 1" />
</material>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 -1.5708" />
<geometry>
<mesh filename="meshes/scissor.stl" scale="1 1 1" />
</geometry>
</collision>
</link>
<joint name="scissor_scissor_fixed_joint" type="fixed">
<parent link="scissor_link_7" />
<child link="scissor_scissor_link" />
<origin xyz="0 0 0.165" rpy="0 0 0" />
</joint>
<link name="scissor_scissor_tcp" />
<joint name="scissor_scissor_tcp_fixed" type="fixed">
<parent link="scissor_scissor_link" />
<child link="scissor_scissor_tcp" />
<origin xyz="0 0 0" rpy="0 0 0" />
</joint>
<link name="scissor_camera_tcp" />
<joint name="scissor_camera_tcp_fixed" type="fixed">
<parent link="scissor_scissor_link" />
<child link="scissor_camera_tcp" />
<origin xyz="0.042 0 -0.0755" rpy="0 0 1.57" />
</joint>
<!--Scissor arm mount (physical left): edit xyz/rpy to match dual_arm_base.stl.-->
<joint name="scissor_base_mount_joint" type="fixed">
<parent link="dual_arm_base_link" />
<child link="scissor_base_link" />
<origin xyz="-0.030 0 0" rpy="-3.1416 1.5708 0" />
</joint>
</robot>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1
View File
@@ -11,6 +11,7 @@
<exec_depend>geometry_msgs</exec_depend>
<exec_depend>rclpy</exec_depend>
<exec_depend>sensor_msgs</exec_depend>
<exec_depend>python3-yaml</exec_depend>
<exec_depend>std_msgs</exec_depend>
<exec_depend>xr_rm_interfaces</exec_depend>
+9
View File
@@ -24,6 +24,15 @@ setup(
f"share/{package_name}/models/rm75/meshes",
glob("models/rm75/meshes/*.STL"),
),
(
f"share/{package_name}/models/dual_rm75",
["models/dual_rm75/Dual_arm.urdf"],
),
(
f"share/{package_name}/models/dual_rm75/meshes",
glob("models/dual_rm75/meshes/*.STL")
+ glob("models/dual_rm75/meshes/*.stl"),
),
(
f"share/{package_name}/models/rm75_omnipicker/urdf",
glob("models/rm75_omnipicker/urdf/*.urdf"),
+16 -8
View File
@@ -11,8 +11,13 @@ from xr_rm_teleop.placo_ik_solver import PlacoIkSolver
CASES = {
"left": [-79.55, -9.99, 71.01, 101.45, 95.07, -84.47, -74.52],
"right": [-90.14, 3.76, -86.89, 87.89, -96.53, -79.62, -90.04],
"left": [-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55],
"right": [-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35],
}
TOOL_CHAINS = {
"left": ("scissor_base_link", "scissor_link_7", 0.165),
"right": ("omnipic_base_link", "omnipic_link_7", 0.14),
}
@@ -37,13 +42,16 @@ def main() -> None:
urdf_path = Path(sys.argv[1]).resolve()
for arm, joint_degrees in CASES.items():
initial_joints = np.deg2rad(joint_degrees)
drift_solver = PlacoIkSolver(str(urdf_path), 1.0 / 125.0)
drift_solver = PlacoIkSolver(str(urdf_path), 1.0 / 125.0, arm)
joints = initial_joints.tolist()
stationary_target = drift_solver.update_joint_state(joints)
flange = drift_solver._robot.get_T_world_frame("link_7")
flange_to_tcp = np.linalg.inv(flange) @ stationary_target
assert np.allclose(flange_to_tcp[:3, 3], [0.0, 0.0, 0.16])
assert np.allclose(flange_to_tcp[:3, :3], np.eye(3))
base_frame, flange_frame, tcp_length = TOOL_CHAINS[arm]
world_to_base = drift_solver._robot.get_T_world_frame(base_frame)
world_to_flange = drift_solver._robot.get_T_world_frame(flange_frame)
base_to_flange = np.linalg.inv(world_to_base) @ world_to_flange
flange_to_tcp = np.linalg.inv(base_to_flange) @ stationary_target
assert np.allclose(flange_to_tcp[:3, 3], [0.0, 0.0, tcp_length])
assert np.allclose(flange_to_tcp[:3, :3], np.eye(3), atol=1e-5)
for _ in range(250):
drift_solver.update_joint_state(joints)
joints = drift_solver.solve(stationary_target)
@@ -54,7 +62,7 @@ def main() -> None:
f"{arm} stationary target drifted {drift_degrees:.3f}deg"
)
solver = PlacoIkSolver(str(urdf_path), 1.0 / 125.0)
solver = PlacoIkSolver(str(urdf_path), 1.0 / 125.0, arm)
joints = initial_joints.tolist()
current = solver.update_joint_state(joints)
assert current.shape == (4, 4)
+71 -4
View File
@@ -1,13 +1,22 @@
import math
import sys
from pathlib import Path
from types import ModuleType, SimpleNamespace
import pytest
import yaml
from xr_rm_teleop import realman_adapter
from xr_rm_teleop.realman_adapter import RealManAdapter
from xr_rm_teleop.realman_adapter import MockRealManAdapter
from xr_rm_teleop.fun_peripheral import PeripheralConfig, _configure_tool_frame
from xr_rm_teleop.fun_peripheral import (
PeripheralConfig,
_configure_tool_frame,
load_peripheral_config,
)
CONFIG_DIR = Path(__file__).resolve().parents[2] / "xr_rm_bringup" / "config"
def test_initial_pose_uses_joint_move_only() -> None:
@@ -30,11 +39,23 @@ def test_initial_pose_uses_joint_move_only() -> None:
)
adapter._arm = FakeArm()
adapter._move_to_initial_pose()
adapter.move_to_initial_pose()
assert adapter._arm.calls == [(joints, 20, 0, 0, 1)]
def test_mock_initial_pose_restores_configured_joints() -> None:
initial_degrees = [-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55]
adapter = MockRealManAdapter(initial_degrees)
adapter.send_joint_target([0.0] * 7, follow=False)
adapter.move_to_initial_pose()
assert adapter.read_joint_state().positions == pytest.approx(
[math.radians(value) for value in initial_degrees]
)
def test_peripheral_config_exposes_selected_tool() -> None:
config = PeripheralConfig(
scissorgripper=1,
@@ -48,6 +69,37 @@ def test_peripheral_config_exposes_selected_tool() -> None:
assert config.tool_pose == [0.0, 0.0, 0.16, 0.0, 0.0, 0.0, 1.0]
def test_deployed_peripheral_config_selects_left_and_right_tools() -> None:
config_file = CONFIG_DIR / "peripherals_rm75.yaml"
left = load_peripheral_config(str(config_file), "left")
right = load_peripheral_config(str(config_file), "right")
assert left.scissorgripper == 2
assert left.tool_name == "minisci"
assert left.tool_pose == [0.0, 0.0, 0.165, 0.0, 0.0, 0.0, 1.0]
assert right.scissorgripper == 1
assert right.tool_name == "omnipic"
assert right.tool_pose == [0.0, 0.0, 0.14, 0.0, 0.0, 0.0, 1.0]
@pytest.mark.parametrize(
("config_name", "node_names"),
[
("left_arm_rm75.yaml", ("single_arm_velocity_teleop",)),
("right_arm_rm75.yaml", ("single_arm_velocity_teleop",)),
("dual_arm_rm75.yaml", ("left_arm_teleop", "right_arm_teleop")),
],
)
def test_deployed_workspace_is_in_front_of_robot(config_name, node_names) -> None:
with (CONFIG_DIR / config_name).open(encoding="utf-8") as stream:
config = yaml.safe_load(stream)
for node_name in node_names:
parameters = config[node_name]["ros__parameters"]
assert parameters["workspace_min"] == [-0.70, -0.70, 0.10]
assert parameters["workspace_max"] == [0.70, 0.10, 0.75]
@pytest.mark.parametrize(
("existing", "expected_operation"),
[(False, "create"), (True, "update")],
@@ -412,7 +464,15 @@ def test_udp_fault_and_recovery_are_logged_once_per_transition() -> None:
assert len([message for message in logger.infos if "恢复正常" in message]) == 1
def test_connect_configures_udp_feedback_and_waits_for_first_frame(monkeypatch) -> None:
@pytest.mark.parametrize(
("cycle_ms", "sdk_cycle"),
[(5, 1), (10, 2)],
)
def test_connect_converts_udp_feedback_cycle_to_sdk_units(
monkeypatch,
cycle_ms,
sdk_cycle,
) -> None:
fake_sdk = _install_fake_sdk(monkeypatch)
adapter = RealManAdapter(
"127.0.0.1",
@@ -420,6 +480,7 @@ def test_connect_configures_udp_feedback_and_waits_for_first_frame(monkeypatch)
0,
"192.168.192.148",
8090,
realtime_push_cycle_ms=cycle_ms,
configure_safety_limits=False,
)
@@ -427,7 +488,13 @@ def test_connect_configures_udp_feedback_and_waits_for_first_frame(monkeypatch)
arm = fake_sdk.RoboticArm.instance
assert arm is not None
assert arm.config.args == (5, True, 8090, 0, "192.168.192.148")
assert arm.config.args == (
sdk_cycle,
True,
8090,
0,
"192.168.192.148",
)
assert arm.callback is adapter._realtime_callback
assert adapter.get_latest_joint_state() is not None
assert not hasattr(adapter, "_feedback_thread")
+308 -1
View File
@@ -4,6 +4,7 @@ from types import SimpleNamespace
import numpy as np
import pytest
from builtin_interfaces.msg import Time as TimeMsg
from xr_rm_teleop.realman_adapter import JointStateSnapshot
from xr_rm_teleop.single_arm_velocity_teleop import (
@@ -29,6 +30,179 @@ class FakeTime:
del other
return SimpleNamespace(nanoseconds=0)
def to_msg(self):
return TimeMsg()
class FakePublisher:
def __init__(self) -> None:
self.messages = []
def publish(self, message) -> None:
self.messages.append(message)
def _joint_publishing_teleop() -> SingleArmVelocityTeleop:
names = [f"omnipic_joint_{index}" for index in range(1, 8)]
teleop = object.__new__(SingleArmVelocityTeleop)
teleop._ik_solver = SimpleNamespace(
joint_names=names,
update_joint_state=lambda joints: np.eye(4),
)
teleop._joint_state_pub = FakePublisher()
teleop._joint_target_pub = FakePublisher()
teleop._active = False
teleop._last_valid_joint_target = None
teleop.get_clock = lambda: SimpleNamespace(now=lambda: FakeTime())
return teleop
def test_reset_joint_state_publishes_named_feedback() -> None:
teleop = _joint_publishing_teleop()
positions = [0.1 * index for index in range(7)]
snapshot = JointStateSnapshot(positions, time.monotonic())
teleop._reset_joint_state(snapshot)
message = teleop._joint_state_pub.messages[-1]
assert message.name == teleop._ik_solver.joint_names
assert message.position == pytest.approx(positions)
def test_sync_joint_feedback_publishes_each_sample() -> None:
teleop = _joint_publishing_teleop()
positions = [0.2] * 7
teleop._sync_joint_feedback(
JointStateSnapshot(positions, time.monotonic())
)
assert len(teleop._joint_state_pub.messages) == 1
assert teleop._joint_state_pub.messages[0].position == pytest.approx(positions)
def test_send_joint_target_publishes_limited_command() -> None:
sent = []
teleop = _joint_publishing_teleop()
teleop._adapter = SimpleNamespace(
send_joint_target=lambda joints, follow: sent.append((list(joints), follow))
)
teleop._follow = False
teleop._latest_joint_positions = [0.0] * 7
teleop._last_joint_command_target = [0.0] * 7
teleop._last_joint_command_velocity = [0.0] * 7
teleop._joint_command_max_speed = 1.0
teleop._joint_command_max_acceleration = 100.0
teleop._dt = 0.1
assert teleop._send_joint_target([0.5] * 7)
assert len(sent) == 1
assert sent[0][0] == pytest.approx([0.1] * 7)
assert sent[0][1] is False
message = teleop._joint_target_pub.messages[-1]
assert message.name == teleop._ik_solver.joint_names
assert message.position == pytest.approx(teleop._last_joint_command_target)
def _primary_button_teleop(*, use_mock=False, move_error=None):
events = []
errors = []
snapshot = JointStateSnapshot([0.2] * 7, time.monotonic())
class Adapter:
def move_to_initial_pose(self):
events.append("move")
if move_error is not None:
raise move_error
def read_joint_state(self):
events.append("read")
return snapshot
teleop = object.__new__(SingleArmVelocityTeleop)
teleop._arm_name = "right_rm75"
teleop._use_mock = use_mock
teleop._adapter = Adapter()
teleop._last_primary_pressed = None
teleop._grip_rearm_required = False
teleop._safe_stop = lambda reset_active: events.append(
("stop", reset_active)
)
teleop._reset_joint_state = lambda value: events.append(("sync", value))
teleop._handle_trigger_gripper = lambda msg: None
teleop.get_clock = lambda: SimpleNamespace(now=lambda: FakeTime())
teleop.get_logger = lambda: SimpleNamespace(
info=lambda message: None,
error=lambda message: errors.append(message),
)
return teleop, events, errors, snapshot
def test_primary_button_rising_edge_moves_once_and_resyncs() -> None:
teleop, events, _, snapshot = _primary_button_teleop()
released = SimpleNamespace(primary=False)
pressed = SimpleNamespace(primary=True)
teleop._on_controller(released)
teleop._on_controller(pressed)
teleop._on_controller(pressed)
teleop._on_controller(released)
teleop._on_controller(pressed)
expected_once = [
("stop", True),
"move",
"read",
("sync", snapshot),
]
assert events == expected_once * 2
assert teleop._grip_rearm_required
def test_primary_button_move_failure_logs_and_stays_stopped() -> None:
failure = RuntimeError("rm_movej failed")
teleop, events, errors, _ = _primary_button_teleop(
move_error=failure
)
teleop._on_controller(SimpleNamespace(primary=False))
teleop._on_controller(SimpleNamespace(primary=True))
assert events == [("stop", True), "move"]
assert teleop._grip_rearm_required
assert errors == [
"right_rm75 回初始位姿失败:rm_movej failed"
]
def test_mock_primary_reset_can_reanchor_without_grip_release() -> None:
teleop, events, _, snapshot = _primary_button_teleop(use_mock=True)
teleop._on_controller(SimpleNamespace(primary=False))
teleop._on_controller(SimpleNamespace(primary=True))
assert events == [
("stop", True),
"move",
"read",
("sync", snapshot),
]
assert not teleop._grip_rearm_required
def test_failed_mock_primary_reset_still_requires_grip_release() -> None:
failure = RuntimeError("mock reset failed")
teleop, _, _, _ = _primary_button_teleop(
use_mock=True,
move_error=failure,
)
teleop._on_controller(SimpleNamespace(primary=False))
teleop._on_controller(SimpleNamespace(primary=True))
assert teleop._grip_rearm_required
def test_startup_joint_query_initializes_qp_and_command_history() -> None:
positions = [0.1] * 7
@@ -42,8 +216,11 @@ def test_startup_joint_query_initializes_qp_and_command_history() -> None:
)
)
teleop._ik_solver = SimpleNamespace(
update_joint_state=lambda joints: pose
joint_names=[f"omnipic_joint_{index}" for index in range(1, 8)],
update_joint_state=lambda joints: pose,
)
teleop._joint_state_pub = FakePublisher()
teleop.get_clock = lambda: SimpleNamespace(now=lambda: FakeTime())
teleop.get_logger = lambda: FakeLogger()
teleop._initialize_joint_state()
@@ -108,6 +285,12 @@ def _timeout_teleop(adapter) -> SingleArmVelocityTeleop:
teleop._ik_solver = SimpleNamespace(
update_joint_state=lambda joints: np.eye(4)
)
teleop._ik_solver.joint_names = [
f"omnipic_joint_{index}" for index in range(1, 8)
]
teleop._joint_state_pub = FakePublisher()
teleop._joint_target_pub = FakePublisher()
teleop.get_clock = lambda: SimpleNamespace(now=lambda: FakeTime())
teleop._stop_sent = False
teleop._feedback_resync_timeout_sec = 0.5
teleop._publish_stop_debug = lambda: None
@@ -136,12 +319,19 @@ def test_short_udp_timeout_repeats_last_limited_target_without_query() -> None:
stop=lambda: pytest.fail("stop must not run"),
)
teleop = _timeout_teleop(adapter)
warnings = []
teleop.get_logger = lambda: SimpleNamespace(
warn=lambda message: warnings.append(message)
)
teleop._handle_stale_joint_feedback(0.2)
assert sends == [([0.1] * 7, False)]
assert teleop._last_joint_command_target == [0.1] * 7
assert teleop._grip_rearm_required
assert warnings == [
"right_rm75 UDP关节反馈超时(age=200.0 ms),保持最后安全目标。"
]
def test_short_udp_timeout_without_active_target_stays_stopped() -> None:
@@ -218,6 +408,114 @@ def test_joint_command_step_limits_acceleration_from_rest() -> None:
assert target == pytest.approx([math.radians(0.0192)] * 7)
def test_joint_command_step_rejects_non_finite_limits() -> None:
for max_speed, max_acceleration, dt in (
(math.inf, 1.0, 0.1),
(1.0, math.inf, 0.1),
(1.0, 1.0, math.inf),
):
with pytest.raises(ValueError, match="finite and positive"):
SingleArmVelocityTeleop._limit_joint_command_step(
target=[0.5] * 7,
previous_target=[0.0] * 7,
previous_velocity=[0.0] * 7,
max_speed=max_speed,
max_acceleration=max_acceleration,
dt=dt,
)
def test_joint_command_step_arrival_respects_max_speed() -> None:
target, velocity = SingleArmVelocityTeleop._limit_joint_command_step(
target=[0.5] * 7,
previous_target=[0.0] * 7,
previous_velocity=[0.0] * 7,
max_speed=1.0,
max_acceleration=100.0,
dt=0.1,
)
assert velocity == pytest.approx([1.0] * 7)
assert target == pytest.approx([0.1] * 7)
def test_joint_command_step_reverses_with_acceleration_limit() -> None:
command = [0.0] * 7
velocity = [0.0] * 7
for _ in range(5):
command, velocity = SingleArmVelocityTeleop._limit_joint_command_step(
target=[1.0] * 7,
previous_target=command,
previous_velocity=velocity,
max_speed=1.0,
max_acceleration=1.0,
dt=0.1,
)
previous_command = list(command)
previous_velocity = list(velocity)
command, velocity = SingleArmVelocityTeleop._limit_joint_command_step(
target=[-1.0] * 7,
previous_target=command,
previous_velocity=velocity,
max_speed=1.0,
max_acceleration=1.0,
dt=0.1,
)
assert previous_velocity == pytest.approx([0.5] * 7)
assert velocity == pytest.approx([0.4] * 7)
assert [
current - previous
for current, previous in zip(command, previous_command)
] == pytest.approx([value * 0.1 for value in velocity])
assert all(
current > previous
for current, previous in zip(command, previous_command)
)
def test_joint_command_step_brakes_before_fixed_target_without_overshoot() -> None:
dt = 1.0 / 90.0
max_speed = math.radians(180.0)
max_acceleration = math.radians(300.0)
target = np.radians(
[10.0, -10.0, 3.0, -3.0, 1.0, -1.0, 0.1]
).tolist()
command = [0.0] * 7
velocity = [0.0] * 7
for _ in range(180):
previous_command = list(command)
previous_velocity = list(velocity)
command, velocity = (
SingleArmVelocityTeleop._limit_joint_command_step(
target=target,
previous_target=command,
previous_velocity=velocity,
max_speed=max_speed,
max_acceleration=max_acceleration,
dt=dt,
)
)
for index in range(7):
assert min(0.0, target[index]) - 1e-12 <= command[index]
assert command[index] <= max(0.0, target[index]) + 1e-12
assert abs(velocity[index]) <= max_speed + 1e-12
assert (
abs(velocity[index] - previous_velocity[index])
<= max_acceleration * dt + 1e-12
)
assert command[index] - previous_command[index] == pytest.approx(
velocity[index] * dt,
abs=1e-12,
)
assert command == pytest.approx(target, abs=1e-12)
assert velocity == pytest.approx([0.0] * 7, abs=1e-12)
def test_feedback_fault_blocks_grip_until_release() -> None:
class FakeClock:
def now(self):
@@ -248,6 +546,10 @@ def test_feedback_fault_blocks_grip_until_release() -> None:
teleop._ik_solver = SimpleNamespace(
update_joint_state=lambda joints: np.eye(4)
)
teleop._ik_solver.joint_names = [
f"omnipic_joint_{index}" for index in range(1, 8)
]
teleop._joint_state_pub = FakePublisher()
teleop._grip_rearm_required = True
teleop._control_fault_latched = False
teleop._feedback_resync_attempted = False
@@ -274,6 +576,9 @@ def test_first_feedback_initializes_last_valid_target_without_solving() -> None:
class FakeSolver:
def __init__(self) -> None:
self.solve_calls = 0
self.joint_names = [
f"omnipic_joint_{index}" for index in range(1, 8)
]
def update_joint_state(self, joints):
assert joints == [0.1] * 7
@@ -291,6 +596,8 @@ def test_first_feedback_initializes_last_valid_target_without_solving() -> None:
teleop._active = False
teleop._last_valid_joint_target = None
teleop._last_current_pose = None
teleop._joint_state_pub = FakePublisher()
teleop.get_clock = lambda: SimpleNamespace(now=lambda: FakeTime())
pose = teleop._sync_joint_feedback(
JointStateSnapshot([0.1] * 7, time.monotonic())
@@ -4,6 +4,7 @@ from types import SimpleNamespace
import numpy as np
import pytest
from builtin_interfaces.msg import Time as TimeMsg
from xr_rm_teleop.realman_adapter import JointStateSnapshot
from xr_rm_teleop.single_arm_velocity_teleop import (
@@ -148,6 +149,9 @@ def test_invalid_controller_quaternion_stops_current_tick() -> None:
del other
return SimpleNamespace(nanoseconds=0)
def to_msg(self):
return TimeMsg()
class FakeClock:
def now(self):
return FakeTime()
@@ -174,7 +178,11 @@ def test_invalid_controller_quaternion_stops_current_tick() -> None:
time.monotonic(),
)
)
teleop._ik_solver = SimpleNamespace(update_joint_state=lambda joints: np.eye(4))
teleop._ik_solver = SimpleNamespace(
joint_names=[f"omnipic_joint_{index}" for index in range(1, 8)],
update_joint_state=lambda joints: np.eye(4),
)
teleop._joint_state_pub = SimpleNamespace(publish=lambda message: None)
teleop._active = False
teleop._last_valid_joint_target = None
teleop._last_current_pose = None
+195 -45
View File
@@ -1,80 +1,188 @@
import math
from pathlib import Path
from types import SimpleNamespace
from xml.etree import ElementTree
import numpy as np
import pytest
from xr_rm_teleop.placo_ik_solver import (
QP_ORIENTATION_TOLERANCE_RAD,
QP_POSITION_TOLERANCE_M,
PlacoIkSolver,
_validated_transform,
)
def test_fixed_urdf_has_seven_moving_joints_and_omnipicker_tcp() -> None:
urdf_path = (
DUAL_URDF_PATH = (
Path(__file__).resolve().parents[1]
/ "models"
/ "rm75_omnipicker"
/ "urdf"
/ "RM75-B_OmniPicker_fixed.urdf"
/ "dual_rm75"
/ "Dual_arm.urdf"
)
root = ElementTree.parse(urdf_path).getroot()
ARM_CASES = (
(
"left",
[-78.81, 3.22, 67.96, 97.12, 95.08, -81.11, -74.55],
list(range(14, 21)),
list(range(13, 20)),
"omnipic",
"scissor_base_link",
"scissor_scissor_tcp",
),
(
"right",
[-86.10, 22.80, -89.57, 93.98, -91.82, -87.32, -89.35],
list(range(7, 14)),
list(range(6, 13)),
"scissor",
"omnipic_base_link",
"omnipic_OmniPic_tcp",
),
)
def test_dual_urdf_has_expected_joints_meshes_and_tcp_frames() -> None:
root = ElementTree.parse(DUAL_URDF_PATH).getroot()
moving_joint_names = [
joint.attrib["name"]
for joint in root.findall("joint")
if joint.attrib["type"] != "fixed"
]
tcp_joint = root.find("joint[@name='omnipicker_tcp_joint']")
mesh_filenames = [
mesh.attrib["filename"]
for mesh in root.findall(".//mesh")
]
fixed_joints = {
"omnipic_base_mount_joint": (
"dual_arm_base_link",
"omnipic_base_link",
None,
),
"scissor_base_mount_joint": (
"dual_arm_base_link",
"scissor_base_link",
None,
),
"omnipic_OmniPic_tcp_fixed": (
"omnipic_gripper_link",
"omnipic_OmniPic_tcp",
"0 0 0.14",
),
"scissor_scissor_tcp_fixed": (
"scissor_scissor_link",
"scissor_scissor_tcp",
"0 0 0",
),
"scissor_scissor_fixed_joint": (
"scissor_link_7",
"scissor_scissor_link",
"0 0 0.165",
),
}
assert moving_joint_names == [f"joint_{index}" for index in range(1, 8)]
assert all(
filename.startswith(
"package://xr_rm_teleop/models/rm75_omnipicker/meshes/"
)
for filename in mesh_filenames
)
assert tcp_joint is not None
assert tcp_joint.attrib["type"] == "fixed"
assert tcp_joint.find("parent").attrib["link"] == "omnipicker_base_link"
assert tcp_joint.find("child").attrib["link"] == "omnipicker_tcp"
assert tcp_joint.find("origin").attrib["xyz"] == "0 0 0.16"
assert moving_joint_names == [
*[f"omnipic_joint_{index}" for index in range(1, 8)],
*[f"scissor_joint_{index}" for index in range(1, 8)],
]
assert all(filename.startswith("meshes/") for filename in mesh_filenames)
for name, (parent, child, xyz) in fixed_joints.items():
joint = root.find(f"joint[@name='{name}']")
assert joint is not None
assert joint.attrib["type"] == "fixed"
assert joint.find("parent").attrib["link"] == parent
assert joint.find("child").attrib["link"] == child
if xyz is not None:
assert joint.find("origin").attrib["xyz"] == xyz
def test_left_scissor_mesh_matches_physical_mount_rotation() -> None:
root = ElementTree.parse(DUAL_URDF_PATH).getroot()
link = root.find("link[@name='scissor_scissor_link']")
assert link is not None
assert link.find("visual/origin").attrib["rpy"] == "0 0 -1.5708"
assert link.find("collision/origin").attrib["rpy"] == "0 0 -1.5708"
tcp_joint = root.find("joint[@name='scissor_scissor_tcp_fixed']")
assert tcp_joint.find("origin").attrib["rpy"] == "0 0 0"
def _rm75_placo_solver() -> tuple[PlacoIkSolver, list[float]]:
def _dual_placo_solver(
arm: str,
joint_degrees: list[float],
) -> tuple[PlacoIkSolver, list[float]]:
pytest.importorskip("placo")
urdf_path = (
Path(__file__).resolve().parents[1]
/ "models"
/ "rm75_omnipicker"
/ "urdf"
/ "RM75-B_OmniPicker_fixed.urdf"
joints = [math.radians(value) for value in joint_degrees]
return PlacoIkSolver(str(DUAL_URDF_PATH), 1.0 / 90.0, arm), joints
@pytest.mark.parametrize(
"arm,joint_degrees,q_offsets,v_offsets,inactive_prefix,"
"expected_base_frame,expected_tcp_frame",
ARM_CASES,
)
joints = [
math.radians(value)
for value in [
-90.14,
3.76,
-86.89,
87.89,
-96.53,
-79.62,
-90.04,
]
]
return PlacoIkSolver(str(urdf_path), 1.0 / 90.0), joints
def test_solver_uses_arm_specific_offsets(
arm: str,
joint_degrees: list[float],
q_offsets: list[int],
v_offsets: list[int],
inactive_prefix: str,
expected_base_frame: str,
expected_tcp_frame: str,
) -> None:
solver, _ = _dual_placo_solver(arm, joint_degrees)
assert solver._q_offsets.tolist() == q_offsets
assert solver._v_offsets.tolist() == v_offsets
def test_qp_solve_converges_to_reachable_tcp_target() -> None:
solver, joints = _rm75_placo_solver()
@pytest.mark.parametrize(
"arm,joint_degrees,q_offsets,v_offsets,inactive_prefix,"
"expected_base_frame,expected_tcp_frame",
ARM_CASES,
)
def test_joint_state_pose_is_relative_to_selected_arm_base(
arm: str,
joint_degrees: list[float],
q_offsets: list[int],
v_offsets: list[int],
inactive_prefix: str,
expected_base_frame: str,
expected_tcp_frame: str,
) -> None:
solver, joints = _dual_placo_solver(arm, joint_degrees)
actual_pose = solver.update_joint_state(joints)
assert solver._base_frame == expected_base_frame
assert solver._tcp_frame == expected_tcp_frame
world_base = solver._robot.get_T_world_frame(expected_base_frame)
world_tcp = solver._robot.get_T_world_frame(expected_tcp_frame)
assert actual_pose == pytest.approx(np.linalg.inv(world_base) @ world_tcp)
@pytest.mark.parametrize(
"arm,joint_degrees,q_offsets,v_offsets,inactive_prefix,"
"expected_base_frame,expected_tcp_frame",
ARM_CASES,
)
def test_qp_solve_converges_without_moving_inactive_arm(
arm: str,
joint_degrees: list[float],
q_offsets: list[int],
v_offsets: list[int],
inactive_prefix: str,
expected_base_frame: str,
expected_tcp_frame: str,
) -> None:
solver, joints = _dual_placo_solver(arm, joint_degrees)
start_pose = solver.update_joint_state(joints)
inactive_q_offsets = [
solver._robot.get_joint_offset(f"{inactive_prefix}_joint_{index}")
for index in range(1, 8)
]
inactive_before = solver._robot.state.q[inactive_q_offsets].copy()
target_pose = start_pose.copy()
target_pose[0, 3] += 0.07
target_pose[0, 3] += 0.01
result = solver.solve(target_pose)
reached_pose = solver.update_joint_state(result)
@@ -94,8 +202,50 @@ def test_qp_solve_converges_to_reachable_tcp_target() -> None:
)
)
assert position_error <= 1e-3
assert orientation_error <= 5e-3
assert np.asarray(result).shape == (7,)
assert np.isfinite(result).all()
assert position_error <= QP_POSITION_TOLERANCE_M
assert orientation_error <= QP_ORIENTATION_TOLERANCE_RAD
assert solver._robot.state.q[inactive_q_offsets] == pytest.approx(
inactive_before
)
def test_solver_rejects_unknown_arm() -> None:
with pytest.raises(ValueError, match="arm must be left or right"):
PlacoIkSolver(str(DUAL_URDF_PATH), 1.0 / 90.0, "middle")
def test_qp_solve_accepts_position_error_within_two_millimeters() -> None:
solver = object.__new__(PlacoIkSolver)
solver._actual_joints = np.zeros(7)
solver._q_offsets = np.arange(7, 14)
solver._robot = SimpleNamespace(
state=SimpleNamespace(q=np.zeros(21))
)
solver._frame_task = SimpleNamespace(T_a_b=None)
solver._target_errors = lambda: (1.5e-3, 0.0)
result = solver.solve(np.eye(4))
assert result == pytest.approx([0.0] * 7)
def test_qp_solve_rejects_position_error_above_two_millimeters() -> None:
solver = object.__new__(PlacoIkSolver)
solver._actual_joints = np.zeros(7)
solver._q_offsets = np.arange(7, 14)
solver._robot = SimpleNamespace(
state=SimpleNamespace(q=np.zeros(21)),
update_kinematics=lambda: None,
)
solver._frame_task = SimpleNamespace(T_a_b=None)
solver._solver = SimpleNamespace(solve=lambda update: None)
solver._validate_result = lambda result, previous: None
solver._target_errors = lambda: (2.1e-3, 0.0)
with pytest.raises(RuntimeError, match="QP did not converge after 30"):
solver.solve(np.eye(4))
def test_validated_transform_accepts_finite_se3_and_returns_a_copy() -> None:
+78 -26
View File
@@ -8,10 +8,26 @@ from pathlib import Path
import numpy as np
EXPECTED_PLACO_VERSION = "0.9.4"
RM75_JOINT_NAMES = [f"joint_{index}" for index in range(1, 8)]
RM75_Q_SLICE = slice(7, 14)
ARM_CHAINS = {
"left": (
"scissor_base_link",
"scissor_scissor_tcp",
"scissor",
"omnipic",
),
"right": (
"omnipic_base_link",
"omnipic_OmniPic_tcp",
"omnipic",
"scissor",
),
}
DUAL_RM75_JOINT_NAMES = [
*[f"omnipic_joint_{index}" for index in range(1, 8)],
*[f"scissor_joint_{index}" for index in range(1, 8)],
]
QP_MAX_ITERATIONS = 30
QP_POSITION_TOLERANCE_M = 1e-3
QP_POSITION_TOLERANCE_M = 2e-3
QP_ORIENTATION_TOLERANCE_RAD = 5e-3
@@ -43,9 +59,21 @@ class PlacoIkSolver:
self,
urdf_path: str,
dt: float,
arm: str,
) -> None:
if dt <= 0.0:
raise ValueError("dt must be positive")
if arm not in ARM_CHAINS:
raise ValueError("arm must be left or right")
self._base_frame, self._tcp_frame, prefix, inactive_prefix = (
ARM_CHAINS[arm]
)
self._joint_names = [
f"{prefix}_joint_{index}" for index in range(1, 8)
]
inactive_joint_names = [
f"{inactive_prefix}_joint_{index}" for index in range(1, 8)
]
try:
installed_version = version("placo")
import placo
@@ -65,30 +93,44 @@ class PlacoIkSolver:
self._dt = dt
self._robot = placo.RobotWrapper(str(model_path))
if self._robot.state.q.shape != (14,):
if self._robot.state.q.shape != (21,):
raise RuntimeError(
f"expected Placo q shape (14,), got {self._robot.state.q.shape}"
"expected Placo q shape (21,), got "
f"{self._robot.state.q.shape}"
)
if list(self._robot.joint_names()) != RM75_JOINT_NAMES:
if list(self._robot.joint_names()) != DUAL_RM75_JOINT_NAMES:
raise RuntimeError(
f"unexpected RM75 joint order: {list(self._robot.joint_names())}"
"unexpected dual RM75 joint order: "
f"{list(self._robot.joint_names())}"
)
self._q_offsets = np.asarray(
[self._robot.get_joint_offset(name) for name in self._joint_names],
dtype=int,
)
self._v_offsets = np.asarray(
[
self._robot.get_joint_v_offset(name)
for name in self._joint_names
],
dtype=int,
)
if len(set(self._q_offsets.tolist())) != 7:
raise RuntimeError(
f"invalid RM75 q offsets: {self._q_offsets.tolist()}"
)
if len(set(self._v_offsets.tolist())) != 7:
raise RuntimeError(
f"invalid RM75 v offsets: {self._v_offsets.tolist()}"
)
offsets = [
self._robot.get_joint_offset(name) for name in RM75_JOINT_NAMES
]
if offsets != list(range(7, 14)):
raise RuntimeError(f"unexpected RM75 q offsets: {offsets}")
self._joint_limits = np.asarray(
[self._robot.get_joint_limits(name) for name in RM75_JOINT_NAMES]
[self._robot.get_joint_limits(name) for name in self._joint_names]
)
velocity_offsets = [
self._robot.get_joint_v_offset(name) for name in RM75_JOINT_NAMES
]
self._velocity_limits = np.asarray(
[
self._robot.model.velocityLimit[index]
for index in velocity_offsets
for index in self._v_offsets
]
)
self._actual_joints: np.ndarray | None = None
@@ -96,14 +138,21 @@ class PlacoIkSolver:
self._solver = placo.KinematicsSolver(self._robot)
self._solver.dt = dt
self._solver.mask_fbase(True)
for name in inactive_joint_names:
self._solver.mask_dof(name)
self._solver.enable_velocity_limits(True)
self._frame_task = self._solver.add_frame_task(
"omnipicker_tcp",
self._frame_task = self._solver.add_relative_frame_task(
self._base_frame,
self._tcp_frame,
np.eye(4),
)
self._frame_task.configure("rm75_frame", "soft", 1.0)
self._frame_task.configure("rm75_relative_frame", "soft", 1.0)
self._solver.add_kinetic_energy_regularization_task(1e-6)
@property
def joint_names(self) -> list[str]:
return list(self._joint_names)
@property
def base_configuration(self) -> list[float]:
return self._robot.state.q[:7].tolist()
@@ -114,11 +163,14 @@ class PlacoIkSolver:
raise ValueError("joint state must contain 7 finite values")
is_first_feedback = self._actual_joints is None
self._actual_joints = values.copy()
self._robot.state.q[RM75_Q_SLICE] = values
self._robot.state.q[self._q_offsets] = values
self._robot.update_kinematics()
base_to_tool = self._robot.get_T_world_frame("omnipicker_tcp")
base_to_tool = (
np.linalg.inv(self._robot.get_T_world_frame(self._base_frame))
@ self._robot.get_T_world_frame(self._tcp_frame)
)
if is_first_feedback:
self._frame_task.T_world_frame = base_to_tool.copy()
self._frame_task.T_a_b = base_to_tool.copy()
return base_to_tool.copy()
def _target_errors(self) -> tuple[float, float]:
@@ -134,11 +186,11 @@ class PlacoIkSolver:
def solve(self, target_tool_pose: np.ndarray) -> list[float]:
if self._actual_joints is None:
raise RuntimeError("joint state must be initialized before QP solve")
self._frame_task.T_world_frame = _validated_transform(
self._frame_task.T_a_b = _validated_transform(
target_tool_pose
)
result = np.asarray(
self._robot.state.q[RM75_Q_SLICE],
self._robot.state.q[self._q_offsets],
dtype=float,
).copy()
position_error, orientation_error = self._target_errors()
@@ -153,7 +205,7 @@ class PlacoIkSolver:
self._solver.solve(True)
self._robot.update_kinematics()
result = np.asarray(
self._robot.state.q[RM75_Q_SLICE],
self._robot.state.q[self._q_offsets],
dtype=float,
).copy()
self._validate_result(result, previous)
+17 -5
View File
@@ -44,9 +44,10 @@ class MockRealManAdapter:
math.isfinite(value) for value in initial_joint_degrees
):
raise ValueError("initial joint pose must contain 7 finite values")
self._joint_positions = [
self._initial_joint_positions = [
math.radians(value) for value in initial_joint_degrees
]
self._joint_positions = list(self._initial_joint_positions)
self.last_joint_target: list[float] | None = None
self.last_tool_open: bool | None = None
@@ -69,6 +70,10 @@ class MockRealManAdapter:
self._joint_positions = list(joints)
self.last_joint_target = list(joints)
def move_to_initial_pose(self) -> None:
self._joint_positions = list(self._initial_joint_positions)
self.last_joint_target = list(self._joint_positions)
def stop(self) -> None:
return
@@ -178,7 +183,7 @@ class RealManAdapter:
if self._configure_safety_limits:
self._apply_safety_limits()
if self._move_to_initial_pose_on_connect:
self._move_to_initial_pose()
self.move_to_initial_pose()
self._feedback_ready.clear()
self._accept_realtime_feedback = True
self._realtime_callback = rm_realtime_arm_state_callback_ptr(
@@ -188,7 +193,7 @@ class RealManAdapter:
self._realtime_callback
)
config = rm_realtime_push_config_t(
self._realtime_push_cycle_ms,
self._realtime_push_cycle_ms // 5,
True,
self._realtime_push_port,
0,
@@ -451,11 +456,18 @@ class RealManAdapter:
self._try_call("rm_set_joint_max_speed", joint_index, self._joint_max_speed)
self._try_call("rm_set_joint_max_acc", joint_index, self._joint_max_acc)
def _move_to_initial_pose(self) -> None:
def move_to_initial_pose(self) -> None:
self._require_arm()
if self._initial_joint_pose is None:
raise RuntimeError("启用初始位姿移动时必须配置 initial_joint_pose")
ret = self._arm.rm_movej(self._initial_joint_pose, self._init_move_speed, 0, 0, 1)
ret = self._arm.rm_movej(
self._initial_joint_pose,
self._init_move_speed,
0,
0,
1,
)
self._check_return(ret, "rm_movej(initial_joint_pose)")
def _try_call(self, name: str, *args: Any) -> None:
@@ -17,6 +17,7 @@ import rclpy
from geometry_msgs.msg import PoseStamped, TwistStamped
from rclpy.node import Node
from rclpy.time import Time
from sensor_msgs.msg import JointState
from std_msgs.msg import Bool
from xr_rm_interfaces.msg import XrController
@@ -258,6 +259,7 @@ class SingleArmVelocityTeleop(Node):
self._low_z_threshold = float(self.get_parameter("low_z_threshold").value)
self._low_z_min_radius = float(self.get_parameter("low_z_min_radius").value)
self._xr_to_robot_matrix = self._float_list_parameter("xr_to_robot_matrix", 9)
self._use_mock = self._bool_parameter("use_mock")
self._follow = self._bool_parameter("follow")
self._enable_tool_control = self._bool_parameter("enable_tool_control")
self._enable_trigger_gripper_control = self._bool_parameter("enable_trigger_gripper_control")
@@ -295,6 +297,7 @@ class SingleArmVelocityTeleop(Node):
self._control_fault_latched = False
self._stop_sent = True
self._trigger_tool_open = True
self._last_primary_pressed: bool | None = None
self._last_trigger_pressed: bool | None = None
self._tool_command_queue: queue.Queue[tuple[bool, str] | None] | None = None
self._tool_worker_stop = threading.Event()
@@ -324,13 +327,24 @@ class SingleArmVelocityTeleop(Node):
self._ik_solver = PlacoIkSolver(
str(self.get_parameter("robot_urdf_path").value),
self._dt,
peripheral_arm,
)
debug_ns = f"{self._debug_topic_prefix}/{self._arm_name}"
self._joint_state_pub = self.create_publisher(
JointState,
f"{debug_ns}/joint_states",
10,
)
self._joint_target_pub = self.create_publisher(
JointState,
f"{debug_ns}/joint_target",
10,
)
self._adapter = self._make_adapter()
self._adapter.connect()
self._initialize_joint_state()
self._setup_tool_control()
debug_ns = f"{self._debug_topic_prefix}/{self._arm_name}"
self._current_pose_pub = self.create_publisher(PoseStamped, f"{debug_ns}/current_pose", 10)
self._raw_target_pose_pub = self.create_publisher(PoseStamped, f"{debug_ns}/raw_target_pose", 10)
self._target_pose_pub = self.create_publisher(PoseStamped, f"{debug_ns}/target_pose", 10)
@@ -350,7 +364,7 @@ class SingleArmVelocityTeleop(Node):
"initial_joint_pose",
7,
)
if self._bool_parameter("use_mock"):
if self._use_mock:
return MockRealManAdapter(initial_joint_pose)
return RealManAdapter(
@@ -391,6 +405,13 @@ class SingleArmVelocityTeleop(Node):
self._adapter.close()
raise
def _publish_joint_positions(self, publisher, positions: list[float]) -> None:
message = JointState()
message.header.stamp = self.get_clock().now().to_msg()
message.name = self._ik_solver.joint_names
message.position = [float(value) for value in positions]
publisher.publish(message)
def _reset_joint_state(
self,
snapshot: JointStateSnapshot,
@@ -404,6 +425,7 @@ class SingleArmVelocityTeleop(Node):
self._last_valid_joint_target = list(positions)
self._last_joint_command_target = list(positions)
self._last_joint_command_velocity = [0.0] * 7
self._publish_joint_positions(self._joint_state_pub, positions)
return current_pose
def _setup_tool_control(self) -> None:
@@ -514,8 +536,34 @@ class SingleArmVelocityTeleop(Node):
def _on_controller(self, msg: XrController) -> None:
self._last_msg = msg
self._last_msg_time = self.get_clock().now()
self._handle_initial_pose_button(msg)
self._handle_trigger_gripper(msg)
def _handle_initial_pose_button(self, msg: XrController) -> None:
if self._last_primary_pressed is None:
self._last_primary_pressed = msg.primary
return
rising_edge = msg.primary and not self._last_primary_pressed
self._last_primary_pressed = msg.primary
if not rising_edge:
return
self._grip_rearm_required = True
self._safe_stop(reset_active=True)
try:
self._adapter.move_to_initial_pose()
self._reset_joint_state(self._adapter.read_joint_state())
except Exception as exc:
self.get_logger().error(
f"{self._arm_name} 回初始位姿失败:{exc}"
)
return
if self._use_mock:
self._grip_rearm_required = False
self.get_logger().info(f"{self._arm_name} 已回到初始位姿。")
def _handle_trigger_gripper(self, msg: XrController) -> None:
if not self._enable_tool_control or not self._enable_trigger_gripper_control:
return
@@ -1039,7 +1087,8 @@ class SingleArmVelocityTeleop(Node):
self._grip_rearm_required = True
if self._joint_feedback_ready:
self.get_logger().warn(
f"{self._arm_name} UDP关节反馈超时,保持最后安全目标。"
f"{self._arm_name} UDP关节反馈超时"
f"age={age * 1000.0:.1f} ms),保持最后安全目标。"
)
self._joint_feedback_ready = False
@@ -1139,6 +1188,10 @@ class SingleArmVelocityTeleop(Node):
)
self._latest_joint_positions = list(snapshot.positions)
self._last_current_pose = current_pose
self._publish_joint_positions(
self._joint_state_pub,
list(snapshot.positions),
)
if not self._active or self._last_valid_joint_target is None:
self._last_valid_joint_target = list(snapshot.positions)
return current_pose
@@ -1227,6 +1280,10 @@ class SingleArmVelocityTeleop(Node):
return False
self._last_joint_command_target = limited_target
self._last_joint_command_velocity = limited_velocity
self._publish_joint_positions(
self._joint_target_pub,
limited_target,
)
return True
@staticmethod
@@ -1244,23 +1301,51 @@ class SingleArmVelocityTeleop(Node):
or len(previous_velocity) != 7
):
raise ValueError("joint command state must contain 7 values")
if max_speed <= 0.0 or max_acceleration <= 0.0 or dt <= 0.0:
raise ValueError("joint command limits and dt must be positive")
desired_velocity = np.clip(
(np.asarray(target) - np.asarray(previous_target)) / dt,
-max_speed,
max_speed,
)
if not all(
math.isfinite(value) and value > 0.0
for value in (max_speed, max_acceleration, dt)
):
raise ValueError("joint command limits and dt must be finite and positive")
values = np.asarray([target, previous_target, previous_velocity], dtype=float)
if not np.isfinite(values).all():
raise ValueError("joint command contains NaN/Inf")
velocity_step = max_acceleration * dt
velocity = np.clip(
desired_velocity,
np.asarray(previous_velocity) - velocity_step,
np.asarray(previous_velocity) + velocity_step,
arrival_distance = velocity_step * dt
limited_target = []
limited_velocity = []
for desired_target, last_target, last_velocity in zip(
target, previous_target, previous_velocity
):
error = desired_target - last_target
if abs(last_velocity) <= 1e-12 and abs(error) <= arrival_distance:
velocity = _clamp(error / dt, -max_speed, max_speed)
position = last_target + velocity * dt
else:
direction = (
math.copysign(1.0, error) if abs(error) > 1e-12 else 0.0
)
limited_target = np.asarray(previous_target) + velocity * dt
accelerated_speed = min(abs(last_velocity) + velocity_step, max_speed)
braking_steps = max(0, math.ceil(accelerated_speed / velocity_step) - 1)
braking_distance = accelerated_speed * dt + dt * (
braking_steps * accelerated_speed
- velocity_step * braking_steps * (braking_steps + 1) / 2.0
)
desired_velocity = direction * max_speed
if last_velocity * error > 0.0 and abs(error) <= braking_distance:
desired_velocity = 0.0
velocity = _clamp(
desired_velocity,
last_velocity - velocity_step,
last_velocity + velocity_step,
)
velocity = _clamp(velocity, -max_speed, max_speed)
position = last_target + velocity * dt
limited_target.append(position)
limited_velocity.append(velocity)
if not np.isfinite(limited_target).all():
raise ValueError("joint command contains NaN/Inf")
return limited_target.tolist(), velocity.tolist()
return limited_target, limited_velocity
def _publish_debug(
self,