Skip to content
This repository was archived by the owner on Nov 8, 2019. It is now read-only.

Commit 25485f6

Browse files
authored
Merge pull request #28 from AcutronicRobotics/readme
Update readme
2 parents 0b4ba0b + dafd50d commit 25485f6

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

INSTALL.md

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Installation
2-
For the complete MARA experiments installation, please refer first to the **ROS2learn** installation instructions: [github/acutronicrobotics/ros2learn/Install](https://github.com/acutronicrobotics/ros2learn/blob/crystal/Install.md).
2+
3+
For the complete MARA experiments installation, please refer first to the **ROS2learn** installation instructions: [github/acutronicrobotics/ros2learn/Install](https://github.com/AcutronicRobotics/ros2learn/blob/crystal/Install.md).
34

45
## Table of Contents
56
- [ROS 2.0](#ros-20)
@@ -18,26 +19,17 @@ For the complete MARA experiments installation, please refer first to the **ROS2
1819
- Ubuntu 18: Install ROS 2 Desktop following the official instructions, binaries recommended. [Instructions](https://index.ros.org/doc/ros2/Installation/Linux-Install-Debians/).
1920

2021
## Dependent tools
21-
**Note**: We recommend installing **Gazebo 9.0.0** via **ROS Crystal Debian packages** and removing previous gazebo installations to avoid undesired conflicts, e.g. `apt-get remove *gazebo*`. You can also use different versions of the simulator such as Gazebo 10, but you must skip the installation of `ros-crystal-gazebo*` packages and add [gazebo_ros_pkgs](https://github.com/ros-simulation/gazebo_ros_pkgs/tree/crystal) to the `ros2_mara_ws` we are going to build in the [Create a ROS workspace](#create-a-ros-workspace) section.
22+
**Note**: We recommend installing **Gazebo 9.9.0** via **ROS Crystal Debian packages** and removing previous gazebo installations to avoid undesired conflicts, e.g. `apt-get remove *gazebo*`. You can also use different versions of the simulator such as Gazebo 10, but you must skip the installation of `ros-crystal-gazebo*` packages.
2223

2324
```sh
2425
# ROS 2 extra packages
2526
sudo apt update && sudo apt install -y \
26-
ros-crystal-action-msgs \
27-
ros-crystal-message-filters \
28-
ros-crystal-yaml-cpp-vendor \
29-
ros-crystal-urdf \
30-
ros-crystal-rttest \
31-
ros-crystal-tf2 \
32-
ros-crystal-tf2-geometry-msgs \
33-
ros-crystal-rclcpp-action \
3427
ros-crystal-cv-bridge \
3528
ros-crystal-control-msgs \
3629
ros-crystal-image-transport \
3730
ros-crystal-gazebo-dev \
3831
ros-crystal-gazebo-msgs \
3932
ros-crystal-gazebo-plugins \
40-
ros-crystal-gazebo-ros \
4133
ros-crystal-gazebo-ros-pkgs
4234

4335
sudo apt update && sudo apt install -y \
@@ -83,7 +75,7 @@ vcs import src < additional-repos.repos
8375
# Avoid compiling erroneus package
8476
touch ~/ros2_mara_ws/src/orocos_kinematics_dynamics/orocos_kinematics_dynamics/COLCON_IGNORE
8577
```
86-
Generate [HRIM](https://github.com/erlerobot/HRIM) dependencies:
78+
Generate [HRIM](https://github.com/AcutronicRobotics/HRIM/tree/Coliza) dependencies:
8779

8880
```sh
8981
cd ~/ros2_mara_ws/src/HRIM
@@ -135,7 +127,7 @@ pip3 install -e .
135127

136128
If not:
137129
```sh
138-
cd ~ && git clone https://github.com/AcutronicRobotics/gym-gazebo2
130+
cd ~ && git clone https://github.com/AcutronicRobotics/gym-gazebo2 -b crystal
139131
cd gym-gazebo2
140132
pip3 install -e .
141133
```

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A whitepaper regarding previous work of gym-gazebo is available at https://arxiv
2121

2222
**gym-gazebo2** is a complex piece of software for roboticists that puts together simulation tools, robot middlewares (ROS 2), machine learning and reinforcement learning techniques. All together to create an environment where to benchmark and develop behaviors with robots. Setting up `gym-gazebo2` appropriately requires relevant familiarity with these tools.
2323

24-
**Docs**. In-depth explanations and actively growing tutorials can be found at https://acutronicrobotics.com/docs. The following is an example of what you can achieve using gym-gazebo2 as a submodule of [ros2learn](https://github.com/AcutronicRobotics/ros2learn) repository. The goal is to reach the green target.
24+
**Docs**. In-depth explanations and actively growing tutorials can be found at https://acutronicrobotics.com/docs. The following is an example of what you can achieve using gym-gazebo2 as a submodule of [ros2learn](https://github.com/AcutronicRobotics/ros2learn/tree/crystal) repository. The goal is to reach the green target.
2525
- 1. Left image shows the start of a training
2626
- 2. To the right we execute an already trained policy.
2727

@@ -49,7 +49,8 @@ A whitepaper regarding previous work of gym-gazebo is available at https://arxiv
4949

5050
## Environments
5151
The code for each environment group is housed in its own subdirectory
52-
[gym_gazebo2/envs](https://github.com/AcutronicRobotics/gym-gazebo2/blob/crystal/gym_gazebo2/envs). Robot specific simulation files should be housed in robot specific ROS2 packages.
52+
53+
[gym_gazebo2/envs](https://github.com/AcutronicRobotics/gym-gazebo2/tree/crystal/gym_gazebo2/envs). Robot specific simulation files should be housed in robot specific ROS2 packages.
5354

5455
### MARA
5556
#### Real Robot
@@ -65,7 +66,7 @@ MARA stands for Modular Articulated Robotic Arm and is a collaborative robotic a
6566
<p>
6667
<img src="imgs/mara_2.gif" align="left" height="125">
6768

68-
MARA also provides an accurate simulated version in Gazebo, which allows to translate behaviors from the simulated environment to the real robot. This is the version we will be training in gym-gazebo2. Please refer to [github.com/acutronicRobotics/MARA](https://github.com/acutronicRobotics/MARA) for additional simulation related content for Gazebo, MoveIt! and rviz2.
69+
MARA also provides an accurate simulated version in Gazebo, which allows to translate behaviors from the simulated environment to the real robot. This is the version we will be training in gym-gazebo2. Please refer to [github.com/acutronicRobotics/MARA](https://github.com/AcutronicRobotics/MARA/tree/crystal) for additional simulation related content for Gazebo, MoveIt! and rviz2.
6970
</p><br>
7071

7172
## Installation

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ python3 gg_random.py
1919
Make sure you have gazebo already installed in your main Ubuntu system and you are in the same path from which you executed the `docker run` command. If you are already running the simulation in the default port, you can access the visual interface the following way opening a new terminal:
2020
```shell
2121
# Do not use -g --gzclient flag
22-
cd ~ && git clone https://github.com/AcutronicRobotics/gym-gazebo2
22+
cd ~ && git clone https://github.com/AcutronicRobotics/gym-gazebo2 -b crystal
2323
cd ~/gym-gazebo2/docker
2424
sh gzclient.sh
2525
```

imgs/mara_2.gif

-102 KB
Loading

0 commit comments

Comments
 (0)