updated moveit

lbr-stack · Oct 19, 2024 · 4c02bef · 4c02bef
1 parent 8832fc0
commit 4c02bef
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 29 deletions.
diff --git a/lbr_bringup/lbr_bringup/moveit.py b/lbr_bringup/lbr_bringup/moveit.py
@@ -67,7 +67,10 @@ def moveit_configs_builder(
                     f"urdf/{robot_name}/{robot_name}.xacro",
                 ),
             )
-            .planning_pipelines(default_planning_pipeline="ompl")
+            .planning_pipelines(
+                default_planning_pipeline="ompl",
+                pipelines=["chomp", "pilz_industrial_motion_planner", "stomp", "ompl"],
+            )
         )
 
     @staticmethod

diff --git a/lbr_bringup/package.xml b/lbr_bringup/package.xml
@@ -17,6 +17,9 @@
   <exec_depend>lbr_description</exec_depend>
   <exec_depend>lbr_fri_ros2</exec_depend>
   <exec_depend>lbr_ros2_control</exec_depend>
+  <exec_depend>moveit_planners_chomp</exec_depend>
+  <exec_depend>moveit_planners_ompl</exec_depend>
+  <exec_depend>moveit_planners_stomp</exec_depend>
   <exec_depend>moveit_ros_move_group</exec_depend>
   <exec_depend>moveit_servo</exec_depend>
   <exec_depend>rclpy</exec_depend>

diff --git a/lbr_moveit_config/iiwa14_moveit_config/.setup_assistant b/lbr_moveit_config/iiwa14_moveit_config/.setup_assistant
@@ -7,7 +7,7 @@ moveit_setup_assistant_config:
   package_settings:
     author_name: mhubii
     author_email: [email protected]
-    generated_timestamp: 1690640386
+    generated_timestamp: 1729340960
   control_xacro:
     command:
       - position

diff --git a/lbr_moveit_config/iiwa14_moveit_config/config/moveit_controllers.yaml b/lbr_moveit_config/iiwa14_moveit_config/config/moveit_controllers.yaml
@@ -8,13 +8,13 @@ moveit_simple_controller_manager:
 
   joint_trajectory_controller:
     type: FollowJointTrajectory
-    action_ns: follow_joint_trajectory
-    default: true
     joints:
       - A1
       - A2
       - A3
       - A4
       - A5
       - A6
-      - A7
+      - A7
+    action_ns: follow_joint_trajectory
+    default: true
diff --git a/lbr_moveit_config/iiwa14_moveit_config/package.xml b/lbr_moveit_config/iiwa14_moveit_config/package.xml
@@ -8,11 +8,11 @@
   </description>
   <maintainer email="[email protected]">mhubii</maintainer>
 
-  <license>BSD</license>
+  <license>BSD-3-Clause</license>
 
   <url type="website">http://moveit.ros.org/</url>
-  <url type="bugtracker">https://github.com/ros-planning/moveit2/issues</url>
-  <url type="repository">https://github.com/ros-planning/moveit2</url>
+  <url type="bugtracker">https://github.com/moveit/moveit2/issues</url>
+  <url type="repository">https://github.com/moveit/moveit2</url>
 
   <author email="[email protected]">mhubii</author>
 

diff --git a/lbr_moveit_config/iiwa7_moveit_config/.setup_assistant b/lbr_moveit_config/iiwa7_moveit_config/.setup_assistant
@@ -7,7 +7,7 @@ moveit_setup_assistant_config:
   package_settings:
     author_name: mhubii
     author_email: [email protected]
-    generated_timestamp: 1690638243
+    generated_timestamp: 1729340852
   control_xacro:
     command:
       - position

diff --git a/lbr_moveit_config/iiwa7_moveit_config/config/moveit_controllers.yaml b/lbr_moveit_config/iiwa7_moveit_config/config/moveit_controllers.yaml
@@ -8,13 +8,13 @@ moveit_simple_controller_manager:
 
   joint_trajectory_controller:
     type: FollowJointTrajectory
-    action_ns: follow_joint_trajectory
-    default: true
     joints:
       - A1
       - A2
       - A3
       - A4
       - A5
       - A6
-      - A7
+      - A7
+    action_ns: follow_joint_trajectory
+    default: true
diff --git a/lbr_moveit_config/iiwa7_moveit_config/package.xml b/lbr_moveit_config/iiwa7_moveit_config/package.xml
@@ -8,11 +8,11 @@
   </description>
   <maintainer email="[email protected]">mhubii</maintainer>
 
-  <license>BSD</license>
+  <license>BSD-3-Clause</license>
 
   <url type="website">http://moveit.ros.org/</url>
-  <url type="bugtracker">https://github.com/ros-planning/moveit2/issues</url>
-  <url type="repository">https://github.com/ros-planning/moveit2</url>
+  <url type="bugtracker">https://github.com/moveit/moveit2/issues</url>
+  <url type="repository">https://github.com/moveit/moveit2</url>
 
   <author email="[email protected]">mhubii</author>
 

diff --git a/lbr_moveit_config/med14_moveit_config/.setup_assistant b/lbr_moveit_config/med14_moveit_config/.setup_assistant
@@ -7,7 +7,7 @@ moveit_setup_assistant_config:
   package_settings:
     author_name: mhubii
     author_email: [email protected]
-    generated_timestamp: 1690640936
+    generated_timestamp: 1729341043
   control_xacro:
     command:
       - position

diff --git a/lbr_moveit_config/med14_moveit_config/config/moveit_controllers.yaml b/lbr_moveit_config/med14_moveit_config/config/moveit_controllers.yaml
@@ -8,13 +8,13 @@ moveit_simple_controller_manager:
 
   joint_trajectory_controller:
     type: FollowJointTrajectory
-    action_ns: follow_joint_trajectory
-    default: true
     joints:
       - A1
       - A2
       - A3
       - A4
       - A5
       - A6
-      - A7
+      - A7
+    action_ns: follow_joint_trajectory
+    default: true
diff --git a/lbr_moveit_config/med14_moveit_config/package.xml b/lbr_moveit_config/med14_moveit_config/package.xml
@@ -8,11 +8,11 @@
   </description>
   <maintainer email="[email protected]">mhubii</maintainer>
 
-  <license>BSD</license>
+  <license>BSD-3-Clause</license>
 
   <url type="website">http://moveit.ros.org/</url>
-  <url type="bugtracker">https://github.com/ros-planning/moveit2/issues</url>
-  <url type="repository">https://github.com/ros-planning/moveit2</url>
+  <url type="bugtracker">https://github.com/moveit/moveit2/issues</url>
+  <url type="repository">https://github.com/moveit/moveit2</url>
 
   <author email="[email protected]">mhubii</author>
 

diff --git a/lbr_moveit_config/med7_moveit_config/.setup_assistant b/lbr_moveit_config/med7_moveit_config/.setup_assistant
@@ -7,7 +7,7 @@ moveit_setup_assistant_config:
   package_settings:
     author_name: mhubii
     author_email: [email protected]
-    generated_timestamp: 1690640668
+    generated_timestamp: 1729340711
   control_xacro:
     command:
       - position

diff --git a/lbr_moveit_config/med7_moveit_config/config/moveit_controllers.yaml b/lbr_moveit_config/med7_moveit_config/config/moveit_controllers.yaml
@@ -8,13 +8,13 @@ moveit_simple_controller_manager:
 
   joint_trajectory_controller:
     type: FollowJointTrajectory
-    action_ns: follow_joint_trajectory
-    default: true
     joints:
       - A1
       - A2
       - A3
       - A4
       - A5
       - A6
-      - A7
+      - A7
+    action_ns: follow_joint_trajectory
+    default: true
diff --git a/lbr_moveit_config/med7_moveit_config/package.xml b/lbr_moveit_config/med7_moveit_config/package.xml
@@ -8,11 +8,11 @@
   </description>
   <maintainer email="[email protected]">mhubii</maintainer>
 
-  <license>BSD</license>
+  <license>BSD-3-Clause</license>
 
   <url type="website">http://moveit.ros.org/</url>
-  <url type="bugtracker">https://github.com/ros-planning/moveit2/issues</url>
-  <url type="repository">https://github.com/ros-planning/moveit2</url>
+  <url type="bugtracker">https://github.com/moveit/moveit2/issues</url>
+  <url type="repository">https://github.com/moveit/moveit2</url>
 
   <author email="[email protected]">mhubii</author>