Skip to content
This repository was archived by the owner on Oct 17, 2025. It is now read-only.

Commit 79ce878

Browse files
authored
Merge branch 'master' into sea
2 parents b132ec5 + ba0c5f8 commit 79ce878

File tree

6 files changed

+30
-3
lines changed

6 files changed

+30
-3
lines changed

gazebo_ros2_control/CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
Changelog for package gazebo_ros2_control
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.6.0 (2023-05-23)
6+
------------------
7+
* add copy operator to SafeEnum (`#197 <https://github.com/ros-controls/gazebo_ros2_control/issues/197>`_)
8+
* Fixed rolling compilation (`#195 <https://github.com/ros-controls/gazebo_ros2_control/issues/195>`_)
9+
* Export all dependencies (`#183 <https://github.com/ros-controls/gazebo_ros2_control/issues/183>`_) (`#184 <https://github.com/ros-controls/gazebo_ros2_control/issues/184>`_)
10+
* Contributors: Alejandro Hernández Cordero, Noel Jiménez García, Adrian Zwiener
11+
512
0.5.1 (2023-02-07)
613
------------------
714
* Various bug fixes (`#177 <https://github.com/ros-controls/gazebo_ros2_control/issues/177>`_)

gazebo_ros2_control/include/gazebo_ros2_control/gazebo_system_interface.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class SafeEnum
4545
: mFlags(original.mFlags) {}
4646
~SafeEnum() = default;
4747

48+
SafeEnum & operator=(const SafeEnum & original) = default;
4849
SafeEnum & operator|=(ENUM addValue) {mFlags |= addValue; return *this;}
4950
SafeEnum operator|(ENUM addValue) {SafeEnum result(*this); result |= addValue; return result;}
5051
SafeEnum & operator&=(ENUM maskValue) {mFlags &= maskValue; return *this;}

gazebo_ros2_control/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>gazebo_ros2_control</name>
4-
<version>0.5.1</version>
4+
<version>0.6.0</version>
55
<description>gazebo_ros2_control</description>
66

77
<maintainer email="[email protected]">Alejandro Hernandez</maintainer>

gazebo_ros2_control_demos/CHANGELOG.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
Changelog for package gazebo_ros2_control_demos
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.6.0 (2023-05-23)
6+
------------------
7+
* Clean shutdown position example (`#196 <https://github.com/ros-controls/gazebo_ros2_control/issues/196>`_)
8+
* Remove publish_rate parameter (`#179 <https://github.com/ros-controls/gazebo_ros2_control/issues/179>`_)
9+
* Contributors: Alejandro Hernández Cordero, Tony Najjar
10+
11+
0.5.1 (2023-02-07)
12+
------------------
13+
14+
0.5.0 (2023-01-06)
15+
------------------
16+
* Add tricycle controller demo (`#145 <https://github.com/ros-controls/gazebo_ros2_control/issues/145>`_)
17+
* Contributors: Tony Najjar
18+
519
0.4.0 (2022-08-09)
620
------------------
721
* fix demo launch

gazebo_ros2_control_demos/examples/example_position.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ int main(int argc, char * argv[])
149149
rclcpp::FutureReturnCode::SUCCESS)
150150
{
151151
RCLCPP_ERROR(node->get_logger(), "send goal call failed :(");
152+
action_client.reset();
153+
node.reset();
152154
return 1;
153155
}
154156
RCLCPP_INFO(node->get_logger(), "send goal call ok :)");
@@ -157,6 +159,8 @@ int main(int argc, char * argv[])
157159
goal_handle = goal_handle_future.get();
158160
if (!goal_handle) {
159161
RCLCPP_ERROR(node->get_logger(), "Goal was rejected by server");
162+
action_client.reset();
163+
node.reset();
160164
return 1;
161165
}
162166
RCLCPP_INFO(node->get_logger(), "Goal was accepted by server");
@@ -171,7 +175,8 @@ int main(int argc, char * argv[])
171175
return 1;
172176
}
173177

174-
std::cout << "async_send_goal" << std::endl;
178+
action_client.reset();
179+
node.reset();
175180
rclcpp::shutdown();
176181

177182
return 0;

gazebo_ros2_control_demos/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>gazebo_ros2_control_demos</name>
4-
<version>0.4.0</version>
4+
<version>0.6.0</version>
55
<description>gazebo_ros2_control_demos</description>
66

77
<maintainer email="[email protected]">Alejandro Hernandez</maintainer>

0 commit comments

Comments
 (0)