Skip to content

Commit

Permalink
enable CI for jazzy (#542)
Browse files Browse the repository at this point in the history
* Support for ROS Jazzy
  • Loading branch information
whoenig committed Jul 7, 2024
1 parent 62c2040 commit 7db011d
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 7 deletions.
12 changes: 11 additions & 1 deletion .github/workflows/ci-ros2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
ros_distribution:
- humble
- iron
- jazzy

# Define the Docker image(s) associated with each ROS distribution.
include:
Expand All @@ -29,6 +30,11 @@ jobs:
ros_distribution: iron
ros_version: 2

# Jazzy Jalisco (May 2024 - May 2029)
- docker_image: ubuntu:noble
ros_distribution: jazzy
ros_version: 2

container:
image: ${{ matrix.docker_image }}
steps:
Expand All @@ -40,12 +46,16 @@ jobs:
- name: install dependencies
run: |
sudo apt update
sudo apt install -y libusb-1.0-0-dev
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
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion crazyflie/deps/crazyflie_tools
Submodule crazyflie_tools updated 1 files
+1 −1 crazyflie_cpp
4 changes: 2 additions & 2 deletions crazyflie_py/crazyflie_py/crazyflie.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


from crazyflie_interfaces.msg import FullState, Position, Status, TrajectoryPolynomialPiece
from crazyflie_interfaces.srv import Arm, GoTo, Land,\
from crazyflie_interfaces.srv import Arm, GoTo, Land, \
NotifySetpointsStop, StartTrajectory, Takeoff, UploadTrajectory
from geometry_msgs.msg import Point
import numpy as np
Expand Down Expand Up @@ -160,7 +160,7 @@ def __init__(self, node, cfname, paramTypeDict):
elif response.values[0].type == ParameterType.PARAMETER_DOUBLE_ARRAY:
self.initialPosition = np.array(response.values[0].double_array_value)
else:
assert(False)
assert False

# extract uri
self.uri = response.values[1].string_value
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 7db011d

Please sign in to comment.