Skip to content

Commit 3b47f98

Browse files
authored
Merge branch 'humble' into pid-with-force-output
2 parents 6c671e4 + cbd4a8e commit 3b47f98

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

Dockerfile/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
22

33
ENV DEBIAN_FRONTEND noninteractive
44
ENV IGNITION_VERSION fortress
5-
ENV ROS_DISTRO rolling
5+
ENV ROS_DISTRO humble
66

77
# Make sure everything is up to date before building from source
88
RUN apt-get update \

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ROS2 Distro | Build Status | Package build |
44
:---------: | :----: | :----------: |
5-
[![Licence](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | [![Build Status](http://build.ros2.org/buildStatus/icon?job=Gdev__ign_ros2_control__ubuntu_focal_amd64)](http://build.ros2.org/job/Gdev__ign_ros2_control__ubuntu_focal_amd64) | [![Build Status](http://build.ros2.org/buildStatus/icon?job=Gbin_uF64__ign_ros2_control__ubuntu_focal_amd64__binary)](http://build.ros2.org/job/Gbin_uF64__ign_ros2_control__ubuntu_focal_amd64__binary) |
5+
[![Licence](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | [![Build Status](http://build.ros2.org/buildStatus/icon?job=Hdev__gz_ros2_control__ubuntu_focal_amd64)](http://build.ros2.org/job/Hdev__gz_ros2_control__ubuntu_focal_amd64) | [![Build Status](http://build.ros2.org/buildStatus/icon?job=Hbin_uF64__gz_ros2_control__ubuntu_focal_amd64__binary)](http://build.ros2.org/job/Hbin_uF64__gz_ros2_control__ubuntu_focal_amd64__binary) |
66

77
This is a ROS 2 package for integrating the `ros2_control` controller architecture with the [Ignition Gazebo](http://ignitionrobotics.org/) simulator.
88
More information about `ros2_control` can be found here: https://control.ros.org/
@@ -11,7 +11,7 @@ This package provides an Ignition Gazebo system plugin which instantiates a `ros
1111

1212
[![Build Status](https://github.com/ros-controls/gz_ros2_control/actions/workflows/ci.yaml/badge.svg?branch=galactic)](https://github.com/ros-controls/gz_ros2_control/actions/workflows/ci.yaml)
1313

14-
ROS version | Ignition version | Branch | Binaries hosted at
14+
ROS version | Gazebo version | Branch | Binaries hosted at
1515
-- | -- | -- | --
1616
Foxy | Citadel | [foxy](https://github.com/ros-controls/gz_ros2_control/tree/foxy) | https://packages.ros.org
1717
Foxy | Edifice | [foxy](https://github.com/ros-controls/gz_ros2_control/tree/foxy) | only from source

ign_ros2_control/src/ign_system.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,6 @@ hardware_interface::return_type IgnitionSystem::write(
956956
*jointEffortCmd = ignition::gazebo::components::JointForceCmd(
957957
{this->dataPtr->joints_[i].joint_effort_cmd});
958958
}
959-
}
960959
}
961960

962961
// set values of all mimic joints with respect to mimicked joint

0 commit comments

Comments
 (0)