diff --git a/docs/en/tools/_toc.yaml b/docs/en/tools/_toc.yaml index ce2b2cd69d4505e5ed043c697db421e045c37c89..149ce861c0ce96fac9a4aacd9005212f67632d88 100644 --- a/docs/en/tools/_toc.yaml +++ b/docs/en/tools/_toc.yaml @@ -7,3 +7,4 @@ sections: - href: ./cloud/_toc.yaml - href: ./maintenance/_toc.yaml - href: ./security/_toc.yaml + - href: ./ros/_toc.yaml diff --git a/docs/en/tools/ros/_toc.yaml b/docs/en/tools/ros/_toc.yaml new file mode 100644 index 0000000000000000000000000000000000000000..ba231fd05be58dd83cc67bf5b899b557116e1586 --- /dev/null +++ b/docs/en/tools/ros/_toc.yaml @@ -0,0 +1,16 @@ +label: ROS User Guide +isManual: true +description: Install, deploy, and use ROS on openEuler. +sections: + - label: ROS User Guide + href: ./ros_user_guide.md + - label: Getting to Know ROS + href: ./getting_to_know_ros.md + - label: Installation and Deployment + href: ./installation_and_deployment.md + - label: Usage + href: ./usage_guide.md + - label: Common Issues and Solutions + href: ./faqs_and_solutions.md + - label: Appendix + href: ./appendix.md diff --git a/docs/en/tools/ros/appendix.md b/docs/en/tools/ros/appendix.md new file mode 100644 index 0000000000000000000000000000000000000000..07a1eb1ea8cbaa02e9eef550cd94a56dc0cf39f8 --- /dev/null +++ b/docs/en/tools/ros/appendix.md @@ -0,0 +1,3 @@ +# Appendix + +For more about ROS, visit [ROS wiki](https://wiki.ros.org/) and [ROS docs](http://docs.ros.org/). diff --git a/docs/en/tools/ros/faqs_and_solutions.md b/docs/en/tools/ros/faqs_and_solutions.md new file mode 100644 index 0000000000000000000000000000000000000000..f5933a9ead3745a027a0d2e32590438e052dd47c --- /dev/null +++ b/docs/en/tools/ros/faqs_and_solutions.md @@ -0,0 +1,3 @@ +# Common Issues and Solutions + +This document is currently not available in English. diff --git a/archive/uncertain/ROS/figures/ROS-ROS2.png b/docs/en/tools/ros/figures/ROS-ROS2.png similarity index 100% rename from archive/uncertain/ROS/figures/ROS-ROS2.png rename to docs/en/tools/ros/figures/ROS-ROS2.png diff --git a/archive/uncertain/ROS/figures/ROS-demo.png b/docs/en/tools/ros/figures/ROS-demo.png similarity index 100% rename from archive/uncertain/ROS/figures/ROS-demo.png rename to docs/en/tools/ros/figures/ROS-demo.png diff --git a/archive/uncertain/ROS/figures/ROS-release.png b/docs/en/tools/ros/figures/ROS-release.png similarity index 100% rename from archive/uncertain/ROS/figures/ROS-release.png rename to docs/en/tools/ros/figures/ROS-release.png diff --git a/archive/uncertain/ROS/figures/ROS2-release.png b/docs/en/tools/ros/figures/ROS2-release.png similarity index 100% rename from archive/uncertain/ROS/figures/ROS2-release.png rename to docs/en/tools/ros/figures/ROS2-release.png diff --git a/archive/uncertain/ROS/figures/problem.png b/docs/en/tools/ros/figures/problem.png similarity index 100% rename from archive/uncertain/ROS/figures/problem.png rename to docs/en/tools/ros/figures/problem.png diff --git a/archive/uncertain/ROS/figures/ros-humble.png b/docs/en/tools/ros/figures/ros-humble.png similarity index 100% rename from archive/uncertain/ROS/figures/ros-humble.png rename to docs/en/tools/ros/figures/ros-humble.png diff --git a/archive/uncertain/ROS/figures/turtlesim.png b/docs/en/tools/ros/figures/turtlesim.png similarity index 100% rename from archive/uncertain/ROS/figures/turtlesim.png rename to docs/en/tools/ros/figures/turtlesim.png diff --git a/docs/en/tools/ros/getting_to_know_ros.md b/docs/en/tools/ros/getting_to_know_ros.md new file mode 100644 index 0000000000000000000000000000000000000000..989b9d313f90823b7a53b0f3a3b9237d77adbdb0 --- /dev/null +++ b/docs/en/tools/ros/getting_to_know_ros.md @@ -0,0 +1,3 @@ +# Getting to Know ROS + +This document is currently not available in English. diff --git a/docs/en/tools/ros/installation_and_deployment.md b/docs/en/tools/ros/installation_and_deployment.md new file mode 100644 index 0000000000000000000000000000000000000000..186f2509479870128db9eb87374b6131dfce770b --- /dev/null +++ b/docs/en/tools/ros/installation_and_deployment.md @@ -0,0 +1,3 @@ +# Installation and Deployment + +This document is currently not available in English. diff --git a/docs/en/tools/ros/ros_user_guide.md b/docs/en/tools/ros/ros_user_guide.md new file mode 100644 index 0000000000000000000000000000000000000000..c4f1798771e0dd8e583ad1c5bfb552aecadfbb7c --- /dev/null +++ b/docs/en/tools/ros/ros_user_guide.md @@ -0,0 +1,5 @@ +# ROS User Guide + +This document describes the installation and usage of the Robot Operating System (ROS) on openEuler. + +This document is intended for developers, open source enthusiasts, and partners who use openEuler and want to know and use ROS. You need to have basic knowledge of the Linux OS. diff --git a/docs/en/tools/ros/usage_guide.md b/docs/en/tools/ros/usage_guide.md new file mode 100644 index 0000000000000000000000000000000000000000..fdef6804f1b60f0e5ae25973ca4150ed6254ba08 --- /dev/null +++ b/docs/en/tools/ros/usage_guide.md @@ -0,0 +1,3 @@ +# Usage + +This document is currently not available in English. diff --git a/docs/zh/tools/_toc.yaml b/docs/zh/tools/_toc.yaml index 7e14457551a76f1a6c288a9cb96fe75c7145dab5..96d2b3cd87385d88de4f0539fa63476225d6f150 100644 --- a/docs/zh/tools/_toc.yaml +++ b/docs/zh/tools/_toc.yaml @@ -7,3 +7,4 @@ sections: - href: ./cloud/_toc.yaml - href: ./maintenance/_toc.yaml - href: ./security/_toc.yaml + - href: ./ros/_toc.yaml diff --git a/docs/zh/tools/ros/_toc.yaml b/docs/zh/tools/ros/_toc.yaml new file mode 100644 index 0000000000000000000000000000000000000000..9763d7ab5971a32677803c361845bedbf19da456 --- /dev/null +++ b/docs/zh/tools/ros/_toc.yaml @@ -0,0 +1,14 @@ +label: ROS 用户指南 +isManual: true +description: 主要介绍了 openEuler 系统上 ROS 的安装部署与使用方法。 +sections: + - label: ROS 用户指南 + href: ./ros_user_guide.md + - label: 认识ROS + href: ./getting_to_know_ros.md + - label: 安装与部署 + href: ./installation_and_deployment.md + - label: 使用方法 + href: ./usage_guide.md + - label: 附录 + href: ./appendix.md diff --git "a/archive/uncertain/ROS/\351\231\204\345\275\225.md" b/docs/zh/tools/ros/appendix.md similarity index 100% rename from "archive/uncertain/ROS/\351\231\204\345\275\225.md" rename to docs/zh/tools/ros/appendix.md diff --git "a/archive/uncertain/ROS/\345\270\270\350\247\201\351\227\256\351\242\230\344\270\216\350\247\243\345\206\263\346\226\271\346\263\225.md" b/docs/zh/tools/ros/faqs_and_solutions.md similarity index 90% rename from "archive/uncertain/ROS/\345\270\270\350\247\201\351\227\256\351\242\230\344\270\216\350\247\243\345\206\263\346\226\271\346\263\225.md" rename to docs/zh/tools/ros/faqs_and_solutions.md index a7a4901b6ede1390eb2eb734b9817422b2e99cd6..5a41881407ba05eb31cc26068d821ebb4a23c0f3 100644 --- "a/archive/uncertain/ROS/\345\270\270\350\247\201\351\227\256\351\242\230\344\270\216\350\247\243\345\206\263\346\226\271\346\263\225.md" +++ b/docs/zh/tools/ros/faqs_and_solutions.md @@ -1,6 +1,6 @@ -# 常见问题与解决方法 +# 常见问题及解决方法 -## **问题1** +## 问题1: ![](./figures/problem.png) diff --git a/docs/zh/tools/ros/figures/ROS-ROS2.png b/docs/zh/tools/ros/figures/ROS-ROS2.png new file mode 100644 index 0000000000000000000000000000000000000000..649c0aa93b0a3710f027ecf9df2482920f16301e Binary files /dev/null and b/docs/zh/tools/ros/figures/ROS-ROS2.png differ diff --git a/docs/zh/tools/ros/figures/ROS-demo.png b/docs/zh/tools/ros/figures/ROS-demo.png new file mode 100644 index 0000000000000000000000000000000000000000..184ae905d022e52adbac7fcee59d956903e1ff5c Binary files /dev/null and b/docs/zh/tools/ros/figures/ROS-demo.png differ diff --git a/docs/zh/tools/ros/figures/ROS-release.png b/docs/zh/tools/ros/figures/ROS-release.png new file mode 100644 index 0000000000000000000000000000000000000000..bf7c1cb7b2b0b60ec375613d32e09ecd0a9174d0 Binary files /dev/null and b/docs/zh/tools/ros/figures/ROS-release.png differ diff --git a/docs/zh/tools/ros/figures/ROS2-release.png b/docs/zh/tools/ros/figures/ROS2-release.png new file mode 100644 index 0000000000000000000000000000000000000000..dc606412c467714af1d05c92b244ecfef63664f6 Binary files /dev/null and b/docs/zh/tools/ros/figures/ROS2-release.png differ diff --git a/docs/zh/tools/ros/figures/problem.png b/docs/zh/tools/ros/figures/problem.png new file mode 100644 index 0000000000000000000000000000000000000000..9f690fb99cac9b957a6601b6eca3a011bee12273 Binary files /dev/null and b/docs/zh/tools/ros/figures/problem.png differ diff --git a/docs/zh/tools/ros/figures/ros-humble.png b/docs/zh/tools/ros/figures/ros-humble.png new file mode 100644 index 0000000000000000000000000000000000000000..a6079358d9df9b983d82679af067a634fe5c05c3 Binary files /dev/null and b/docs/zh/tools/ros/figures/ros-humble.png differ diff --git a/docs/zh/tools/ros/figures/turtlesim.png b/docs/zh/tools/ros/figures/turtlesim.png new file mode 100644 index 0000000000000000000000000000000000000000..ebc8368f7e8e6a4b44075ad402b492638d636181 Binary files /dev/null and b/docs/zh/tools/ros/figures/turtlesim.png differ diff --git "a/archive/uncertain/ROS/\350\256\244\350\257\206ROS.md" b/docs/zh/tools/ros/getting_to_know_ros.md similarity index 96% rename from "archive/uncertain/ROS/\350\256\244\350\257\206ROS.md" rename to docs/zh/tools/ros/getting_to_know_ros.md index fa57fa8b6b484c06b6a5d26229111f838b53714a..df0ee4246d307be9155c02fa4627bc634c0af5ea 100644 --- "a/archive/uncertain/ROS/\350\256\244\350\257\206ROS.md" +++ b/docs/zh/tools/ros/getting_to_know_ros.md @@ -2,7 +2,7 @@ ## 简介 -ROS 是一个适用于机器人的开源的元操作系统。它提供了操作系统应有的服务,包括硬件抽象,底层设备控制,常用函数的实现,进程间消息传递,以及包管理。它也提供用于获取、编译、编写和跨计算机运行代码所需的工具和库函数。 +ROS 是一个适用于机器人的开源的元操作系统。它提供了操作系统应有的服务,包括硬件抽象,底层设备控制,常用函数的实现,进程间消息传递,以及包管理。它也提供用于获取、编译、编写、和跨计算机运行代码所需的工具和库函数。 ROS的运行架构是一种使用ROS通信模块实现模块间[P2P](https://zh.wikipedia.org/wiki/對等網路)的松耦合的网络连接的处理架构,它执行若干种类型的通讯,包括: diff --git "a/archive/uncertain/ROS/\345\256\211\350\243\205\344\270\216\351\203\250\347\275\262.md" b/docs/zh/tools/ros/installation_and_deployment.md similarity index 61% rename from "archive/uncertain/ROS/\345\256\211\350\243\205\344\270\216\351\203\250\347\275\262.md" rename to docs/zh/tools/ros/installation_and_deployment.md index e99c9809f19441b1a2c10cb6636be920ea564ac2..4fbe1ef85ebfd69412d0c275cc10957b17652edd 100644 --- "a/archive/uncertain/ROS/\345\256\211\350\243\205\344\270\216\351\203\250\347\275\262.md" +++ b/docs/zh/tools/ros/installation_and_deployment.md @@ -1,16 +1,12 @@ # 安装与部署 -## 软件要求 - -* 操作系统:openEuler 25.03 - ## 硬件要求 * x86_64架构、AArch64架构 ## 环境准备 -* 安装openEuler 25.03 系统,安装方法参考 《[安装指南](../../../docs/zh/server/installation_upgrade/installation/installation.md)》。 +* 安装 openEuler 系统,安装方法参考 《[安装指南](../../server/installation_upgrade/installation/installation_on_servers.md)》。 ## 1. ROS2 @@ -22,7 +18,7 @@ ```shell [root@openEuler ~]# yum install openeuler-ros - [root@openEuler ~]# yum install ros-humble-ros-base ros-humble-xxx 例如安装小乌龟ros-humble-turtlesim + [root@openEuler ~]# yum install ros-noetic-* ``` 2. 执行如下命令,查看安装是否成功。如果回显有对应软件包,表示安装成功。 @@ -31,6 +27,23 @@ [root@openEuler ~]# rpm -q ros-humble ``` +### 2. ros-noetic + +#### 2. 安装ros-noetic + +1. 安装ros-noetic 软件包 + + ```shell + [root@openEuler ~]# yum install openeuler-ros + [root@openEuler ~]# yum install ros-noetic-* + ``` + +2. 执行如下命令,查看安装是否成功。如果回显有对应软件包,表示安装成功。 + + ```shell + [root@openEuler ~]# rpm -q ros-noetic + ``` + #### 2. 测试 ros-humble ##### 运行小乌龟 diff --git "a/archive/uncertain/ROS/ROS\347\224\250\346\210\267\346\214\207\345\215\227.md" b/docs/zh/tools/ros/ros_user_guide.md similarity index 84% rename from "archive/uncertain/ROS/ROS\347\224\250\346\210\267\346\214\207\345\215\227.md" rename to docs/zh/tools/ros/ros_user_guide.md index 9eb573cd3c915ba1e0c695344c9efb288af3a0a2..9b2a72aae3dd642106c17223e52c67666bfb6ab2 100644 --- "a/archive/uncertain/ROS/ROS\347\224\250\346\210\267\346\214\207\345\215\227.md" +++ b/docs/zh/tools/ros/ros_user_guide.md @@ -2,4 +2,4 @@ 本文档介绍openEuler系统上ROS(英语:Robot Operating System,一般译为机器人操作系统)的安装部署与使用方法,以指导用户快速了解并使用ROS。 -本文档适用于使用openEuler系统并希望了解和使用ROS的社区开发者、开源爱好者以及相关合作伙伴。使用人员需要具备基本的Linux操作系统知识。 +本文档适用于使用openEuler系统并希望了解和使用ROS的社区开发者、开源爱好者以及相关合作伙伴。使用人员需要具备基本的Linux操作系统知识。 \ No newline at end of file diff --git "a/archive/uncertain/ROS/\344\275\277\347\224\250\346\226\271\346\263\225.md" b/docs/zh/tools/ros/usage_guide.md similarity index 93% rename from "archive/uncertain/ROS/\344\275\277\347\224\250\346\226\271\346\263\225.md" rename to docs/zh/tools/ros/usage_guide.md index 753071153f3364d52a496f0f67de31e3e6420f55..b3a6f25386497642ca51e62c834ed39b0d71fe1c 100644 --- "a/archive/uncertain/ROS/\344\275\277\347\224\250\346\226\271\346\263\225.md" +++ b/docs/zh/tools/ros/usage_guide.md @@ -13,7 +13,7 @@ ROS 提供了一些实用的命令行工具,可以用于获取不同节点的 另请参考: - +http://wiki.ros.org/ROS/CommandLineTools ## ROS2使用 @@ -53,4 +53,5 @@ Commands: ## 注意事项 -- 新打开终端需要执行“source /opt/ros/foxy/local_setup.bash”或“source /opt/ros/noetic/setup.bash”命令。 +* 新打开终端需要执行“source /opt/ros/foxy/local_setup.bash”或“source /opt/ros/noetic/setup.bash”命令。 +