This repository has been archived by the owner on Dec 13, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6
added more arms #301
Draft
MikeWrock
wants to merge
2
commits into
main
Choose a base branch
from
multi-arm-mock-hw
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
added more arms #301
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,10 +6,22 @@ | |
<xacro:arg name="has_tool_changer" default="true"/> | ||
<xacro:arg name="use_pinch_links" default="true"/> | ||
<xacro:arg name="name" default=""/> | ||
<xacro:arg name="joint_limits_parameters_file" default=""/> | ||
<xacro:arg name="kinematics_parameters_file" default=""/> | ||
<xacro:arg name="physical_parameters_file" default=""/> | ||
<xacro:arg name="visual_parameters_file" default=""/> | ||
<!-- ur3e --> | ||
<xacro:arg name="ur3e_kinematics_parameters_file" default="$(find ur_description)/config/ur3e/default_kinematics.yaml"/> | ||
<xacro:arg name="ur3e_physical_parameters_file" default="$(find ur_description)/config/ur3e/physical_parameters.yaml"/> | ||
<xacro:arg name="ur3e_visual_parameters_file" default="$(find ur_description)/config/ur3e/visual_parameters.yaml"/> | ||
<!-- ur5e --> | ||
<xacro:arg name="ur5e_kinematics_parameters_file" default="$(find ur_description)/config/ur5e/default_kinematics.yaml"/> | ||
<xacro:arg name="ur5e_physical_parameters_file" default="$(find ur_description)/config/ur5e/physical_parameters.yaml"/> | ||
<xacro:arg name="ur5e_visual_parameters_file" default="$(find ur_description)/config/ur5e/visual_parameters.yaml"/> | ||
<!-- ur10e --> | ||
<xacro:arg name="ur10e_kinematics_parameters_file" default="$(find ur_description)/config/ur10e/default_kinematics.yaml"/> | ||
<xacro:arg name="ur10e_physical_parameters_file" default="$(find ur_description)/config/ur10e/physical_parameters.yaml"/> | ||
<xacro:arg name="ur10e_visual_parameters_file" default="$(find ur_description)/config/ur10e/visual_parameters.yaml"/> | ||
<!-- ur16e --> | ||
<xacro:arg name="ur16e_kinematics_parameters_file" default="$(find ur_description)/config/ur16e/default_kinematics.yaml"/> | ||
<xacro:arg name="ur16e_physical_parameters_file" default="$(find ur_description)/config/ur16e/physical_parameters.yaml"/> | ||
<xacro:arg name="ur16e_visual_parameters_file" default="$(find ur_description)/config/ur16e/visual_parameters.yaml"/> | ||
<xacro:arg name="headless_mode" default="false"/> | ||
<xacro:arg name="robot_ip" default="0.0.0.0"/> | ||
<xacro:arg name="use_tool_communication" default="false"/> | ||
|
@@ -23,13 +35,122 @@ | |
<xacro:include filename="$(find picknik_ur_base_config)/description/picknik_ur_attachments_macro.xacro"/> | ||
<xacro:include filename="$(arg environment_xacro)"/> | ||
|
||
<!-- Robot: contains robot description from the world frame to the tool frame --> | ||
<xacro:picknik_ur parent="world" child="tool0" initial_positions_file="$(arg initial_positions_file)"> | ||
<origin xyz="0 0 0" rpy="0 0 ${pi/2}" /> | ||
</xacro:picknik_ur> | ||
<xacro:include filename="$(find ur_description)/urdf/ur_macro.xacro" /> | ||
<xacro:property name="initial_positions_file" default="$(arg initial_positions_file)"/> | ||
|
||
<link name="world" /> | ||
<!-- FIRST ROBOT --> | ||
<!-- arm --> | ||
<xacro:ur_robot | ||
name="ur3e" | ||
tf_prefix="first_" | ||
parent="world" | ||
joint_limits_parameters_file="$(arg joint_limits_parameters_file)" | ||
kinematics_parameters_file="$(arg ur3e_kinematics_parameters_file)" | ||
physical_parameters_file="$(arg ur3e_physical_parameters_file)" | ||
visual_parameters_file="$(arg ur3e_visual_parameters_file)" | ||
use_fake_hardware="$(arg use_fake_hardware)" | ||
initial_positions="${xacro.load_yaml(initial_positions_file)}" | ||
headless_mode="$(arg headless_mode)" | ||
robot_ip="$(arg robot_ip)" | ||
script_filename="$(find ur_robot_driver)/resources/ros_control.urscript" | ||
output_recipe_filename="$(find ur_robot_driver)/resources/rtde_output_recipe.txt" | ||
input_recipe_filename="$(find ur_robot_driver)/resources/rtde_input_recipe.txt"> | ||
<origin xyz="0.0 -0.6 0" rpy="0 0 0" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @rwehner186 change the numbers here to place the arms in different locations |
||
</xacro:ur_robot> | ||
|
||
|
||
|
||
<xacro:picknik_ur_attachments | ||
prefix="first" | ||
parent="first_tool0" | ||
child="first_grasp_link" | ||
has_tool_changer="$(arg has_tool_changer)" | ||
/> | ||
|
||
<!-- SECOND ROBOT --> | ||
<!-- arm --> | ||
<xacro:ur_robot | ||
name="ur5e" | ||
tf_prefix="second_" | ||
parent="world" | ||
joint_limits_parameters_file="$(arg joint_limits_parameters_file)" | ||
kinematics_parameters_file="$(arg ur5e_kinematics_parameters_file)" | ||
physical_parameters_file="$(arg ur5e_physical_parameters_file)" | ||
visual_parameters_file="$(arg ur5e_visual_parameters_file)" | ||
use_fake_hardware="$(arg use_fake_hardware)" | ||
initial_positions="${xacro.load_yaml(initial_positions_file)}" | ||
headless_mode="$(arg headless_mode)" | ||
robot_ip="$(arg robot_ip)" | ||
script_filename="$(find ur_robot_driver)/resources/ros_control.urscript" | ||
output_recipe_filename="$(find ur_robot_driver)/resources/rtde_output_recipe.txt" | ||
input_recipe_filename="$(find ur_robot_driver)/resources/rtde_input_recipe.txt"> | ||
<origin xyz="0 -0.2 0" rpy="0 0 0" /> | ||
</xacro:ur_robot> | ||
|
||
<xacro:picknik_ur_attachments | ||
prefix="second" | ||
parent="second_tool0" | ||
child="second_grasp_link" | ||
has_tool_changer="$(arg has_tool_changer)" | ||
/> | ||
|
||
<!-- THIRD ROBOT --> | ||
<!-- arm --> | ||
<xacro:ur_robot | ||
name="ur10e" | ||
tf_prefix="third_" | ||
parent="world" | ||
joint_limits_parameters_file="$(arg joint_limits_parameters_file)" | ||
kinematics_parameters_file="$(arg ur10e_kinematics_parameters_file)" | ||
physical_parameters_file="$(arg ur10e_physical_parameters_file)" | ||
visual_parameters_file="$(arg ur10e_visual_parameters_file)" | ||
use_fake_hardware="$(arg use_fake_hardware)" | ||
initial_positions="${xacro.load_yaml(initial_positions_file)}" | ||
headless_mode="$(arg headless_mode)" | ||
robot_ip="$(arg robot_ip)" | ||
script_filename="$(find ur_robot_driver)/resources/ros_control.urscript" | ||
output_recipe_filename="$(find ur_robot_driver)/resources/rtde_output_recipe.txt" | ||
input_recipe_filename="$(find ur_robot_driver)/resources/rtde_input_recipe.txt"> | ||
<origin xyz="0 0.2 0" rpy="0 0 0" /> | ||
</xacro:ur_robot> | ||
|
||
<xacro:picknik_ur_attachments | ||
prefix="third" | ||
parent="third_tool0" | ||
child="third_grasp_link" | ||
has_tool_changer="$(arg has_tool_changer)" | ||
/> | ||
|
||
<!-- FOURTH ROBOT --> | ||
<!-- arm --> | ||
<xacro:ur_robot | ||
name="ur16e" | ||
tf_prefix="fourth_" | ||
parent="world" | ||
joint_limits_parameters_file="$(arg joint_limits_parameters_file)" | ||
kinematics_parameters_file="$(arg ur16e_kinematics_parameters_file)" | ||
physical_parameters_file="$(arg ur16e_physical_parameters_file)" | ||
visual_parameters_file="$(arg ur16e_visual_parameters_file)" | ||
use_fake_hardware="$(arg use_fake_hardware)" | ||
initial_positions="${xacro.load_yaml(initial_positions_file)}" | ||
headless_mode="$(arg headless_mode)" | ||
robot_ip="$(arg robot_ip)" | ||
script_filename="$(find ur_robot_driver)/resources/ros_control.urscript" | ||
output_recipe_filename="$(find ur_robot_driver)/resources/rtde_output_recipe.txt" | ||
input_recipe_filename="$(find ur_robot_driver)/resources/rtde_input_recipe.txt"> | ||
<origin xyz="0 0.6 0" rpy="0 0 0" /> | ||
</xacro:ur_robot> | ||
|
||
<xacro:picknik_ur_attachments | ||
prefix="fourth" | ||
parent="fourth_tool0" | ||
child="fourth_grasp_link" | ||
has_tool_changer="$(arg has_tool_changer)" | ||
/> | ||
|
||
<!-- Gripper and UR adapter and realsense camera --> | ||
<xacro:picknik_ur_attachments parent="tool0" child="grasp_link" has_tool_changer="$(arg has_tool_changer)"/> | ||
<xacro:picknik_ur_attachments parent="first_tool0" child="grasp_link" has_tool_changer="$(arg has_tool_changer)"/> | ||
|
||
<!-- Environment: contains scene geometry and external sensors, e.g. cameras --> | ||
<xacro:environment parent="world"/> | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rwehner186 change this (and the other lined below) to a different UR type if you don't want one of each. See:
https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/blob/rolling/urdf/ur.urdf.xacro#L8