Merge branch 'master' into ros2

moveit · Feb 2, 2023 · 2938986 · 2938986
2 parents b62ab85 + 49b3bd0
commit 2938986
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 7 deletions.
diff --git a/capabilities/CHANGELOG.rst b/capabilities/CHANGELOG.rst
@@ -0,0 +1,8 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package moveit_task_constructor_capabilities
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.0 (2023-02-02)
+------------------
+* Initial release
+* Contributors: Michael Görner, Robert Haschke
diff --git a/capabilities/package.xml b/capabilities/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
 	<name>moveit_task_constructor_capabilities</name>
-	<version>0.0.0</version>
+	<version>0.1.0</version>
 	<description>
 	MoveGroupCapabilites to interact with MoveIt
 	</description>

diff --git a/core/CHANGELOG.rst b/core/CHANGELOG.rst
@@ -0,0 +1,8 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package moveit_task_constructor_core
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.0 (2023-02-02)
+------------------
+* Initial release
+* Contributors: Michael Görner, Robert Haschke, Captain Yoshi, Christian Petersmeier, Henning Kayser, Jafar Abdi, Tyler Weaver
diff --git a/core/package.xml b/core/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
 	<name>moveit_task_constructor_core</name>
-	<version>0.0.0</version>
+	<version>0.1.0</version>
 	<description>MoveIt Task Pipeline</description>
 
 	<url type="website">https://github.com/ros-planning/moveit_task_constructor</url>

diff --git a/core/src/stages/generate_pose.cpp b/core/src/stages/generate_pose.cpp
@@ -72,7 +72,9 @@ void GeneratePose::compute() {
 	if (upstream_solutions_.empty())
 		return;
 
-	planning_scene::PlanningScenePtr scene = upstream_solutions_.pop()->end()->scene()->diff();
+	const SolutionBase& s = *upstream_solutions_.pop();
+	planning_scene::PlanningSceneConstPtr scene = s.end()->scene()->diff();
+
 	geometry_msgs::msg::PoseStamped target_pose = properties().get<geometry_msgs::msg::PoseStamped>("pose");
 	if (target_pose.header.frame_id.empty())
 		target_pose.header.frame_id = scene->getPlanningFrame();
@@ -82,6 +84,7 @@ void GeneratePose::compute() {
 	}
 
 	InterfaceState state(scene);
+	forwardProperties(*s.end(), state);  // forward registered properties from received solution
 	state.properties().set("target_pose", target_pose);
 
 	SubTrajectory trajectory;

diff --git a/demo/CHANGELOG.rst b/demo/CHANGELOG.rst
@@ -0,0 +1,8 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package moveit_task_constructor_demo
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.0 (2023-02-02)
+------------------
+* Initial release
+* Contributors: Michael Görner, Robert Haschke
diff --git a/demo/package.xml b/demo/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>moveit_task_constructor_demo</name>
-  <version>0.0.1</version>
+  <version>0.1.0</version>
   <description>demo tasks illustrating various capabilities of MTC.</description>
 
   <author email="[email protected]">simon Goldstein</author>

diff --git a/msgs/CHANGELOG.rst b/msgs/CHANGELOG.rst
@@ -0,0 +1,8 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package moveit_task_constructor_msgs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.0 (2023-02-02)
+------------------
+* Initial release
+* Contributors: Michael Görner, Robert Haschke
diff --git a/msgs/package.xml b/msgs/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
 	<name>moveit_task_constructor_msgs</name>
-	<version>0.0.0</version>
+	<version>0.1.0</version>
 	<description>Messages for MoveIt Task Pipeline</description>
 
 	<license>BSD</license>

diff --git a/rviz_marker_tools/CHANGELOG.rst b/rviz_marker_tools/CHANGELOG.rst
@@ -0,0 +1,8 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package rviz_marker_tools
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.0 (2023-02-02)
+------------------
+* Initial release
+* Contributors: Robert Haschke, Michael Görner
diff --git a/rviz_marker_tools/package.xml b/rviz_marker_tools/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
 	<name>rviz_marker_tools</name>
-	<version>0.0.0</version>
+	<version>0.1.0</version>
 	<description>Tools for marker creation / handling</description>
 
 	<license>BSD</license>

diff --git a/visualization/CHANGELOG.rst b/visualization/CHANGELOG.rst
@@ -0,0 +1,8 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package moveit_task_constructor_visualization
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.0 (2023-02-02)
+------------------
+* Initial release
+* Contributors: Robert Haschke, Michael Görner
diff --git a/visualization/package.xml b/visualization/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
 	<name>moveit_task_constructor_visualization</name>
-	<version>0.0.0</version>
+	<version>0.1.0</version>
 	<description>Visualization tools for MoveIt Task Pipeline</description>
 
 	<license>BSD</license>