72353f3773
背景:现场读代码的人只读中文。此前代码里的 docstring 是英文、行内注释是中文,
一半英文一半中文反而更难看懂 —— 新手打开一个 .py 不知道这个模块为什么存在。
范围(本仓库自己的代码,厂商上游不动)
src/arm_application/** 37 个文件:servo_node / perception_node / handeye_* / dh_pgea /
yolo_detector / kalman_filter / goto_ee_plane / dual_gripper …
src/arm_interfaces/** 11 个文件:paths / manifest / loader / config_guard / errors …
src/arm_control/** 5 个文件
src/arm_bringup/** 3 个 launch
scripts/** 6 个 .py + 29 个 .sh(scripts/ 是"唯一操作入口",用户屏幕上
看到的就是这些提示,所以提示信息也一并中文化)
config/ handeye/ devices/ src/arm_*/config/ 17 个 .yaml/.xml/.xacro/.cfg
口径(写进 docs/FRAMEWORK_RULES.md 新增的 R6.5,作为长期约束)
注释、docstring、print/日志/异常里给人看的句子 = 中文;
标识符、API 名、话题名、参数名、字段名、命令名 = 保留英文原文(用 `` `` 包起来);
单位、十六进制、协议报文、CRC 值、命令示例 = 原样保留;
src/flexiv_*/ = 厂商上游代码,不许改也不许翻译(R4.4)。
翻译保原意与原有详细程度:那些"为什么不能用另一种做法""踩过什么坑"的说明
全部完整保留 —— 它们才是这份代码里最贵的部分。
新增 scripts/check_text_only.py:只改文字时的自证工具
人工 review 靠不住(115 个文件、3000 多行 diff)。这个脚本把改动前后的源码解析成
语法树,删掉 docstring、抹平字符串常量、把 f-string 只留"插值了几次 + 插值是什么",
再比对:完全相同 = 改动范围内没有逻辑变化。
留了一个口子:f-string 的插值按内容排序后再比 —— 因为中文语序常常要和英文反着来
(f"on {port} read {idx} failed" → f"在 {port} 上读 {idx} 失败"),只换显示顺序不该判失败;
但多插一个、少插一个、换掉被插入的表达式,立刻会报出来。
本次 66 个 .py 全部通过该闸门。
验收
改动的 66 个 .py:scripts/check_text_only.py 全部通过(零逻辑变化)
45 个非 .py 文件:去注释后与 HEAD 逐字节相同(零配置变化)
docstring 总数:没有一个文件减少(不存在"翻译时顺手删了说明")
单测:arm_application 233 / arm_driver_flexiv 69 / arm_interfaces 46 /
arm_kinematics 24 / arm_sim_gazebo 236 = 608 passed,与改动前一致
全部 .sh:bash -n 通过;并额外实际执行了 --help 验证(见下一个提交:
bash -n 对 CRLF 脚本会漏报,只有真跑才暴露)
Co-authored-by: Cursor <cursoragent@cursor.com>
159 lines
5.4 KiB
Bash
Executable File
159 lines
5.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
||
# 终端方式运行 D405:走官方 pyrealsense2 SDK —— 发布彩色 + 深度 + 双目 IR 话题。
|
||
# 带 --preview 时,Qt 窗口跑在**独立的**查看器进程(`realsense_view`)里,
|
||
# 这样绘制界面永远不会拖慢相机数据流。关掉窗口 ≠ 停止相机。
|
||
# 不要同时启动 `view_realsense_depth.sh`(USB 是独占的)。
|
||
#
|
||
# 用法:
|
||
# bash ~/ros2/scripts/run_camera_d405.sh
|
||
# bash ~/ros2/scripts/run_camera_d405.sh --preview
|
||
# bash ~/ros2/scripts/run_camera_d405.sh --arm 91 --preview
|
||
|
||
set -eo pipefail
|
||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||
PREVIEW=-1 # -1 = 沿用 site;0/1 = 强制
|
||
HIGH_FPS=0
|
||
|
||
# shellcheck disable=SC1091
|
||
source "${ROOT}/scripts/lib/parse_arm_args.sh"
|
||
parse_arm_args "$@"
|
||
set -- "${PARSE_ARM_REST[@]}"
|
||
|
||
while [[ $# -gt 0 ]]; do
|
||
case "$1" in
|
||
--preview) PREVIEW=1; shift ;;
|
||
--no-preview) PREVIEW=0; shift ;;
|
||
--30fps) HIGH_FPS=1; shift ;;
|
||
-h|--help) sed -n '2,14p' "$0"; exit 0 ;;
|
||
*) echo "Unknown: $1" >&2; exit 1 ;;
|
||
esac
|
||
done
|
||
|
||
# shellcheck disable=SC1091
|
||
source "${ROOT}/scripts/env.sh"
|
||
# shellcheck disable=SC1091
|
||
source "${ROOT}/scripts/lib/load_site_config.sh"
|
||
|
||
pkill -f 'lib/arm_application/realsense_color_pub' 2>/dev/null || true
|
||
sleep 2
|
||
|
||
USB_INFO="$(python3 - <<PY 2>/dev/null || true
|
||
import pyrealsense2 as rs
|
||
want_sn = "${SITE_CAM_SERIAL:-}"
|
||
ds = list(rs.context().devices)
|
||
if not ds:
|
||
print("")
|
||
raise SystemExit
|
||
pick = None
|
||
for d in ds:
|
||
sn = d.get_info(rs.camera_info.serial_number)
|
||
if want_sn and sn == want_sn:
|
||
pick = d
|
||
break
|
||
if pick is None:
|
||
for d in ds:
|
||
name = (d.get_info(rs.camera_info.name) or "").lower()
|
||
if "405" in name:
|
||
pick = d
|
||
break
|
||
pick = pick or ds[0]
|
||
usb = pick.get_info(rs.camera_info.usb_type_descriptor)
|
||
sn = pick.get_info(rs.camera_info.serial_number)
|
||
name = pick.get_info(rs.camera_info.name)
|
||
print(f"{usb}|{sn}|{name}")
|
||
PY
|
||
)"
|
||
USB_TYPE="${USB_INFO%%|*}"
|
||
echo "=== RealSense USB=${USB_TYPE:-unknown} ${USB_INFO} ==="
|
||
echo "=== site: ${SITE_CONFIG:-?} weights=${SITE_YOLO_WEIGHTS:-?} ==="
|
||
|
||
if [[ "${USB_TYPE}" == 2* ]]; then
|
||
CAM_W=640; CAM_H=480; CAM_FPS=15
|
||
echo "=== camera 640x480@15 (USB2: depth+IR still ON) ==="
|
||
echo "=== WARN: D405 is on USB2. Plug it into a USB3 (blue) port for 848x480@30 ==="
|
||
elif [[ "${SITE_CAM_USE_SITE_RES:-1}" == "1" ]]; then
|
||
# site.yaml camera.width/height/fps 优先;--30fps 只抬帧率,不再写死 848x480
|
||
CAM_W="${SITE_CAM_WIDTH:-848}"
|
||
CAM_H="${SITE_CAM_HEIGHT:-480}"
|
||
CAM_FPS="${SITE_CAM_FPS:-30}"
|
||
if [[ "${HIGH_FPS}" -eq 1 && "${CAM_FPS}" -lt 30 ]]; then
|
||
CAM_FPS=30
|
||
fi
|
||
echo "=== camera ${CAM_W}x${CAM_H}@${CAM_FPS} serial=${SITE_CAM_SERIAL:-} arm=${SITE_ROBOT_SN:-} ==="
|
||
elif [[ "${HIGH_FPS}" -eq 1 ]]; then
|
||
CAM_W=848; CAM_H=480; CAM_FPS=30
|
||
echo "=== camera 848x480@30 (--30fps, site use_site_resolution=false) ==="
|
||
else
|
||
CAM_W=1280; CAM_H=720; CAM_FPS=15
|
||
echo "=== camera 1280x720@15 ==="
|
||
fi
|
||
|
||
CAM_NAME="${SITE_CAM_NAME:-d405}"
|
||
CAM_ARGS=(
|
||
--ros-args
|
||
-p camera_name:="${CAM_NAME}"
|
||
-p width:="${CAM_W}"
|
||
-p height:="${CAM_H}"
|
||
-p fps:="${CAM_FPS}"
|
||
)
|
||
if [[ -n "${SITE_CAM_SERIAL:-}" ]]; then
|
||
CAM_ARGS+=(-p camera_serial:="${SITE_CAM_SERIAL}")
|
||
fi
|
||
CAM_ARGS+=(
|
||
-p auto_exposure:="$([ "${SITE_CAM_AUTO_EXPOSURE:-1}" = "1" ] && echo true || echo false)"
|
||
-p ae_limit_us:="${SITE_CAM_AE_LIMIT_US:-4000}"
|
||
-p emitter_enabled:="$([ "${SITE_CAM_EMITTER:-0}" = "1" ] && echo true || echo false)"
|
||
-p laser_power:="${SITE_CAM_LASER_POWER:-0}"
|
||
)
|
||
if [[ -n "${SITE_CAM_EXPOSURE_US:-}" && "${SITE_CAM_EXPOSURE_US}" != "0" && "${SITE_CAM_EXPOSURE_US}" != "0.0" ]]; then
|
||
CAM_ARGS+=(-p exposure_us:="${SITE_CAM_EXPOSURE_US}")
|
||
fi
|
||
if [[ -n "${SITE_CAM_GAIN:-}" && "${SITE_CAM_GAIN}" != "0" && "${SITE_CAM_GAIN}" != "0.0" ]]; then
|
||
CAM_ARGS+=(-p gain:="${SITE_CAM_GAIN}")
|
||
fi
|
||
|
||
if [[ "${SITE_CAM_ENABLE_DEPTH:-1}" == "1" ]]; then
|
||
CAM_ARGS+=(-p enable_depth:=true)
|
||
echo "=== depth ON ==="
|
||
else
|
||
CAM_ARGS+=(-p enable_depth:=false)
|
||
echo "=== depth OFF (site.yaml) ==="
|
||
fi
|
||
|
||
DO_PREVIEW="${SITE_CAM_PREVIEW:-1}"
|
||
if [[ "${PREVIEW}" -ge 0 ]]; then
|
||
DO_PREVIEW="${PREVIEW}"
|
||
fi
|
||
if [[ "${SITE_CAM_ENABLE_INFRA:-1}" == "1" ]]; then
|
||
CAM_ARGS+=(-p enable_infra:=true)
|
||
else
|
||
CAM_ARGS+=(-p enable_infra:=false)
|
||
fi
|
||
if [[ "${SITE_CAM_PREVIEW_STEREO:-1}" == "1" ]]; then
|
||
CAM_ARGS+=(-p preview_stereo:=true)
|
||
else
|
||
CAM_ARGS+=(-p preview_stereo:=false)
|
||
fi
|
||
|
||
if [[ "${DO_PREVIEW}" == "1" ]]; then
|
||
echo "=== SDK preview ON (separate viewer process, hold ${SITE_CAM_OVERLAY_HOLD:-0.1}s) ==="
|
||
echo "=== close window = hide preview only; camera keeps publishing ==="
|
||
fi
|
||
|
||
echo "=== next: bash ~/ros2/scripts/run_visual_servo_rt.sh --arm ${SITE_ROBOT_ARM:-89} [--control] ==="
|
||
|
||
if [[ "${DO_PREVIEW}" == "1" ]]; then
|
||
# 相机进程只负责发布;Qt 查看器跑在自己的进程里,所以界面绘制
|
||
# 永远不会把采集循环饿死(以前共用 GIL 时每帧要花约 70 ms)。
|
||
pkill -f 'lib/arm_application/realsense_view' 2>/dev/null || true
|
||
ros2 run arm_application realsense_color_pub "${CAM_ARGS[@]}" -p show_preview:=false &
|
||
CAM_PID=$!
|
||
trap 'kill "${CAM_PID}" 2>/dev/null || true' EXIT INT TERM
|
||
ros2 run arm_application realsense_view --ros-args \
|
||
-p camera_name:="${CAM_NAME}" \
|
||
-p overlay_hold_sec:="${SITE_CAM_OVERLAY_HOLD:-0.1}" \
|
||
-p hud_label:="${SITE_ROBOT_LABEL:-} ${SITE_ROBOT_SN:-} ${SITE_CAM_SERIAL:-}"
|
||
else
|
||
exec ros2 run arm_application realsense_color_pub "${CAM_ARGS[@]}"
|
||
fi
|