Skip to content

Commit 0bcf5ea

Browse files
committed
Updated instructions to include git submodules
1 parent 132cb81 commit 0bcf5ea

File tree

5 files changed

+12
-74
lines changed

5 files changed

+12
-74
lines changed

Documentation/1_set_up_the_scene.md

+3-10
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,13 @@ In this first part of the tutorial, we will start by downloading and installing
1414

1515
### <a name="reqs">Requirements</a>
1616

17-
To follow this tutorial you need to **clone** this repository even if you want to create your Unity project from scratch.
17+
To follow this tutorial you need to **clone** this repository even if you want to create your Unity project from scratch.
1818

19-
20-
> Note For Windows users: You need to have a software enabling you to run bash files. One option is to download [GIT](https://git-scm.com/downloads). During installation of GIT, add GIT Bash to windows context menu by selecting its option. After installation, right click in your folder, and select [GIT Bash Here](Images/0_GIT_installed.png).
19+
>Note: This project uses Git Submodules to grab the ROS package dependencies for the `universal_robot`, `moveit_msgs`, `ros_tcp_endpoint`, and the `robotiq` folders. If you cloned the project and forgot to use `--recurse-submodules`, or if any submodule in this directory doesn't have content (e.g. moveit_msgs or ros_tcp_endpoint), you can run the following command to grab the Git submodules.
2120
2221
1. Open a terminal and put yourself where you want to host the repository.
2322
```bash
24-
git clone https://github.com/Unity-Technologies/Unity-Robotics-Hub.git
25-
```
26-
27-
Then we need to be in the `Unity-Robotics-Hub/tutorials/object_pose_estimation` folder and generate the contents of the `universal_robot`, `moveit_msgs`, `ros_tcp_endpoint`, and the `robotiq` folders.
28-
```bash
29-
cd Unity-Robotics-Hub/tutorials/object_pose_estimation
30-
./submodule.sh
23+
git clone --recurse-submodules https://github.com/Unity-Technologies/Object-Pose-Estimation.git
3124
```
3225

3326
2. [Install Unity `2020.2.*`.](install_unity.md)

Documentation/4_pick_and_place.md

+6-14
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,13 @@ In this part, we will use our trained deep learning model to predict the pose of
2525
### <a name="setup">Set up</a>
2626
If you have correctly followed parts 1 and 2, whether or not you choose to use the Unity project given by us or start it from scratch, you should have cloned the repository.
2727

28+
>Note: This project uses Git Submodules to grab the ROS package dependencies for the [`universal_robot`](https://github.com/ros-industrial/universal_robot), [`moveit_msgs`](https://github.com/ros-planning/moveit_msgs), [`ros_tcp_endpoint`](https://github.com/Unity-Technologies/ROS-TCP-Endpoint), and the [`robotiq`](https://github.com/ros-industrial/robotiq) folders. If you cloned the project and forgot to use `--recurse-submodules`, or if any submodule in this directory doesn't have content (e.g. moveit_msgs or ros_tcp_endpoint), you can run the following command to grab the Git submodules.
29+
> ```bash
30+
> cd /PATH/TO/Object-Pose-Estimation &&
31+
> git submodule update --init --recursive
32+
> ```
2833
29-
>Note: If you cloned the project and forgot to use `--recurse-submodules`, or if any submodule in this directory doesn't have content (e.g. moveit_msgs or ros_tcp_endpoint), you can run the following command to grab the Git submodules. But before you need to be in the `object_pose_estimation` folder.
30-
>```bash
31-
>cd /PATH/TO/Unity-Robotics-Hub/tutorials/object_pose_estimation &&
32-
>git submodule update --init --recursive
33-
>```
34-
35-
Three package dependencies for this project, [Universal Robot](https://github.com/ros-industrial/universal_robot) for the UR3 arm configurations, [Robotiq](https://github.com/ros-industrial/robotiq) for the gripper, and [MoveIt Msgs](https://github.com/ros-planning/moveit_msgs) are large repositories. A bash script has been provided to run a sparse clone to only copy the files required for this tutorial, as well as the [ROS TCP Endpoint](https://github.com/Unity-Technologies/ROS-TCP-Endpoint/).
36-
37-
1. Open a terminal and go to the directory of the `object_pose_estimation` folder. Then run:
38-
```bash
39-
./submodule.sh
40-
```
41-
42-
In your `object_pose_estimation` folder, you should have a `ROS` folder. Inside that folder you should have a `src` folder and inside that one 5 folders: `moveit_msgs`, `robotiq`, `ros_tcp_endpoint`, `universal_robot` and `ur3_moveit`.
34+
In your ROS/src folder, you should now have five subdirectories: `moveit_msgs`, `robotiq`, `ros_tcp_endpoint`, `universal_robot` and `ur3_moveit`.
4335
4436
### <a name="step-2">Adding the Pose Estimation Model</a>
4537

Documentation/quick_demo_full.md

+2-14
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,12 @@ If you just want to run the completed project, this section can help you get up
1717

1818
You will first need to **clone** this repository.
1919

20-
>Note For Windows Users:
21-
You need to have a software enabling you to run bash files. One option is to download [GIT](https://git-scm.com/downloads). During installation of GIT, add GIT Bash to windows context menu by selecting its option. After installation right click in your folder select [GIT Bash Here](Images/0_GIT_installed.png).
22-
2320
1. Open a terminal and put yourself where you want to host the repository.
24-
25-
```bash
26-
git clone https://github.com/Unity-Technologies/Unity-Robotics-Hub.git
27-
```
28-
29-
Three package dependencies for this project, [Universal Robot](https://github.com/ros-industrial/universal_robot) for the UR3 arm configurations, [Robotiq](https://github.com/ros-industrial/robotiq) for the gripper, and [MoveIt Msgs](https://github.com/ros-planning/moveit_msgs) are large repositories. A bash script has been provided to run a sparse clone to only copy the files required for this tutorial, as well as the [ROS TCP Endpoint](https://github.com/Unity-Technologies/ROS-TCP-Endpoint/).
30-
31-
2. Still in the same terminal, run:
3221
```bash
33-
cd Unity-Robotics-Hub/tutorials/object_pose_estimation
34-
./submodule.sh
22+
git clone --recurse-submodules https://github.com/Unity-Technologies/Object-Pose-Estimation.git
3523
```
3624

37-
3. [Install Unity `2020.2.*`.](install_unity.md)
25+
2. [Install Unity `2020.2.*`.](install_unity.md)
3826

3927
## <a name='setup'>Setup</a>
4028

Documentation/troubleshooting.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</p>
6161

6262
### Docker, ROS-TCP Connection
63-
- Building the Docker image may throw an `Could not find a package configuration file provided by...` exception if one or more of the directories in ROS/ appears empty. Ensure you have run the `submodule.sh` script to populate the ROS packages.
63+
- Building the Docker image may throw an `Could not find a package configuration file provided by...` exception if one or more of the directories in ROS/ appears empty. This project uses Git Submodules to grab the ROS package dependencies. If you cloned the project and forgot to use `--recurse-submodules`, or if any submodule in this directory doesn't have content, you can run the `git submodule update --init --recursive` to grab the Git submodules.
6464
- `...failed because unknown error handler name 'rosmsg'` This is due to a bug in an outdated package version. Try running `sudo apt-get update && sudo apt-get upgrade` to upgrade packages.
6565
- `Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?` The system-independent `docker info` command can verify whether or not Docker is running. This command will throw a `Server: ERROR` if the Docker daemon is not currently running, and will print the appropriate [system-wide information](https://docs.docker.com/engine/reference/commandline/info/) otherwise.
6666
- Occasionally, not having enough memory allocated to the Docker container can cause the `server_endpoint` to fail. This may cause unexpected behavior during the pick-and-place task, such as constantly predicting the same pose. If this occurs, check your Docker settings. You may need to increase the `Memory` to 8GB.

submodule.sh

-35
This file was deleted.

0 commit comments

Comments
 (0)