From ec3dd6c81faac2de38eb78f6a05647c3ed5f2578 Mon Sep 17 00:00:00 2001
From: sharpe-developer <sharpe.developer@gmail.com>
Date: Tue, 10 Mar 2020 10:04:38 -0700
Subject: [PATCH] Utilize ur_e configs for urX_e_moveit_config

---
 ur10_e_moveit_config/launch/planning_context.launch | 4 ++--
 ur10_e_moveit_config/package.xml                    | 2 +-
 ur3_e_moveit_config/launch/planning_context.launch  | 4 ++--
 ur3_e_moveit_config/package.xml                     | 2 +-
 ur5_e_moveit_config/launch/planning_context.launch  | 4 ++--
 ur5_e_moveit_config/package.xml                     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ur10_e_moveit_config/launch/planning_context.launch b/ur10_e_moveit_config/launch/planning_context.launch
index a87b942d1..3a02cad2c 100644
--- a/ur10_e_moveit_config/launch/planning_context.launch
+++ b/ur10_e_moveit_config/launch/planning_context.launch
@@ -8,8 +8,8 @@
 
   <!-- Load universal robot description format (URDF) -->
   <group if="$(arg load_robot_description)">
-    <param unless="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" />
-    <param if="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur10_joint_limited_robot.urdf.xacro'" />
+    <param unless="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_e_description)/urdf/ur10e_robot.urdf.xacro'" />
+    <param if="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_e_description)/urdf/ur10e_joint_limited_robot.urdf.xacro'" />
   </group>
 
   <!-- The semantic description that corresponds to the URDF -->
diff --git a/ur10_e_moveit_config/package.xml b/ur10_e_moveit_config/package.xml
index bceb8039d..6c133c688 100644
--- a/ur10_e_moveit_config/package.xml
+++ b/ur10_e_moveit_config/package.xml
@@ -25,7 +25,7 @@
   <exec_depend>joint_state_publisher</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>
   <exec_depend>xacro</exec_depend>
-  <depend>ur_description</depend>
+  <depend>ur_e_description</depend>
 
   <test_depend>roslaunch</test_depend>
   <buildtool_depend>catkin</buildtool_depend>
diff --git a/ur3_e_moveit_config/launch/planning_context.launch b/ur3_e_moveit_config/launch/planning_context.launch
index d1a1618ac..7f270e681 100644
--- a/ur3_e_moveit_config/launch/planning_context.launch
+++ b/ur3_e_moveit_config/launch/planning_context.launch
@@ -8,8 +8,8 @@
 
   <!-- Load universal robot description format (URDF) -->
   <group if="$(arg load_robot_description)">
-    <param unless="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur3_robot.urdf.xacro'" />
-    <param if="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur3_joint_limited_robot.urdf.xacro'" />
+    <param unless="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_e_description)/urdf/ur3e_robot.urdf.xacro'" />
+    <param if="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_e_description)/urdf/ur3e_joint_limited_robot.urdf.xacro'" />
   </group>
 
   <!-- The semantic description that corresponds to the URDF -->
diff --git a/ur3_e_moveit_config/package.xml b/ur3_e_moveit_config/package.xml
index bfdb3f9bc..14ebe65b0 100644
--- a/ur3_e_moveit_config/package.xml
+++ b/ur3_e_moveit_config/package.xml
@@ -25,7 +25,7 @@
   <exec_depend>joint_state_publisher</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>
   <exec_depend>xacro</exec_depend>
-  <depend>ur_description</depend>
+  <depend>ur_e_description</depend>
 
   <test_depend>roslaunch</test_depend>
   <buildtool_depend>catkin</buildtool_depend>
diff --git a/ur5_e_moveit_config/launch/planning_context.launch b/ur5_e_moveit_config/launch/planning_context.launch
index 63109be0a..d46318299 100644
--- a/ur5_e_moveit_config/launch/planning_context.launch
+++ b/ur5_e_moveit_config/launch/planning_context.launch
@@ -8,8 +8,8 @@
 
   <!-- Load universal robot description format (URDF) -->
   <group if="$(arg load_robot_description)">
-    <param unless="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur5_robot.urdf.xacro'" />
-    <param if="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur5_joint_limited_robot.urdf.xacro'" />
+    <param unless="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_e_description)/urdf/ur5e_robot.urdf.xacro'" />
+    <param if="$(arg limited)" name="$(arg robot_description)" command="$(find xacro)/xacro --inorder '$(find ur_e_description)/urdf/ur5e_joint_limited_robot.urdf.xacro'" />
   </group>
 
   <!-- The semantic description that corresponds to the URDF -->
diff --git a/ur5_e_moveit_config/package.xml b/ur5_e_moveit_config/package.xml
index f81c4cc1d..7316e51be 100644
--- a/ur5_e_moveit_config/package.xml
+++ b/ur5_e_moveit_config/package.xml
@@ -25,7 +25,7 @@
   <exec_depend>joint_state_publisher</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>
   <exec_depend>xacro</exec_depend>
-  <depend>ur_description</depend>
+  <depend>ur_e_description</depend>
 
   <test_depend>roslaunch</test_depend>
   <buildtool_depend>catkin</buildtool_depend>