Skip to content

Commit

Permalink
Imported upstream version '0.244.15' of 'upstream'
Browse files Browse the repository at this point in the history
  • Loading branch information
ahcorde committed Jul 3, 2024
1 parent e304924 commit 9a82573
Show file tree
Hide file tree
Showing 42 changed files with 178 additions and 460 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ros2-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
include:
- docker-image: "ubuntu:22.04"
gz-version: "fortress"
ros-distro: "iron"
ros-distro: "humble"
- docker-image: "ubuntu:22.04"
gz-version: "garden"
ros-distro: "iron"
ros-distro: "humble"
- docker-image: "ubuntu:22.04"
gz-version: "harmonic"
ros-distro: "iron"
ros-distro: "humble"
container:
image: ${{ matrix.docker-image }}
steps:
Expand All @@ -35,4 +35,4 @@ jobs:
if: ${{ matrix.gz-version }} == "garden"
with:
repository: ros/sdformat_urdf
ref: iron
ref: humble
27 changes: 20 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ Galactic | Fortress | [galactic](https://github.com/gazebosim/ros_gz/tree/galact
Humble | Fortress | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | https://packages.ros.org
Humble | Garden | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | [gazebo packages](https://gazebosim.org/docs/latest/ros_installation#gazebo-garden-with-ros-2-humble-iron-or-rolling-use-with-caution-)[^1]
Humble | Harmonic | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | [gazebo packages](https://gazebosim.org/docs/harmonic/ros_installation#-gazebo-harmonic-with-ros-2-humble-iron-or-rolling-use-with-caution-)[^1]
Iron | Fortress | [humble](https://github.com/gazebosim/ros_gz/tree/iron) | https://packages.ros.org
Iron | Garden | [humble](https://github.com/gazebosim/ros_gz/tree/iron) | only from source
Iron | Harmonic | [humble](https://github.com/gazebosim/ros_gz/tree/iron) | only from source
Rolling | Edifice | [ros2](https://github.com/gazebosim/ros_gz/tree/ros2) | only from source
Rolling | Fortress | [ros2](https://github.com/gazebosim/ros_gz/tree/ros2) | https://packages.ros.org
Rolling | Garden | [ros2](https://github.com/gazebosim/ros_gz/tree/ros2) | only from source
Expand Down Expand Up @@ -58,11 +55,11 @@ This repository holds packages that provide integration between

## Install

This branch supports ROS Iron. See above for other ROS versions.
This branch supports ROS Humble. See above for other ROS versions.

### Binaries

Iron binaries are available for Fortress.
Humble binaries are available for Fortress.
They are hosted at https://packages.ros.org.

1. Add https://packages.ros.org
Expand All @@ -73,14 +70,14 @@ They are hosted at https://packages.ros.org.

1. Install `ros_gz`

sudo apt install ros-iron-ros-gz
sudo apt install ros-humble-ros-gz

### From source

#### ROS

Be sure you've installed
[ROS Iron](https://docs.ros.org/en/iron/Installation.html)
[ROS Humble](https://docs.ros.org/en/humble/Installation.html)
(at least ROS-Base). More ROS dependencies will be installed below.

#### Gazebo
Expand Down Expand Up @@ -133,6 +130,22 @@ The following steps are for Linux and OSX.
> try building with `colcon build --parallel-workers=1 --executor sequential`. You might also have to set `export MAKEFLAGS="-j 1"` before running `colcon build` to limit
> the number of processors used to build a single package.
If `colcon build` fails with [this issue](https://github.com/gazebosim/ros_gz/issues/401)
```
CMake Error at CMakeLists.txt:81 (find_package):
By not providing "Findactuator_msgs.cmake" in CMAKE_MODULE_PATH this
project has asked CMake to find a package configuration file provided by
"actuator_msgs", but CMake did not find one.
```
```bash
cd src
git clone [email protected]:rudislabs/actuator_msgs.git
cd ../
colcon build
```
## ROSCon 2022
[![](img/video_img.png)](https://vimeo.com/showcase/9954564/video/767127300)
Expand Down
26 changes: 8 additions & 18 deletions ros_gz/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,17 @@
Changelog for package ros_gz
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.254.2 (2024-07-03)
--------------------
* 0.244.14
* Changelog
* 0.244.13
* Changelog
* 0.244.12
* Changelog
* Contributors: Addisu Z. Taddese, Alejandro Hernández Cordero

0.254.1 (2024-04-08)
--------------------
0.244.15(2024-07-03)
---------------------

0.254.0 (2024-01-08)
--------------------
0.244.14 (2024-04-08)
---------------------

0.247.0 (2023-11-02)
--------------------
0.244.13 (2024-01-23)
---------------------

0.245.0 (2023-05-23)
--------------------
0.244.12 (2023-12-13)
---------------------

0.244.11 (2023-05-23)
---------------------
Expand Down
2 changes: 1 addition & 1 deletion ros_gz/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- TODO: Make this a metapackage, see
https://github.com/ros2/ros2/issues/408 -->
<name>ros_gz</name>
<version>0.254.2</version>
<version>0.244.15</version>
<description>Meta-package containing interfaces for using ROS 2 with <a href="https://gazebosim.org">Gazebo</a> simulation.</description>
<maintainer email="[email protected]">Louise Poubel</maintainer>
<license>Apache 2.0</license>
Expand Down
100 changes: 27 additions & 73 deletions ros_gz_bridge/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,94 +2,48 @@
Changelog for package ros_gz_bridge
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.254.2 (2024-07-03)
--------------------
* Add support for gz.msgs.EntityWrench (base branch: ros2) (backport `#573 <https://github.com/gazebosim/ros_gz//issues/573>`_) (`#576 <https://github.com/gazebosim/ros_gz//issues/576>`_)
* Add support for gz.msgs.EntityWrench (base branch: ros2) (`#573 <https://github.com/gazebosim/ros_gz//issues/573>`_)
(cherry picked from commit f9afb69d1163633dd978024bb7271a28cf7b551a)
# Conflicts:
# ros_gz_bridge/README.md
# ros_gz_bridge/test/utils/gz_test_msg.hpp
* Fixed merge
---------
Co-authored-by: Victor T. Noppeney <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
* Merge pull request `#564 <https://github.com/gazebosim/ros_gz//issues/564>`_ from azeey/humble_to_iron
Humble ➡️ Iron
* Merge humble -> iron
* populate imu covariances when converting (`#375 <https://github.com/gazebosim/ros_gz//issues/375>`_) (`#540 <https://github.com/gazebosim/ros_gz//issues/540>`_)
Co-authored-by: El Jawad Alaa <[email protected]>
0.244.15(2024-07-03)
---------------------
* [backport Humble] Create bridge for GPSFix msg (`#316 <https://github.com/gazebosim/ros_gz//issues/316>`_) (`#538 <https://github.com/gazebosim/ros_gz//issues/538>`_)
Co-authored-by: Rousseau Vincent <[email protected]>
* [backport Iron] Create bridge for GPSFix msg (`#316 <https://github.com/gazebosim/ros_gz//issues/316>`_) (`#537 <https://github.com/gazebosim/ros_gz//issues/537>`_)
Co-authored-by: Rousseau Vincent <[email protected]>
* 0.244.14
* Changelog
* Added conversion for Detection3D and Detection3DArray (`#523 <https://github.com/gazebosim/ros_gz//issues/523>`_) (`#526 <https://github.com/gazebosim/ros_gz//issues/526>`_)
* Contributors: Alejandro Hernández Cordero

0.244.14 (2024-04-08)
---------------------
* Added conversion for Detection3D and Detection3DArray (`#523 <https://github.com/gazebosim/ros_gz/issues/523>`_) (`#526 <https://github.com/gazebosim/ros_gz/issues/526>`_)
Co-authored-by: wittenator <[email protected]>
* Add ROS namespaces to GZ topics (`#512 <https://github.com/gazebosim/ros_gz//issues/512>`_)
* Add ROS namespaces to GZ topics (`#512 <https://github.com/gazebosim/ros_gz/issues/512>`_)
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
* Correctly export ros_gz_bridge for downstream targets (`#503 <https://github.com/gazebosim/ros_gz//issues/503>`_) (`#506 <https://github.com/gazebosim/ros_gz//issues/506>`_)
* Add a virtual destructor to suppress compiler warning (`#502 <https://github.com/gazebosim/ros_gz//issues/502>`_) (`#505 <https://github.com/gazebosim/ros_gz//issues/505>`_)
* Correctly export ros_gz_bridge for downstream targets (`#503 <https://github.com/gazebosim/ros_gz/issues/503>`_) (`#506 <https://github.com/gazebosim/ros_gz/issues/506>`_)
* Add a virtual destructor to suppress compiler warning (`#502 <https://github.com/gazebosim/ros_gz/issues/502>`_) (`#505 <https://github.com/gazebosim/ros_gz/issues/505>`_)
Co-authored-by: Michael Carroll <[email protected]>
* Add option to change material color from ROS. (`#486 <https://github.com/gazebosim/ros_gz//issues/486>`_)
* Add option to change material color from ROS. (`#486 <https://github.com/gazebosim/ros_gz/issues/486>`_)
* Message and bridge for MaterialColor.
This allows bridging MaterialColor from ROS to GZ and is
important for allowing simulation users to create status lights.
---------
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
* 0.244.13
* Changelog
* backport pr 374 (`#489 <https://github.com/gazebosim/ros_gz//issues/489>`_)
* populate imu covariances when converting (`#488 <https://github.com/gazebosim/ros_gz//issues/488>`_)
* 0.244.12
* Changelog
* Backport: Add conversion for geometry_msgs/msg/TwistStamped <-> gz.msgs.Twist (`#468 <https://github.com/gazebosim/ros_gz//issues/468>`_) (`#470 <https://github.com/gazebosim/ros_gz//issues/470>`_)
* Contributors: Addisu Z. Taddese, Alejandro Hernández Cordero, Benjamin Perseghetti, El Jawad Alaa, Krzysztof Wojciechowski, Michael Carroll, mergify[bot], wittenator

0.254.1 (2024-04-08)
--------------------
* Added conversion for Detection3D and Detection3DArray (`#523 <https://github.com/gazebosim/ros_gz/issues/523>`_)
* Add option to change material color from ROS. (`#520 <https://github.com/gazebosim/ros_gz/issues/520>`_)
Forward port of `#486 <https://github.com/gazebosim/ros_gz/issues/486>`_
* Message and bridge for MaterialColor.
This allows bridging MaterialColor from ROS to GZ and is
important for allowing simulation users to create status lights.
* [forward iron] Add ROS namespaces to GZ topics (`#516 <https://github.com/gazebosim/ros_gz/issues/516>`_)
Co-authored-by: Krzysztof Wojciechowski <[email protected]>
* Correctly export ros_gz_bridge for downstream targets (`#503 <https://github.com/gazebosim/ros_gz/issues/503>`_) (`#507 <https://github.com/gazebosim/ros_gz/issues/507>`_)
* Add a virtual destructor to suppress compiler warning (`#502 <https://github.com/gazebosim/ros_gz/issues/502>`_) (`#504 <https://github.com/gazebosim/ros_gz/issues/504>`_)
Co-authored-by: Michael Carroll <[email protected]>
* Contributors: Alejandro Hernández Cordero, Benjamin Perseghetti, Michael Carroll, wittenator
* Contributors: Alejandro Hernández Cordero, Benjamin Perseghetti, Krzysztof Wojciechowski, Michael Carroll

0.254.0 (2024-01-08)
--------------------
* Backport: Add conversion for geometry_msgs/msg/TwistStamped <-> gz.msgs.Twist (`#468 <https://github.com/gazebosim/ros_gz/issues/468>`_) (`#471 <https://github.com/gazebosim/ros_gz/issues/471>`_)
* Forward Port: Add support for Harmonic/Humble pairing (`#462 <https://github.com/gazebosim/ros_gz/issues/462>`_)
* Added messages for 2D Bounding Boxes to ros_gz_bridge (`#458 <https://github.com/gazebosim/ros_gz/issues/458>`_)
* Contributors: Addisu Z. Taddese, Alejandro Hernández Cordero, Arjun K Haridas, wittenator
0.244.13 (2024-01-23)
---------------------
* backport pr 374 (`#489 <https://github.com/gazebosim/ros_gz/issues/489>`_)
* populate imu covariances when converting (`#488 <https://github.com/gazebosim/ros_gz/issues/488>`_)
* Contributors: El Jawad Alaa

0.247.0 (2023-11-02)
--------------------
* Fix double wait in ros_gz_bridge (`#347 <https://github.com/gazebosim/ros_gz/issues/347>`_) (`#449 <https://github.com/gazebosim/ros_gz/issues/449>`_)
Co-authored-by: ymd-stella <[email protected]>
* [backport iron] SensorNoise msg bridging (`#417 <https://github.com/gazebosim/ros_gz/issues/417>`_) (`#425 <https://github.com/gazebosim/ros_gz/issues/425>`_)
Co-authored-by: Aditya Pande <[email protected]>
* Merge pull request `#420 <https://github.com/gazebosim/ros_gz/issues/420>`_ from gazebosim/ahcorde/iron/backport/411
[backport iron] Update README.md (`#411 <https://github.com/gazebosim/ros_gz/issues/411>`_)
* Merge branch 'iron' into ahcorde/iron/backport/411
* [backport Iron] Added Altimeter msg bridging (`#413 <https://github.com/gazebosim/ros_gz/issues/413>`_) (`#414 <https://github.com/gazebosim/ros_gz/issues/414>`_)
Co-authored-by: Aditya Pande <[email protected]>
* Update README.md (`#411 <https://github.com/gazebosim/ros_gz/issues/411>`_)
0.244.12 (2023-12-13)
---------------------
* Backport: Add conversion for geometry_msgs/msg/TwistStamped <-> gz.msgs.Twist (`#468 <https://github.com/gazebosim/ros_gz/issues/468>`_) (`#470 <https://github.com/gazebosim/ros_gz/issues/470>`_)
* Add support for Harmonic/Humble pairing (`#462 <https://github.com/gazebosim/ros_gz/issues/462>`_)
* Added messages for 2D Bounding Boxes to ros_gz_bridge (`#458 <https://github.com/gazebosim/ros_gz/issues/458>`_)
* Fix double wait in ros_gz_bridge (`#347 <https://github.com/gazebosim/ros_gz/issues/347>`_) (`#450 <https://github.com/gazebosim/ros_gz/issues/450>`_)
* [backport humble] SensorNoise msg bridging (`#417 <https://github.com/gazebosim/ros_gz/issues/417>`_)
* [backport humble] Added Altimeter msg bridging (`#413 <https://github.com/gazebosim/ros_gz/issues/413>`_) (`#414 <https://github.com/gazebosim/ros_gz/issues/414>`_) (`#426 <https://github.com/gazebosim/ros_gz/issues/426>`_)
* [backport humble] Update README.md (`#411 <https://github.com/gazebosim/ros_gz/issues/411>`_)
The ROS type for gz.msgs.NavSat messages should be **sensor_msgs/msg/NavSatFix** instead of **sensor_msgs/msg/NavSatFixed**
* Contributors: Alejandro Hernández Cordero, Arjun K Haridas

0.245.0 (2023-05-23)
--------------------
* Backport: Add missing rosidl_cmake dep to ros_gz_bridge (`#391 <https://github.com/gazebosim/ros_gz/issues/391>`_) (`#396 <https://github.com/gazebosim/ros_gz/issues/396>`_)
* Contributors: Michael Carroll, Yadu, Chris Lalancette
* Contributors: Addisu Z. Taddese, Alejandro Hernández Cordero, Arjun K Haridas, wittenator

0.244.11 (2023-05-23)
---------------------
Expand Down
9 changes: 4 additions & 5 deletions ros_gz_bridge/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ The following message types can be bridged for topics:
| ros_gz_interfaces/msg/Contacts | ignition::msgs::Contacts |
| ros_gz_interfaces/msg/Dataframe | ignition::msgs::Dataframe |
| ros_gz_interfaces/msg/Entity | ignition::msgs::Entity |
| ros_gz_interfaces/msg/EntityWrench | ignition.msgs.EntityWrench |
| ros_gz_interfaces/msg/Float32Array | ignition::msgs::Float_V |
| ros_gz_interfaces/msg/GuiCamera | ignition::msgs::GUICamera |
| ros_gz_interfaces/msg/JointWrench | ignition::msgs::JointWrench |
Expand Down Expand Up @@ -90,7 +89,7 @@ Now we start the ROS listener.

```
# Shell B:
. /opt/ros/iron/setup.bash
. /opt/ros/humble/setup.bash
ros2 topic echo /chatter
```

Expand Down Expand Up @@ -122,7 +121,7 @@ Now we start the ROS talker.

```
# Shell C:
. /opt/ros/iron/setup.bash
. /opt/ros/humble/setup.bash
ros2 topic pub /chatter std_msgs/msg/String "data: 'Hi'" --once
```

Expand Down Expand Up @@ -160,7 +159,7 @@ Now we start the ROS GUI:

```
# Shell C:
. /opt/ros/iron/setup.bash
. /opt/ros/humble/setup.bash
ros2 run rqt_image_view rqt_image_view /rgbd_camera/image
```

Expand Down Expand Up @@ -305,7 +304,7 @@ Now we start the ROS talker.

```bash
# Shell C:
. /opt/ros/iron/setup.bash
. /opt/ros/humble/setup.bash
ros2 topic pub /demo/chatter std_msgs/msg/String "data: 'Hi from inside of a namespace'" --once
```

Expand Down
14 changes: 0 additions & 14 deletions ros_gz_bridge/include/ros_gz_bridge/convert/ros_gz_interfaces.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
// Gazebo Msgs
#include <gz/msgs/altimeter.pb.h>
#include <gz/msgs/entity.pb.h>
#include <gz/msgs/entity_wrench.pb.h>
#include <gz/msgs/joint_wrench.pb.h>
#include <gz/msgs/contact.pb.h>
#include <gz/msgs/contacts.pb.h>
Expand All @@ -36,7 +35,6 @@
// ROS 2 messages
#include <ros_gz_interfaces/msg/altimeter.hpp>
#include <ros_gz_interfaces/msg/entity.hpp>
#include <ros_gz_interfaces/msg/entity_wrench.hpp>
#include <ros_gz_interfaces/msg/joint_wrench.hpp>
#include <ros_gz_interfaces/msg/contact.hpp>
#include <ros_gz_interfaces/msg/contacts.hpp>
Expand Down Expand Up @@ -104,18 +102,6 @@ convert_gz_to_ros(
const gz::msgs::Entity & gz_msg,
ros_gz_interfaces::msg::Entity & ros_msg);

template<>
void
convert_ros_to_gz(
const ros_gz_interfaces::msg::EntityWrench & ros_msg,
gz::msgs::EntityWrench & gz_msg);

template<>
void
convert_gz_to_ros(
const gz::msgs::EntityWrench & gz_msg,
ros_gz_interfaces::msg::EntityWrench & ros_msg);

template<>
void
convert_ros_to_gz(
Expand Down
3 changes: 1 addition & 2 deletions ros_gz_bridge/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>ros_gz_bridge</name>
<version>0.254.2</version>
<version>0.244.15</version>
<description>Bridge communication between ROS and Gazebo Transport</description>
<maintainer email="[email protected]">Louise Poubel</maintainer>

Expand All @@ -12,7 +12,6 @@

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>pkg-config</buildtool_depend>
<buildtool_depend>rosidl_pycommon</buildtool_depend>

<depend>actuator_msgs</depend>
<depend>geometry_msgs</depend>
Expand Down
2 changes: 1 addition & 1 deletion ros_gz_bridge/ros_gz_bridge/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from ros_gz_bridge.mappings import MAPPINGS, MAPPINGS_10_1_0, MAPPINGS_8_4_0

from rosidl_pycommon import expand_template
from rosidl_cmake import expand_template


@dataclass
Expand Down
1 change: 0 additions & 1 deletion ros_gz_bridge/ros_gz_bridge/mappings.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
Mapping('Contact', 'Contact'),
Mapping('Contacts', 'Contacts'),
Mapping('Entity', 'Entity'),
Mapping('EntityWrench', 'EntityWrench'),
Mapping('Float32Array', 'Float_V'),
Mapping('GuiCamera', 'GUICamera'),
Mapping('JointWrench', 'JointWrench'),
Expand Down
2 changes: 1 addition & 1 deletion ros_gz_bridge/src/convert/gps_msgs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ convert_gz_to_ros(
ros_msg.track = atan2(gz_msg.velocity_north(), gz_msg.velocity_east());
ros_msg.climb = gz_msg.velocity_up();

// position_covariance is not supported in gz::msgs::NavSat.
// position_covariance is not supported in Ignition::Msgs::NavSat.
ros_msg.position_covariance_type = gps_msgs::msg::GPSFix::COVARIANCE_TYPE_UNKNOWN;
ros_msg.status.status = gps_msgs::msg::GPSStatus::STATUS_GBAS_FIX;
}
Expand Down
Loading

0 comments on commit 9a82573

Please sign in to comment.