Merge pull request #194 from clearpathrobotics/rc/humble/1.3

Humble 1.3 Release

Author: tonybaltovski

clearpath_generator_common/clearpath_generator_common/description/manipulators.py

@@ -71,6 +71,7 @@ def __init__(self, manipulator: BaseManipulator) -> None:
                 self.NAME: manipulator.name,
                 self.PARENT: manipulator.parent,
             }
+            self.parameters.update(manipulator.get_urdf_parameters())
 
         @property
         def name(self) -> str:
@@ -123,7 +124,6 @@ class UniversalRobotsDescription(ArmDescription):
         def __init__(self, arm: BaseArm) -> None:
             super().__init__(arm)
             self.parameters.pop(self.PORT)
-            self.parameters.update(arm.get_urdf_parameters())
 
     class FrankaDescription(ArmDescription):
         IP = Franka.IP_ADDRESS

clearpath_generator_common/clearpath_generator_common/launch/generator.py

@@ -82,6 +82,7 @@ def __init__(self,
                 ('use_sim_time', 'false'),
                 ('namespace', self.namespace),
                 ('launch_moveit', str(self.clearpath_config.manipulators.moveit.enable).lower()),
+                ('delay_moveit', str(self.clearpath_config.manipulators.moveit.delay))
             ]
         )
 

clearpath_manipulators/launch/manipulators.launch.py

@@ -80,11 +80,25 @@ def generate_launch_description():
         description='Launch MoveIt'
     )
 
+    arg_control_delay = DeclareLaunchArgument(
+        'control_delay',
+        default_value='0.0',
+        description='Control launch delay in seconds.'
+    )
+
+    arg_moveit_delay = DeclareLaunchArgument(
+        'moveit_delay',
+        default_value='1.0',
+        description='MoveIt launch delay in seconds.'
+    )
+
     # Launch Configurations
     setup_path = LaunchConfiguration('setup_path')
     use_sim_time = LaunchConfiguration('use_sim_time')
     namespace = LaunchConfiguration('namespace')
     launch_moveit = LaunchConfiguration('launch_moveit')
+    control_delay = LaunchConfiguration('control_delay')
+    moveit_delay = LaunchConfiguration('moveit_delay')
 
     # Launch files
     launch_file_manipulators_description = PathJoinSubstitution([
@@ -126,6 +140,11 @@ def generate_launch_description():
         ]
     )
 
+    control_delayed = TimerAction(
+        period=control_delay,
+        actions=[group_manipulators_action]
+    )
+
     # Launch MoveIt
     moveit_node_action = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(launch_file_moveit),
@@ -137,7 +156,7 @@ def generate_launch_description():
     )
 
     moveit_delayed = TimerAction(
-        period=10.0,
+        period=moveit_delay,
         actions=[moveit_node_action]
     )
 
@@ -146,6 +165,8 @@ def generate_launch_description():
     ld.add_action(arg_use_sim_time)
     ld.add_action(arg_namespace)
     ld.add_action(arg_launch_moveit)
-    ld.add_action(group_manipulators_action)
+    ld.add_action(arg_control_delay)
+    ld.add_action(arg_moveit_delay)
+    ld.add_action(control_delayed)
     ld.add_action(moveit_delayed)
     return ld