Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add info about ROS 2 distro (backport #345) #349

Merged
merged 2 commits into from
Aug 18, 2023
Merged

Add info about ROS 2 distro (backport #345) #349

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a86697f
Add info about ROS 2 distro (#345)
christophfroehlich Aug 17, 2023
7b11e67
Update index.rst
christophfroehlich Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Licence](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

This repository provides examples for functionalities and capabilities of `ros2_control` framework.
It consists of simple implementations that demonstrate different concepts.
It consists of simple implementations that demonstrate different concepts. Choose the right branch of this repository matching you ROS 2 distribution as well as the full documentation on [control.ros.org](https://control.ros.org), see [this table](#build-status).

If you want to have rather step by step manual how to do things with `ros2_control` checkout the [ros-control/roscon2022_workshop](https://github.com/ros-controls/roscon2022_workshop) repository.

Expand Down
15 changes: 11 additions & 4 deletions doc/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,19 @@ Example 12: "Controller chaining"
Installation
=====================

You can install the demos manually or use the provided docker file.
You can install the demos locally or use the provided docker file.

Manual Install
---------------

<<<<<<< HEAD
First, you have to install `ROS 2 on your computer <https://docs.ros.org/en/humble/Installation.html>`__.
=======
Local installation
------------------

If you have ROS 2 installed already, choose the right version of this documentation and branch of the ``ros2_control_demos`` repository matching you ROS 2 distribution, see `this table <https://github.com/ros-controls/ros2_control_demos#build-status>`__.

Otherwise, install `ROS 2 {DISTRO} on your computer <https://docs.ros.org/en/rolling/Installation.html>`__.
>>>>>>> b8dd69e (Add info about ROS 2 distro (#345))

.. note::

Expand All @@ -98,7 +105,7 @@ Download the ``ros2_control_demos`` repository and install its dependencies with

mkdir -p ~/ros2_ws/src
cd ~/ros2_ws/src
git clone https://github.com/ros-controls/ros2_control_demos
git clone https://github.com/ros-controls/ros2_control_demos -b {REPOS_FILE_BRANCH}
cd ~/ros2_ws/
rosdep update --rosdistro=$ROS_DISTRO
sudo apt-get update
Expand Down
Loading