Merge branch 'master' into dev/win-mac-action

tesseract-robotics · Jul 29, 2024 · f0cc73e · f0cc73e
2 parents 83f3121 + b45af24
commit f0cc73e
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 6 deletions.
diff --git a/tesseract_command_language/CHANGELOG.rst b/tesseract_command_language/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package tesseract_command_language
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.23.4 (2024-07-29)
+-------------------
+
 0.23.3 (2024-07-28)
 -------------------
 * Cleanup boost serialization (`#490 <https://github.com/tesseract-robotics/tesseract_planning/issues/490>`_)

diff --git a/tesseract_command_language/package.xml b/tesseract_command_language/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>tesseract_command_language</name>
-  <version>0.23.3</version>
+  <version>0.23.4</version>
   <description>The Tesseract Command Language package</description>
   <author email="[email protected]">Levi Armstrong</author>
   <maintainer email="[email protected]">Levi Armstrong</maintainer>

diff --git a/tesseract_examples/CHANGELOG.rst b/tesseract_examples/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package tesseract_examples
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.23.4 (2024-07-29)
+-------------------
+
 0.23.3 (2024-07-28)
 -------------------
 

diff --git a/tesseract_examples/package.xml b/tesseract_examples/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>tesseract_examples</name>
-  <version>0.23.3</version>
+  <version>0.23.4</version>
   <description>This package contains examples related to this trajopt_ros repository.</description>
 
   <maintainer email="[email protected]">Levi Armstrong</maintainer>

diff --git a/tesseract_motion_planners/CHANGELOG.rst b/tesseract_motion_planners/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package tesseract_motion_planners
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.23.4 (2024-07-29)
+-------------------
+
 0.23.3 (2024-07-28)
 -------------------
 

diff --git a/tesseract_motion_planners/package.xml b/tesseract_motion_planners/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>tesseract_motion_planners</name>
-  <version>0.23.3</version>
+  <version>0.23.4</version>
   <description>This contains tesseract planners</description>
 
   <maintainer email="[email protected]">Levi Armstrong</maintainer>

diff --git a/tesseract_task_composer/CHANGELOG.rst b/tesseract_task_composer/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package tesseract_task_composer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.23.4 (2024-07-29)
+-------------------
+* Fix task composer graph config loading
+* Contributors: Levi Armstrong
+
 0.23.3 (2024-07-28)
 -------------------
 * Cleanup boost serialization (`#490 <https://github.com/tesseract-robotics/tesseract_planning/issues/490>`_)

diff --git a/tesseract_task_composer/core/src/task_composer_graph.cpp b/tesseract_task_composer/core/src/task_composer_graph.cpp
@@ -119,7 +119,7 @@ TaskComposerGraph::TaskComposerGraph(std::string name,
 
         if (YAML::Node n = tc["abort_terminal"])
         {
-          if (task_node->getType() != TaskComposerNodeType::GRAPH ||
+          if (task_node->getType() == TaskComposerNodeType::GRAPH ||
               task_node->getType() == TaskComposerNodeType::PIPELINE)
             static_cast<TaskComposerGraph&>(*task_node).setTerminalTriggerAbortByIndex(n.as<int>());
           else

diff --git a/tesseract_task_composer/package.xml b/tesseract_task_composer/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>tesseract_task_composer</name>
-  <version>0.23.3</version>
+  <version>0.23.4</version>
   <description>The Tesseract Task Composer package</description>
   <author email="[email protected]">Levi Armstrong</author>
   <maintainer email="[email protected]">Levi Armstrong</maintainer>

diff --git a/tesseract_time_parameterization/CHANGELOG.rst b/tesseract_time_parameterization/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package tesseract_time_parameterization
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.23.4 (2024-07-29)
+-------------------
+
 0.23.3 (2024-07-28)
 -------------------
 

diff --git a/tesseract_time_parameterization/package.xml b/tesseract_time_parameterization/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>tesseract_time_parameterization</name>
-  <version>0.23.3</version>
+  <version>0.23.4</version>
   <description>The Tesseract Time Parameterization package</description>
   <author email="[email protected]">Levi Armstrong</author>
   <maintainer email="[email protected]">Levi Armstrong</maintainer>