Skip to content

Commit

Permalink
update docs and cleanup CI
Browse files Browse the repository at this point in the history
  • Loading branch information
whoenig committed Jul 4, 2024
1 parent 571fd7f commit 3d43e7e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/ci-ros2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,17 @@ jobs:
- name: install dependencies
run: |
sudo apt update
sudo apt install -y libboost-program-options-dev libusb-1.0-0-dev python3-virtualenv
sudo apt install -y libboost-program-options-dev libusb-1.0-0-dev
- name: install pip dependencies
# TODO: would be better to follow https://answers.ros.org/question/370666/how-to-declare-an-external-python-dependency-in-ros2/
# but this requires some upstream changes

# colcon still does not seem to properly support venv, so we use a workaround to install
# a python package globally by disabling the externally managed flag that is default on Ubuntu 24.04
run: |
sudo rm -f /usr/lib/python3.12/EXTERNALLY-MANAGED
pip install rowan
# run: |
# virtualenv -p python3 ./venv
# source ./venv/bin/activate
# touch ./venv/COLCON_IGNORE
# python3 -m pip install rowan
# echo PATH=$PATH >> $GITHUB_ENV
- uses: actions/checkout@v2
- name: build and test ROS 2
Expand Down
6 changes: 4 additions & 2 deletions docs2/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Crazyswarm2 runs on **Ubuntu Linux** in one of the following configurations:
Ubuntu Python ROS 2
------ -------- ------------
22.04 3.10 Humble, Iron
------ -------- ------------
24.04 3.12 Jazzy
====== ======== ============

.. warning::
Expand All @@ -21,7 +23,7 @@ Ubuntu Python ROS 2
First Installation
------------------

1. If needed, install ROS 2 using the instructions at https://docs.ros.org/en/galactic/Installation.html or https://docs.ros.org/en/humble/Installation.html.
1. If needed, install ROS 2 using the instructions at https://docs.ros.org/en/jazzy/Installation.html.

2. Install dependencies

Expand All @@ -30,7 +32,7 @@ First Installation
sudo apt install libboost-program-options-dev libusb-1.0-0-dev
pip3 install rowan nicegui
Then install the motion capture ROS 2 package (replace DISTRO with your version of ROS, namely humble or iron):
Then install the motion capture ROS 2 package (replace DISTRO with your version of ROS, namely humble, iron, or jazzy):

.. code-block:: bash
Expand Down
2 changes: 1 addition & 1 deletion docs2/tutorials.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ We have an example of the telop_twist_keyboard package working together with the
First, make sure that the crazyflies.yaml has the right URI and if you are using the `Flow deck <https://www.bitcraze.io/products/flow-deck-v2/>`_ or `any other position system available <https://www.bitcraze.io/documentation/system/positioning//>`_ to the crazyflie.
set the controller to 1 (PID).

And if you have not already, install the teleop package for the keyboard. (replace DISTRO with humble or iron):
And if you have not already, install the teleop package for the keyboard. (replace DISTRO with humble, iron, or jazzy):

.. code-block:: bash
Expand Down

0 comments on commit 3d43e7e

Please sign in to comment.