From 0523a5bb400ed4a3d059067cf8cf2002e672df4b Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Fri, 20 Oct 2023 05:58:00 +0200 Subject: [PATCH] Change support from galactic->iron * Galactic reached end of support in May * Iron is the currently active short-term release --- .github/workflows/ci-ros2.yml | 12 ++++++------ docs2/installation.rst | 9 ++++----- docs2/tutorials.rst | 10 +++++----- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci-ros2.yml b/.github/workflows/ci-ros2.yml index 64fe17739..6cebcf182 100644 --- a/.github/workflows/ci-ros2.yml +++ b/.github/workflows/ci-ros2.yml @@ -31,21 +31,21 @@ jobs: strategy: matrix: ros_distribution: - - galactic - humble + - iron # Define the Docker image(s) associated with each ROS distribution. include: - # Galactic Geochelone (May 2021 - November 2022) - - docker_image: ubuntu:focal - ros_distribution: galactic - ros_version: 2 - # Humble Hawksbill (May 2022 - May 2027) - docker_image: ubuntu:jammy ros_distribution: humble ros_version: 2 + # Iron Irwini (May 2023 - Nov 2024) + - docker_image: ubuntu:jammy + ros_distribution: iron + ros_version: 2 + container: image: ${{ matrix.docker_image }} steps: diff --git a/docs2/installation.rst b/docs2/installation.rst index 9dd004f43..9cc72c428 100644 --- a/docs2/installation.rst +++ b/docs2/installation.rst @@ -5,12 +5,11 @@ Installation Crazyswarm2 runs on **Ubuntu Linux** in one of the following configurations: -====== ======== ======== +====== ======== ============ Ubuntu Python ROS 2 ------- -------- -------- -20.04 3.7, 3.8 Galactic -22.04 3.10 Humble -====== ======== ======== +------ -------- ------------ +22.04 3.10 Humble, Iron +====== ======== ============ .. warning:: The `Windows Subsystem for Linux (WSL) `_ is experimentally supported but you'll have to use `usbipd-win `_. diff --git a/docs2/tutorials.rst b/docs2/tutorials.rst index 58070bc67..bb550ce1c 100644 --- a/docs2/tutorials.rst +++ b/docs2/tutorials.rst @@ -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 `_ or `any other position system available `_ 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 galactic): +And if you have not already, install the teleop package for the keyboard. (replace DISTRO with humble or iron): .. code-block:: bash @@ -104,7 +104,7 @@ Assuming you have installed ROS 2 and Crazyswarm2 according to the instructions .. code-block:: bash - sudo apt-get install ros-galactic-slam-toolbox + sudo apt-get install ros-DISTRO-slam-toolbox Go to crazyflie/config/crazyflie.yaml, change the URI of the crazyflie to the one yours has and put the crazyflies you don't use on 'enabled: false': @@ -227,7 +227,7 @@ Now, open up a rviv2 window in a seperate terminal with : .. code-block:: bash - source /opt/ros/galactic/setup.bash + source /opt/ros/DISTRO/setup.bash rviz2 Add the following displays and panels to RVIZ: @@ -249,7 +249,7 @@ While still connected to the crazyflie with the server, open another terminal an .. code-block:: bash - source /opt/ros/galactic/setup.bash + source /opt/ros/DISTRO/setup.bash ros2 run teleop_twist_keyboard teleop_twist_keyboard and make the crazyflie take off with the 't' key on your keyboard. Now fly around the room to make a map of it. @@ -289,7 +289,7 @@ Next, install the Navigation2 Bringup package: .. code-block:: bash - sudo apt-get install ros-galactic-nav2-bringup + sudo apt-get install ros-DISTRO-nav2-bringup Looking at the Launch file ~~~~~~~~~~~~~~~~~~~~~~~~~~