Skip to content

Commit

Permalink
Merge pull request #50 from ETHZ-RobotX/feature/update-docs
Browse files Browse the repository at this point in the history
update docs, tested on smb-dev
  • Loading branch information
Huoleit authored Jun 26, 2024
2 parents f1a055e + cfa680d commit 7c410f2
Show file tree
Hide file tree
Showing 29 changed files with 65 additions and 6 deletions.
Binary file modified docs/images/CCSegmentIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/E-Stop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/JoyStick.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/NodeManager.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/NodeManagerHost.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/NodeManagerROSParams.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/NodeManagerSMB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/RCTransmitter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/artifact_gazebo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/docker-desktop-host-networking.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/docker_setup_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/docker_setup_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/docker_setup_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/documentation_local_viz_example.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/far planner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/gazebo_insert.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/gazebo_prius.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/gazebo_viz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/goalpointplugin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/local planner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/pcd_color_viz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions docs/info/robot-hardware.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ The SMB consists of two parts: Base and payload.

## 🚜 Base

TODO: talk about the drive system and components of the base
The base consists of a motor controller, power management systems, and safety systems. It comes with a separate battery and can be turned off even when the payload is turned on.

## 📦 Payload

TODO: talk about the sensors and components in the payload

The payload for the SuperMegaBot incorporates sensors, an onboard computer, networking utilities, and a power system. It was developed with the goal to allow quick adaptations for various applications.

With its grooved top plate, an extra sensor or even a manipulator can easily be attached to the payload.
Expand Down
20 changes: 20 additions & 0 deletions docs/installation/rss-workspace.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,26 @@ For other Linux distros, the steps should be similar to Ubuntu and work for both
### Git
Make sure you have installed Git on your system. ([Instructions](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git))

### Docker
Make sure to install the latest [Docker](https://docs.docker.com/get-docker/).

#### Configure Docker Desktop (Windows/Mac)

Turn on the Network Host mode in the experiemental features section in Docker Desktop settings.

<p align="center">
<img style="left;" src="{{ 'images/docker-desktop-host-networking.png' | absolute_url }}" width="80%" title="Docker Desktop Host Networking Option">
</p>

#### Configure Resource Allocation (Optional)

If you encounter any performance issues, you can adjust the resource allocation settings as below.

<p align="center">
<img style="left;" src="{{ 'images/docker-desktop-resource-allocation.png' | absolute_url }}" width="80%" title="Docker Desktop Resource Allocation">
</p>


### VSCode + Dev Containers Extension
- Ensure you have a working VSCode setup and that it is up to date to avoid any issues.
- Install the [Remote - Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) in VSCode.
Expand Down
7 changes: 5 additions & 2 deletions docs/physical-robot/setting-up/connect-to-robot.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,11 @@ ssh <user>@10.0.x.5

#! Terminal becomes terminal of SSH!

# To connect the SMB to Internet
nmcli connection up
# To view connections available, this shows the list of connections available to join
nmcli connection show

# To connect the SMB to Internet (you can specify the connections available from above command, e.g: sudo nmcli connection up mavt-asl-iot)
sudo nmcli connection up
```

**You should connect to the SMB with your given username. The Username is your team number**.
Expand Down
18 changes: 18 additions & 0 deletions docs/physical-robot/tasks/object-detection.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,22 @@ To launch the detection pipeline locally, run:
roslaunch object_detection object_detection.launch object_detection_classes="[0,1,2,10]"
```

To view the bounding boxes and get more information about the detections use the following two commands:

```bash
rosrun rqt_image_view rqt_image_view
```

Then select the following topic to see the bounding boxes in the image:

```
/object_detector/detections_in_image
```

To get more information like position, classification, etc. subscribe to or echo the following topic:

```bash
rostopic echo /object_detector/detection_info
```

For more information, please check out the [Artefact Detection Tutorial](../../rss/preparations/artefact_detection_tutorial_preparations.md).
2 changes: 1 addition & 1 deletion docs/physical-robot/tasks/opc.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ Once the core software (`smb.launch`) is started on the robot, you have several

1. Control the robot using the RC transmitter. The signals from the RC transmitter are read by the onboard computer and sent to the motor controller.
2. Use a Joystick to generate control signals (twist messages). In order to control the SMB with the joystick, you should keep pressing the L1 button while driving and use the left stick to control the robot.
3. Run the autonomous software stack as outlined in the following section.
3. Run the autonomous software stack as outlined in the following section.
3 changes: 3 additions & 0 deletions docs/simulation/tasks/mission-planning.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ After having recorded all your missions, stop the node with `Ctrl-C`. All your r

The `mission_planner.py` executes the previously defined mission plan.

Remember to start the `graph_msf` and `smb_gazebo` using the steps in [navigation](../tasks/navigation.md).
{: .note}

Start the simulation and the path planner.
```bash
# launch the FAR planner
Expand Down
17 changes: 17 additions & 0 deletions docs/simulation/tasks/object-detection.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,23 @@ To launch the detection pipeline locally, run:
# In the host PC
roslaunch object_detection object_detection.launch gpu:=off model:=yolov5l6
```
To view the bounding boxes and get more information about the detections use the following two commands:

```bash
rosrun rqt_image_view rqt_image_view
```

Then select the following topic to see the bounding boxes in the image:

```
/object_detector/detections_in_image
```

To get more information like position, classification, etc. subscribe to or echo the following topic:

```bash
rostopic echo /object_detector/detection_info
```

For more information, please check out the [Artefact Detection Tutorial](../../rss/preparations/artefact_detection_tutorial_preparations.md).

Expand Down

0 comments on commit 7c410f2

Please sign in to comment.