Skip to content

Commit 2938986

Browse files
committed
Merge branch 'master' into ros2
2 parents b62ab85 + 49b3bd0 commit 2938986

File tree

13 files changed

+58
-7
lines changed

13 files changed

+58
-7
lines changed

capabilities/CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package moveit_task_constructor_capabilities
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.1.0 (2023-02-02)
6+
------------------
7+
* Initial release
8+
* Contributors: Michael Görner, Robert Haschke

capabilities/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package format="2">
22
<name>moveit_task_constructor_capabilities</name>
3-
<version>0.0.0</version>
3+
<version>0.1.0</version>
44
<description>
55
MoveGroupCapabilites to interact with MoveIt
66
</description>

core/CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package moveit_task_constructor_core
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.1.0 (2023-02-02)
6+
------------------
7+
* Initial release
8+
* Contributors: Michael Görner, Robert Haschke, Captain Yoshi, Christian Petersmeier, Henning Kayser, Jafar Abdi, Tyler Weaver

core/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package format="3">
22
<name>moveit_task_constructor_core</name>
3-
<version>0.0.0</version>
3+
<version>0.1.0</version>
44
<description>MoveIt Task Pipeline</description>
55

66
<url type="website">https://github.com/ros-planning/moveit_task_constructor</url>

core/src/stages/generate_pose.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ void GeneratePose::compute() {
7272
if (upstream_solutions_.empty())
7373
return;
7474

75-
planning_scene::PlanningScenePtr scene = upstream_solutions_.pop()->end()->scene()->diff();
75+
const SolutionBase& s = *upstream_solutions_.pop();
76+
planning_scene::PlanningSceneConstPtr scene = s.end()->scene()->diff();
77+
7678
geometry_msgs::msg::PoseStamped target_pose = properties().get<geometry_msgs::msg::PoseStamped>("pose");
7779
if (target_pose.header.frame_id.empty())
7880
target_pose.header.frame_id = scene->getPlanningFrame();
@@ -82,6 +84,7 @@ void GeneratePose::compute() {
8284
}
8385

8486
InterfaceState state(scene);
87+
forwardProperties(*s.end(), state); // forward registered properties from received solution
8588
state.properties().set("target_pose", target_pose);
8689

8790
SubTrajectory trajectory;

demo/CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package moveit_task_constructor_demo
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.1.0 (2023-02-02)
6+
------------------
7+
* Initial release
8+
* Contributors: Michael Görner, Robert Haschke

demo/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>moveit_task_constructor_demo</name>
4-
<version>0.0.1</version>
4+
<version>0.1.0</version>
55
<description>demo tasks illustrating various capabilities of MTC.</description>
66

77
<author email="[email protected]">simon Goldstein</author>

msgs/CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package moveit_task_constructor_msgs
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.1.0 (2023-02-02)
6+
------------------
7+
* Initial release
8+
* Contributors: Michael Görner, Robert Haschke

msgs/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package format="3">
22
<name>moveit_task_constructor_msgs</name>
3-
<version>0.0.0</version>
3+
<version>0.1.0</version>
44
<description>Messages for MoveIt Task Pipeline</description>
55

66
<license>BSD</license>

rviz_marker_tools/CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package rviz_marker_tools
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.1.0 (2023-02-02)
6+
------------------
7+
* Initial release
8+
* Contributors: Robert Haschke, Michael Görner

0 commit comments

Comments
 (0)