Merge branch 'master' into ahcorde/rolling/create_with_arguments

ros-controls · Jan 8, 2024 · c4f32df · c4f32df
2 parents b0e995b + 4a2170c
commit c4f32df
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 3 deletions.
diff --git a/gz_ros2_control/CHANGELOG.rst b/gz_ros2_control/CHANGELOG.rst
@@ -2,6 +2,21 @@
 Changelog for package ign_ros2_control
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.0 (2024-01-04)
+------------------
+* Add controller name parameter (backport `#212 <https://github.com/ros-controls/gz_ros2_control/issues/212>`_) (`#216 <https://github.com/ros-controls/gz_ros2_control/issues/216>`_)
+  Co-authored-by: Jakub Delicat <[email protected]>
+  Co-authored-by: Alejandro Hernandez Cordero <[email protected]>
+* Add hold_joints parameter (`#213 <https://github.com/ros-controls/gz_ros2_control/issues/213>`_)
+* Fix stuck passive joints (`#184 <https://github.com/ros-controls/gz_ros2_control/issues/184>`_)
+  * Fix stuck passive joints
+  * Update comment
+  * Fix variable naming
+  ---------
+  Co-authored-by: Christoph Fröhlich <[email protected]>
+* Support Harmonic (`#185 <https://github.com/ros-controls/gz_ros2_control/issues/185>`_)
+* Contributors: Alejandro Hernández Cordero, Johannes Huemer, mergify[bot]
+
 1.1.2 (2023-08-23)
 ------------------
 * Catch pluginlib exceptions (`#175 <https://github.com/ros-controls/gz_ros2_control/issues/175>`_)

diff --git a/gz_ros2_control/package.xml b/gz_ros2_control/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>gz_ros2_control</name>
-  <version>1.1.2</version>
+  <version>1.2.0</version>
   <description>Gazebo ros2_control package allows to control simulated robots using ros2_control framework.</description>
   <maintainer email="[email protected]">Alejandro Hernández</maintainer>
   <maintainer email="[email protected]">Bence Magyar</maintainer>

diff --git a/gz_ros2_control_demos/CHANGELOG.rst b/gz_ros2_control_demos/CHANGELOG.rst
@@ -2,6 +2,18 @@
 Changelog for package ign_ros2_control_demos
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.0 (2024-01-04)
+------------------
+* Rename cartpole with cart (`#214 <https://github.com/ros-controls/gz_ros2_control/issues/214>`_)
+  Co-authored-by: Christoph Fröhlich <[email protected]>
+* Replace Twist with TwistStamped (`#210 <https://github.com/ros-controls/gz_ros2_control/issues/210>`_)
+* Update diff_drive_example.launch.py (`#207 <https://github.com/ros-controls/gz_ros2_control/issues/207>`_) (`#209 <https://github.com/ros-controls/gz_ros2_control/issues/209>`_)
+  (cherry picked from commit e20382adc627e609e277c45e74b21f603e629675)
+  Co-authored-by: Jakub Delicat <[email protected]>
+* Support Harmonic (`#185 <https://github.com/ros-controls/gz_ros2_control/issues/185>`_)
+* Cleanup controller config (`#180 <https://github.com/ros-controls/gz_ros2_control/issues/180>`_)
+* Contributors: Alejandro Hernández Cordero, mergify[bot]
+
 1.1.2 (2023-08-23)
 ------------------
 * Set C++ version to 17 (`#171 <https://github.com/ros-controls/gz_ros2_control/issues/171>`_)

diff --git a/gz_ros2_control_demos/package.xml b/gz_ros2_control_demos/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>gz_ros2_control_demos</name>
-  <version>1.1.2</version>
+  <version>1.2.0</version>
   <description>gz_ros2_control_demos</description>
 
   <maintainer email="[email protected]">Alejandro Hernandez</maintainer>

diff --git a/gz_ros2_control_tests/CHANGELOG.rst b/gz_ros2_control_tests/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package gz_ros2_control_tests
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.0 (2024-01-04)
+------------------
+* Rename cartpole with cart (`#214 <https://github.com/ros-controls/gz_ros2_control/issues/214>`_)
+  Co-authored-by: Christoph Fröhlich <[email protected]>
+* Support Harmonic (`#185 <https://github.com/ros-controls/gz_ros2_control/issues/185>`_)
+* Contributors: Alejandro Hernández Cordero
+
 1.1.1 (2023-07-13)
 ------------------
 * Run end to end test in CI (`#152 <https://github.com/ros-controls/gz_ros2_control//issues/152>`_)

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>1.1.2</version>
+  <version>1.2.0</version>
   <description>Gazebo ros2 control tests</description>
   <maintainer email="[email protected]">Alejandro Hernández</maintainer>
   <license>Apache License 2.0</license>