Default path to ur_client_library urscript (#316) (#553)

mergify[bot] · livanov93 · web-flow · commit 166d43e26bfc · 2023-05-10T15:28:53.000+02:00
* Change default path for urscript for headless mode.

* Replace urscript path also in newer ur_robot_driver launchfile

Co-authored-by: livanov93 &lt;lovro.ivanov@gmail.com&gt;
diff --git a/ur_bringup/launch/ur_control.launch.py b/ur_bringup/launch/ur_control.launch.py
@@ -82,7 +82,7 @@ def launch_setup(context, *args, **kwargs):
         [FindPackageShare(description_package), "config", ur_type, "visual_parameters.yaml"]
     )
     script_filename = PathJoinSubstitution(
-        [FindPackageShare("ur_robot_driver"), "resources", "ros_control.urscript"]
+        [FindPackageShare("ur_client_library"), "resources", "external_control.urscript"]
     )
     input_recipe_filename = PathJoinSubstitution(
         [FindPackageShare("ur_robot_driver"), "resources", "rtde_input_recipe.txt"]
diff --git a/ur_robot_driver/launch/ur_control.launch.py b/ur_robot_driver/launch/ur_control.launch.py
@@ -85,7 +85,7 @@ def launch_setup(context, *args, **kwargs):
         [FindPackageShare(description_package), "config", ur_type, "visual_parameters.yaml"]
     )
     script_filename = PathJoinSubstitution(
-        [FindPackageShare("ur_robot_driver"), "resources", "ros_control.urscript"]
+        [FindPackageShare("ur_client_library"), "resources", "external_control.urscript"]
     )
     input_recipe_filename = PathJoinSubstitution(
         [FindPackageShare("ur_robot_driver"), "resources", "rtde_input_recipe.txt"]

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ def launch_setup(context, args, *kwargs):`
`82`	`82`	`[FindPackageShare(description_package), "config", ur_type, "visual_parameters.yaml"]`
`83`	`83`	`)`
`84`	`84`	`script_filename = PathJoinSubstitution(`
`85`		`- [FindPackageShare("ur_robot_driver"), "resources", "ros_control.urscript"]`
	`85`	`+ [FindPackageShare("ur_client_library"), "resources", "external_control.urscript"]`
`86`	`86`	`)`
`87`	`87`	`input_recipe_filename = PathJoinSubstitution(`
`88`	`88`	`[FindPackageShare("ur_robot_driver"), "resources", "rtde_input_recipe.txt"]`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ def launch_setup(context, args, *kwargs):`
`85`	`85`	`[FindPackageShare(description_package), "config", ur_type, "visual_parameters.yaml"]`
`86`	`86`	`)`
`87`	`87`	`script_filename = PathJoinSubstitution(`
`88`		`- [FindPackageShare("ur_robot_driver"), "resources", "ros_control.urscript"]`
	`88`	`+ [FindPackageShare("ur_client_library"), "resources", "external_control.urscript"]`
`89`	`89`	`)`
`90`	`90`	`input_recipe_filename = PathJoinSubstitution(`
`91`	`91`	`[FindPackageShare("ur_robot_driver"), "resources", "rtde_input_recipe.txt"]`