diff --git a/ur_e_description/launch/ur10e_upload.launch b/ur_e_description/launch/ur10e_upload.launch index c9f8bbddd..71642ead0 100644 --- a/ur_e_description/launch/ur10e_upload.launch +++ b/ur_e_description/launch/ur10e_upload.launch @@ -1,7 +1,8 @@ - - - + + + + diff --git a/ur_e_description/launch/ur3e_upload.launch b/ur_e_description/launch/ur3e_upload.launch index 67132551f..517283191 100644 --- a/ur_e_description/launch/ur3e_upload.launch +++ b/ur_e_description/launch/ur3e_upload.launch @@ -1,7 +1,9 @@ - - - + + + + + diff --git a/ur_e_description/launch/ur5e_upload.launch b/ur_e_description/launch/ur5e_upload.launch index f2e4a30e1..3c564bbab 100644 --- a/ur_e_description/launch/ur5e_upload.launch +++ b/ur_e_description/launch/ur5e_upload.launch @@ -1,7 +1,8 @@ - - - + + + + diff --git a/ur_e_description/urdf/ur.transmission.xacro b/ur_e_description/urdf/ur.transmission.xacro index 4b2d12630..c9c55ca06 100644 --- a/ur_e_description/urdf/ur.transmission.xacro +++ b/ur_e_description/urdf/ur.transmission.xacro @@ -1,12 +1,12 @@ - + transmission_interface/SimpleTransmission - hardware_interface/PositionJointInterface + ${hw_interface} 1 @@ -16,7 +16,7 @@ transmission_interface/SimpleTransmission - hardware_interface/PositionJointInterface + ${hw_interface} 1 @@ -26,7 +26,7 @@ transmission_interface/SimpleTransmission - hardware_interface/PositionJointInterface + ${hw_interface} 1 @@ -36,7 +36,7 @@ transmission_interface/SimpleTransmission - hardware_interface/PositionJointInterface + ${hw_interface} 1 @@ -46,7 +46,7 @@ transmission_interface/SimpleTransmission - hardware_interface/PositionJointInterface + ${hw_interface} 1 @@ -56,7 +56,7 @@ transmission_interface/SimpleTransmission - hardware_interface/PositionJointInterface + ${hw_interface} 1 diff --git a/ur_e_description/urdf/ur10e.urdf.xacro b/ur_e_description/urdf/ur10e.urdf.xacro index 9cd24e786..5710cf9b5 100644 --- a/ur_e_description/urdf/ur10e.urdf.xacro +++ b/ur_e_description/urdf/ur10e.urdf.xacro @@ -339,7 +339,7 @@ - + diff --git a/ur_e_description/urdf/ur10e_joint_limited_robot.urdf.xacro b/ur_e_description/urdf/ur10e_joint_limited_robot.urdf.xacro index 1959d2f8c..7c421650b 100644 --- a/ur_e_description/urdf/ur10e_joint_limited_robot.urdf.xacro +++ b/ur_e_description/urdf/ur10e_joint_limited_robot.urdf.xacro @@ -2,6 +2,8 @@ + + @@ -16,6 +18,7 @@ wrist_1_lower_limit="${-pi}" wrist_1_upper_limit="${pi}" wrist_2_lower_limit="${-pi}" wrist_2_upper_limit="${pi}" wrist_3_lower_limit="${-pi}" wrist_3_upper_limit="${pi}" + transmission_hw_interface="$(arg transmission_hw_interface)" /> diff --git a/ur_e_description/urdf/ur10e_robot.urdf.xacro b/ur_e_description/urdf/ur10e_robot.urdf.xacro index 3babbe7b0..25c484909 100644 --- a/ur_e_description/urdf/ur10e_robot.urdf.xacro +++ b/ur_e_description/urdf/ur10e_robot.urdf.xacro @@ -2,6 +2,8 @@ + + @@ -9,7 +11,9 @@ - + diff --git a/ur_e_description/urdf/ur3e.urdf.xacro b/ur_e_description/urdf/ur3e.urdf.xacro index fc8fe1da1..0ac0b45f1 100644 --- a/ur_e_description/urdf/ur3e.urdf.xacro +++ b/ur_e_description/urdf/ur3e.urdf.xacro @@ -338,7 +338,7 @@ - + diff --git a/ur_e_description/urdf/ur3e_joint_limited_robot.urdf.xacro b/ur_e_description/urdf/ur3e_joint_limited_robot.urdf.xacro index 88a579976..3215c7e92 100644 --- a/ur_e_description/urdf/ur3e_joint_limited_robot.urdf.xacro +++ b/ur_e_description/urdf/ur3e_joint_limited_robot.urdf.xacro @@ -2,6 +2,8 @@ + + @@ -16,6 +18,7 @@ wrist_1_lower_limit="${-pi}" wrist_1_upper_limit="${pi}" wrist_2_lower_limit="${-pi}" wrist_2_upper_limit="${pi}" wrist_3_lower_limit="${-pi}" wrist_3_upper_limit="${pi}" + transmission_hw_interface="$(arg transmission_hw_interface)" /> diff --git a/ur_e_description/urdf/ur3e_robot.urdf.xacro b/ur_e_description/urdf/ur3e_robot.urdf.xacro index 9a3036462..850f8e190 100644 --- a/ur_e_description/urdf/ur3e_robot.urdf.xacro +++ b/ur_e_description/urdf/ur3e_robot.urdf.xacro @@ -2,6 +2,8 @@ + + @@ -9,7 +11,9 @@ - + diff --git a/ur_e_description/urdf/ur5e.urdf.xacro b/ur_e_description/urdf/ur5e.urdf.xacro index 460ba61a5..cba90721b 100644 --- a/ur_e_description/urdf/ur5e.urdf.xacro +++ b/ur_e_description/urdf/ur5e.urdf.xacro @@ -355,7 +355,7 @@ - + diff --git a/ur_e_description/urdf/ur5e_joint_limited_robot.urdf.xacro b/ur_e_description/urdf/ur5e_joint_limited_robot.urdf.xacro index 7d7489247..7af909d24 100644 --- a/ur_e_description/urdf/ur5e_joint_limited_robot.urdf.xacro +++ b/ur_e_description/urdf/ur5e_joint_limited_robot.urdf.xacro @@ -2,6 +2,8 @@ + + @@ -16,6 +18,7 @@ wrist_1_lower_limit="${-pi}" wrist_1_upper_limit="${pi}" wrist_2_lower_limit="${-pi}" wrist_2_upper_limit="${pi}" wrist_3_lower_limit="${-pi}" wrist_3_upper_limit="${pi}" + transmission_hw_interface="$(arg transmission_hw_interface)" /> diff --git a/ur_e_description/urdf/ur5e_robot.urdf.xacro b/ur_e_description/urdf/ur5e_robot.urdf.xacro index ada88a192..07c44fec5 100644 --- a/ur_e_description/urdf/ur5e_robot.urdf.xacro +++ b/ur_e_description/urdf/ur5e_robot.urdf.xacro @@ -2,6 +2,8 @@ + + @@ -9,7 +11,9 @@ - +