Skip to content

Commit 40fa5be

Browse files
authored
New tutorial 2025 (#2408)
* updated intro page * added publisher info * add subscriber info * intro done * wrap up tutorial changes * update conf.py * remove unnecessary crap
1 parent f031200 commit 40fa5be

7 files changed

Lines changed: 476 additions & 95 deletions

File tree

477 KB
Loading

docs/source/_static/intro-rqt.png

23.7 KB
Loading

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# -- Project information -----------------------------------------------------
88

99
project = "RJ RC Software"
10-
copyright = "2022, RoboJackets"
10+
copyright = "2025, RoboJackets"
1111
author = "RoboJackets RoboCup Project"
1212

1313
# The short X.Y version
@@ -246,4 +246,4 @@ def setup(app: sphinx.application.Sphinx) -> None:
246246
"""Adds generate_doxygen_xml hook to generate the doxygen XML for breathe.
247247
:param app: Application object representing the Sphinx process
248248
"""
249-
app.connect("builder-inited", generate_doxygen_xml)
249+
app.connect("builder-inited", generate_doxygen_xml)

docs/source/index.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ Software team. We are a primarily undergraduate robotics team from Georgia Tech
1111
who compete in Division B of the RoboCup Small Size League. See the `RoboCup SSL
1212
website <https://ssl.robocup.org/about/>`_ for more details on the competition.
1313

14-
.. note::
15-
16-
This project is under active development.
17-
1814
This page is hosted for free by ReadTheDocs thanks to `ethical ads,
1915
<https://docs.readthedocs.io/en/stable/advertising/ethical-advertising.html>`_
2016
which are non-obtrusive and don't save or track user data. If you have a spare
@@ -27,8 +23,9 @@ adblocker to support their free documentation hosting.
2723
:caption: Contents
2824

2925
self
30-
tutorial.rst
3126
installation.rst
27+
introduction.rst
28+
tutorial.rst
3229
our_stack.rst
3330
troubleshooting.rst
3431
contributing.rst

docs/source/installation.rst

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Installation
22
======================================
33

4-
.. note::
5-
If you are completely unfamiliar with the command line or basic git
6-
usage, see the Tutorial page before proceeding.
7-
84
There are two main ways to install our software. The first is use a native
95
or virtual machine running Ubuntu 22.04, and the second is to use Docker.
10-
The Docker method is recommended for Mac users.
6+
7+
.. Note::
8+
If you elect to use Docker, you need to ensure your system has sufficient
9+
memory as Docker is not the greatest with RAM management. In particular, it's
10+
recommended that you have at least 16 GB of RAM allocated.
1111

1212

1313
Native/Virtual Machine Setup
@@ -20,7 +20,7 @@ with Ubuntu 22.04 will work. The steps to set this up can be found `here
2020
.com/tutorials/install-ubuntu-on-wsl2-on-windows-10#1-overview>`_. For Mac
2121
users, Ubuntu 22.04 can be emulated in a virtual machine. For M1 Macs
2222
specifically, using the arm64 version of Ubuntu 22.04 with the application UTM
23-
has worked in the past.
23+
has worked in the past. If you need the Ubuntu 22.04 image, see the SW lead.
2424

2525
First, clone the repository from GitHub:
2626

@@ -78,6 +78,11 @@ Sadly, this program has no output, so when you run it nothing will appear to
7878
happen. However, it will become obvious after you start our UI whether or not
7979
you've correctly started the simulator or not.
8080

81+
.. _building_the_stack:
82+
83+
Building the Stack
84+
------------------
85+
8186
In another terminal, change directories back into ``robocup-software``.
8287
Make sure you're on the most updated version of ``ros2`` branch. This is
8388
where the latest working version of our codebase exists. (See Contributing page for
@@ -97,12 +102,19 @@ Then, source the ROS setup file. This allows your shell to use ROS commands.
97102
If you're on zsh, source ``setup.zsh`` instead. (If you don't know what
98103
zsh is, you're not on zsh.)
99104

100-
Then build the codebase. This compiles all of our code. On a VM, this step will
101-
take upwards of 15 minutes.
105+
Then build the codebase. If you are running this on your own dedicated Linux
106+
machine, you are welcome to simply run:
102107

103108
.. code-block:: bash
104109
105-
make perf
110+
colcon build
111+
112+
However, if you are on a VM/Docker, then you need to restrict the amount of resources
113+
that ``colcon`` takes up, by running:
114+
115+
.. code-block:: bash
116+
117+
colcon build --parallel-workers 1 --executor sequential
106118
107119
After building, we need to source our custom ROS setup. Run the following in
108120
the ``robocup-software`` directory:
@@ -131,6 +143,7 @@ If everything is working properly, you should see the following window show up.
131143

132144
.. image:: ./_static/soccer.png
133145

146+
.. _docker-setup:
134147

135148
Docker Setup
136149
----------------------------
@@ -140,13 +153,17 @@ image that runs Ubuntu 22.04. The Docker image also has our tech stack and all t
140153
pre-installed with a desktop GUI. The Docker setup should work on any platform
141154
(Windows, Mac, ARM, x86, etc.).
142155

143-
Before you start, make sure you have Docker installed on your computer. The steps for doing
144-
so can be found `here <https://docs.docker.com/engine/install/>`_.
156+
The easiest way to get started with Docker is to just download Docker desktop.
157+
Note that when using Docker desktop, you will need to have the app open in the background
158+
to run your containers. For installation details, see the `Docker Desktop Manual
159+
<https://docs.docker.com/desktop/>`_.
145160

146161
Once you have Docker installed, please follow the steps for installing and using our RoboCup
147162
image at `DockerHub
148163
<https://hub.docker.com/r/robojackets/robocup-software-dev>`_.
149164

165+
Once you're done, follow the instructions on :ref:`building the stack <building_the_stack>`.
166+
150167

151168
Shortcuts
152169
---------
@@ -190,17 +207,4 @@ machine, though, you can build again more quickly with:
190207
191208
The ``source.bash`` line is necessary to source the file in ``install/``, which
192209
is refreshed on each build. (**Note:** this does not build any CMake-related
193-
files, so if you're editing those, use ``make perf`` as usual.)
194-
195-
There are a few different ways to build our code. See the makefile for more
196-
details, but in short:
197-
198-
.. code-block:: bash
199-
200-
make all # builds with full debugging symbols
201-
make debug # alias for make all
202-
make all-release # builds with 0 debugging symbols
203-
make perf # builds with some debugging symbols; preferred method
204-
205-
TODO(Kevin): add description of running on field comp (move that md file over
206-
too)
210+
files, so if you're editing those, use ``colcon build`` as usual.)

0 commit comments

Comments
 (0)