Merge remote-tracking branch 'upstream/humble' into pr-update-mimic-j…

…oint-feature-humble
PickNikRobotics · Apr 3, 2024 · e806736 · e806736
2 parents 238ca71 + f724da5
commit e806736
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 5 deletions.
diff --git a/gz_ros2_control_tests/package.xml b/gz_ros2_control_tests/package.xml
@@ -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>gz_ros2_control_tests</name>
-  <version>0.7.5</version>
+  <version>0.7.6</version>
   <description>Gazebo ros2 control tests</description>
   <maintainer email="alejandro@openrobotics.org">Alejandro Hernández</maintainer>
   <license>Apache License 2.0</license>

diff --git a/ign_ros2_control/CHANGELOG.rst b/ign_ros2_control/CHANGELOG.rst
@@ -2,6 +2,29 @@
 Changelog for package ign_ros2_control
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.6 (2024-03-21)
+------------------
+* Fix typo (`#253 <https://github.com/ros-controls/gz_ros2_control/issues/253>`_) (`#254 <https://github.com/ros-controls/gz_ros2_control/issues/254>`_)
+  (cherry picked from commit a98cb2a8b72827b7c1669987d6a12d3f0b30a41e)
+  Co-authored-by: Stephanie Eng <stephanie-eng@users.noreply.github.com>
+* Fix `#247 <https://github.com/ros-controls/gz_ros2_control/issues/247>`_ (`#248 <https://github.com/ros-controls/gz_ros2_control/issues/248>`_) (`#250 <https://github.com/ros-controls/gz_ros2_control/issues/250>`_)
+  (cherry picked from commit 94745e6f5f051214ac9862051f9a918685f2c6b9)
+  Co-authored-by: Graziato Davide <85335579+Fixit-Davide@users.noreply.github.com>
+* Fix `initial_value` not working (backport `#241 <https://github.com/ros-controls/gz_ros2_control/issues/241>`_) (`#243 <https://github.com/ros-controls/gz_ros2_control/issues/243>`_)
+  * Reset Gazebo with initial joint positions and velocities (`#241 <https://github.com/ros-controls/gz_ros2_control/issues/241>`_)
+  (cherry picked from commit c5b0b9049ce75410e75d1828242c1dfd5b19bb80)
+  Co-authored-by: Ruddick Lawrence <679360+mrjogo@users.noreply.github.com>
+  Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
+* Use portable versio for usleep (backport `#237 <https://github.com/ros-controls/gz_ros2_control/issues/237>`_) (`#238 <https://github.com/ros-controls/gz_ros2_control/issues/238>`_)
+  * Use portable versio for usleep (`#237 <https://github.com/ros-controls/gz_ros2_control/issues/237>`_)
+  (cherry picked from commit 0bdf13e6986c613c99a595889a587da1db6d7f69)
+  Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
+* Fix crashing due to an invalid parameter in the initial value (backport `#233 <https://github.com/ros-controls/gz_ros2_control/issues/233>`_) (`#234 <https://github.com/ros-controls/gz_ros2_control/issues/234>`_)
+  * Fix crashing due to an invalid parameter in the initial value (`#233 <https://github.com/ros-controls/gz_ros2_control/issues/233>`_)
+  (cherry picked from commit a3beadb014f62e0808033de2c5ad84e2428c36e9)
+  Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
+* Contributors: Alejandro Hernández Cordero, Ruddick Lawrence, Stephanie Eng, Graziato Davide, mergify[bot]
+
 0.7.5 (2024-01-24)
 ------------------
 * Load the URDF to the resource_manager before parsing it to CM (`#222 <https://github.com/ros-controls/gz_ros2_control/issues/222>`_) (`#225 <https://github.com/ros-controls/gz_ros2_control/issues/225>`_)

diff --git a/ign_ros2_control/package.xml b/ign_ros2_control/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>ign_ros2_control</name>
-  <version>0.7.5</version>
+  <version>0.7.6</version>
   <description>Ignition ros2_control package allows to control simulated robots using ros2_control framework.</description>
   <maintainer email="alejandro@openrobotics.com">Alejandro Hernández</maintainer>
   <author>Alejandro Hernández</author>

diff --git a/ign_ros2_control/src/ign_system.cpp b/ign_ros2_control/src/ign_system.cpp
@@ -185,8 +185,13 @@ bool IgnitionSystem::initSim(
 
   constexpr double default_gain = 0.1;
 
-  this->dataPtr->position_proportional_gain_ = this->nh_->declare_parameter<double>(
-    "position_proportional_gain", default_gain);
+  try {
+    this->dataPtr->position_proportional_gain_ = this->nh_->declare_parameter<double>(
+      "position_proportional_gain", default_gain);
+  } catch (rclcpp::exceptions::ParameterAlreadyDeclaredException & ex) {
+    this->nh_->get_parameter(
+      "position_proportional_gain", this->dataPtr->position_proportional_gain_);
+  }
 
   RCLCPP_INFO_STREAM(
     this->nh_->get_logger(),

diff --git a/ign_ros2_control_demos/CHANGELOG.rst b/ign_ros2_control_demos/CHANGELOG.rst
@@ -2,6 +2,19 @@
 Changelog for package ign_ros2_control_demos
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.6 (2024-03-21)
+------------------
+* Add `ros_gz_bridge` as dependency to demos (backport `#256 <https://github.com/ros-controls/gz_ros2_control/issues/256>`_) (`#257 <https://github.com/ros-controls/gz_ros2_control/issues/257>`_)
+  * Add dep (`#256 <https://github.com/ros-controls/gz_ros2_control/issues/256>`_)
+  (cherry picked from commit b35100db16e80ffb574c0266321800e2197136c3)
+  # Conflicts:
+  #	ign_ros2_control_demos/package.xml
+  * fixed merge
+  ---------
+  Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
+  Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
+* Contributors: mergify[bot]
+
 0.7.4 (2024-01-24)
 ------------------
 

diff --git a/ign_ros2_control_demos/package.xml b/ign_ros2_control_demos/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>ign_ros2_control_demos</name>
-  <version>0.7.5</version>
+  <version>0.7.6</version>
   <description>ign_ros2_control_demos</description>
 
   <maintainer email="ahcorde@osrfoundation.org">Alejandro Hernandez</maintainer>
@@ -38,6 +38,7 @@
   <exec_depend>rclcpp</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>
   <exec_depend>ros_ign_gazebo</exec_depend>
+  <exec_depend>ros_gz_bridge</exec_depend>
   <exec_depend>ros2controlcli</exec_depend>
   <exec_depend>std_msgs</exec_depend>
   <exec_depend>velocity_controllers</exec_depend>