Imported upstream version '2.1.1' of 'upstream'

moveit · Sep 27, 2021 · 244affa · 244affa
1 parent e39b88c
commit 244affa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml
@@ -34,7 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: cache ccache
-        uses: pat-s/always-upload-cache@v2.1.3
+        uses: pat-s/always-upload-cache@v2.1.5
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}  

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package moveit_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.1 (2021-09-27)
+------------------
+* Add jerk to JointLimits.msg (`#132 <https://github.com/ros-planning/moveit_msgs/issues/132>`_)
+* Contributors: AndyZe
+
 2.1.0 (2021-06-17)
 ------------------
 * Sync with master branch up to `460caab <https://github.com/ros-planning/moveit_msgs/commit/460caab755cfe018ad07effd7dd808127a7e5c61>`_ (`#120 <https://github.com/ros-planning/moveit_msgs/issues/120>`_)

diff --git a/msg/JointLimits.msg b/msg/JointLimits.msg
@@ -20,3 +20,9 @@ bool has_acceleration_limits
 # max acceleration limit
 float64 max_acceleration
 # min_acceleration is assumed to be -max_acceleration
+
+# true if joint has jerk limits
+bool has_jerk_limits
+# max jerk limit
+float64 max_jerk
+# min_jerk is assumed to be -max_jerk
diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>moveit_msgs</name>
-  <version>2.1.0</version>
+  <version>2.1.1</version>
   <description>Messages, services and actions used by MoveIt</description>
   <author email="isucan@google.com">Ioan Sucan</author>
   <author email="sachinc@sri.com">Sachin Chitta</author>