Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge iron ➡️ jazzy #569

Merged
merged 77 commits into from
Jun 25, 2024
Merged

Merge iron ➡️ jazzy #569

merged 77 commits into from
Jun 25, 2024

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Jun 25, 2024

➡️ Forward port

Port iron ➡️ jazzy

Branch comparison: jazzy...iron

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

mjcarroll and others added 30 commits May 5, 2023 17:19
Signed-off-by: Michael Carroll <[email protected]>
… (gazebosim#396)

* Add missing rosidl_cmake dep to ros_gz_bridge (gazebosim#391)

Signed-off-by: Yadunund <[email protected]>
Signed-off-by: Chris Lalancette <[email protected]>
Co-authored-by: Chris Lalancette <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>

* Run fortress and garden against iron

Signed-off-by: Michael Carroll <[email protected]>

---------

Signed-off-by: Yadunund <[email protected]>
Signed-off-by: Chris Lalancette <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Yadu <[email protected]>
Co-authored-by: Chris Lalancette <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
This PR fixes an incorrect subscription on one of the demos. Running
```
ros2 launch ros_gz_sim_demos gpu_lidar_bridge.launch.py
```
causes rviz2 to crash and exit with the error:
```
rviz2-3]
[rviz2-3] >>> [rcutils|error_handling.c:108] rcutils_set_error_state()
[rviz2-3] This error state is being overwritten:
[rviz2-3]
[rviz2-3]   'create_subscription() called for existing topic name rt/lidar with incompatible type sensor_msgs::msg::dds_::PointCloud2_, at ./src/subscription.cpp:146, at ./src/rcl/subscription.c:108'
[rviz2-3]
[rviz2-3] with this new error message:
[rviz2-3]
[rviz2-3]   'invalid allocator, at ./src/rcl/subscription.c:218'
[rviz2-3]
[rviz2-3] rcutils_reset_error() should be called after error handling to avoid this.
```
This is due to an incorrect subscription on the part of the demo. This
PR fixes it by getting a subscription to the right topic for the
pointcloud display. (`lidar/points` instead of `lidar`). Was tested on
garden + humble.

Signed-off-by: Arjo Chakravarty <[email protected]>
This PR fixes an incorrect subscription on one of the demos. Running
```
ros2 launch ros_gz_sim_demos gpu_lidar_bridge.launch.py
```
causes rviz2 to crash and exit with the error:
```
rviz2-3]
[rviz2-3] >>> [rcutils|error_handling.c:108] rcutils_set_error_state()
[rviz2-3] This error state is being overwritten:
[rviz2-3]
[rviz2-3]   'create_subscription() called for existing topic name rt/lidar with incompatible type sensor_msgs::msg::dds_::PointCloud2_, at ./src/subscription.cpp:146, at ./src/rcl/subscription.c:108'
[rviz2-3]
[rviz2-3] with this new error message:
[rviz2-3]
[rviz2-3]   'invalid allocator, at ./src/rcl/subscription.c:218'
[rviz2-3]
[rviz2-3] rcutils_reset_error() should be called after error handling to avoid this.
```
This is due to an incorrect subscription on the part of the demo. This
PR fixes it by getting a subscription to the right topic for the
pointcloud display. (`lidar/points` instead of `lidar`). Was tested on
garden + humble.

Signed-off-by: Arjo Chakravarty <[email protected]>
Co-authored-by: Arjo Chakravarty <[email protected]>
The ROS type for gz.msgs.NavSat messages should be **sensor_msgs/msg/NavSatFix** instead of **sensor_msgs/msg/NavSatFixed**

Signed-off-by: Arjun K Haridas <[email protected]>
The ROS type for gz.msgs.NavSat messages should be **sensor_msgs/msg/NavSatFix** instead of **sensor_msgs/msg/NavSatFixed**

Signed-off-by: Arjun K Haridas <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
[backport Humble] Added more topic to the bridge (gazebosim#422)
…im#414)

Signed-off-by: Aditya Pande <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Aditya Pande <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
…im#414) (gazebosim#426)

Signed-off-by: Aditya Pande <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Aditya Pande <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Aditya Pande <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Aditya Pande <[email protected]>
…rt/417

[backport humble] SensorNoise msg bridging (gazebosim#417)
…/428

[backport iron] Add link to project template (gazebosim#428)
…rt/428

[backport humble] Add link to project template (gazebosim#428)
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Fix the branch name when checking out ros_gz otherwise `rosdep install -r --from-paths src -i -y --rosdistro humble` errors with incompatible versions. Additonally link to gazebosim#401 (comment) which allows compilation on Ubuntu 20.04 + ROS2 Humble + Ignition Fortress

Signed-off-by: Samuel Seng <[email protected]>
ahcorde and others added 22 commits February 23, 2024 16:23
This copies the implementation from `gazebo_ros_paths.py` to provide a
way for packages to set resource paths from `package.xml`.

```
e.g.  <export>
          <gazebo_ros gazebo_model_path="${prefix}/models"/>
          <gazebo_ros gazebo_media_path="${prefix}/models"/>
      </export>
```

The value of `gazebo_model_path` and `gazebo_media_path` is appended to `GZ_SIM_RESOURCE_PATH`
The value of `plugin_path` appended to `GZ_SIM_SYSTEM_PLUGIN_PATH`

---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Kotochleb <[email protected]>
Signed-off-by: Krzysztof Wojciechowski <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Kotochleb <[email protected]>
Signed-off-by: Krzysztof Wojciechowski <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Krzysztof Wojciechowski <[email protected]>
Forward port of gazebosim#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.

Signed-off-by: Benjamin Perseghetti <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
…im#537)

Signed-off-by: Vincent Rousseau <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Rousseau Vincent <[email protected]>
…osim#538)

Signed-off-by: Vincent Rousseau <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Rousseau Vincent <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Alaa El Jawad <[email protected]>
Signed-off-by: wittenator <[email protected]>
Co-authored-by: El Jawad Alaa <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey azeey requested a review from ahcorde as a code owner June 25, 2024 04:00
Copy link
Collaborator

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR include the right ROS distro on CI #570

@azeey
Copy link
Contributor Author

azeey commented Jun 25, 2024

@Mergifyio update

Copy link
Contributor

mergify bot commented Jun 25, 2024

update

❌ Mergify doesn't have permission to update

For security reasons, Mergify can't update this pull request. Try updating locally.
GitHub response: refusing to allow a GitHub App to create or update workflow .github/workflows/ros2-ci.yml without workflows permission

@azeey azeey merged commit 5482f8c into gazebosim:jazzy Jun 25, 2024
3 checks passed
@azeey azeey deleted the iron_to_jazzy branch June 25, 2024 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

10 participants