Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tool frame #97

Merged
merged 2 commits into from
Jun 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
<robot name="gen3_lite_2f_gripper" xmlns:xacro="http://ros.org/wiki/xacro">
<xacro:macro name="load_gripper" params="parent prefix">

<!-- Tool frame used by the arm -->
<link name="${prefix}tool_frame"/>
<joint name="${prefix}tool_frame_joint" type="fixed">
<origin xyz="0 0 0.130" rpy="0 0 1.57079632679" />
<parent link="${parent}" />
<child link="${prefix}tool_frame" />
<axis xyz="0 0 0" />
</joint>

<!-- Gripper description -->
<joint name="${prefix}gripper_base_joint" type="fixed">
<origin xyz="0 0 0" rpy="0 0 0" />
<parent link="${parent}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,15 @@
</xacro:macro>

<xacro:macro name="robotiq_arg2f_140" params="parent prefix">
<!-- Tool frame used by the arm -->
<link name="${prefix}tool_frame"/>
<joint name="${prefix}tool_frame_joint" type="fixed">
<origin xyz="0 0 0.20" rpy="0 0 0" />
<parent link="${parent}" />
<child link="${prefix}tool_frame" />
<axis xyz="0 0 0" />
</joint>
<!-- Gripper description -->
<xacro:robotiq_arg2f_base_link prefix="${prefix}" parent="${parent}"/>
<xacro:finger_links prefix="${prefix}" fingerprefix="left" stroke="140"/>
<xacro:finger_links prefix="${prefix}" fingerprefix="right" stroke="140"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,15 @@

<!-- Initialization of all joints and links -->
<xacro:macro name="robotiq_arg2f_85" params="prefix parent">
<!-- Tool frame used by the arm -->
<link name="${prefix}tool_frame"/>
<joint name="${prefix}tool_frame_joint" type="fixed">
<origin xyz="0 0 0.120" rpy="0 0 0" />
<parent link="${parent}" />
<child link="${prefix}tool_frame" />
<axis xyz="0 0 0" />
</joint>
<!-- Gripper description -->
<xacro:robotiq_arg2f_base_link prefix="${prefix}" parent="${parent}"/>
<xacro:finger_links prefix="${prefix}" fingerprefix="left" stroke="85"/>
<xacro:finger_links prefix="${prefix}" fingerprefix="right" stroke="85"/>
Expand Down
6 changes: 5 additions & 1 deletion kortex_description/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,8 @@ For example:
<code><param name="robot_description" command="$(find xacro)/xacro --inorder $(find kortex_description)/robots/gen3_robotiq_2f_85.xacro sim:=true"\/></code>

- To load the Gen3 lite description, you would put in your launch file :
<code><param name="robot_description" command="$(find xacro)/xacro --inorder $(find kortex_description)/robots/gen3_lite_gen3_lite_2f.xacro sim:=false"\/></code>
<code><param name="robot_description" command="$(find xacro)/xacro --inorder $(find kortex_description)/robots/gen3_lite_gen3_lite_2f.xacro sim:=false"\/></code>

## Tool frame

The `tool_frame` link refers to the tool frame used by the arm when it reports end effector position feedback.
10 changes: 10 additions & 0 deletions kortex_description/robots/kortex_robot.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@
<!-- last_arm_link is defined in "$(find kortex_description)/arms/${arm}/urdf/${arm}_macro.xacro" -->
<xacro:load_gripper parent="${prefix}${last_arm_link}" prefix="${prefix}"/>
</xacro:unless>
<!-- If no gripper, define tool frame here -->
<xacro:if value="${not gripper}">
<link name="${prefix}tool_frame"/>
<joint name="${prefix}tool_frame_joint" type="fixed">
<origin xyz="0 0 0" rpy="0 0 0" />
<parent link="${prefix}${last_arm_link}" />
<child link="${prefix}tool_frame" />
<axis xyz="0 0 0" />
</joint>
</xacro:if>

<!-- Load the Gazebo transmissions and gazebo_ros_control plugin -->
<xacro:if value="${sim}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<joint name="joint_5" />
<joint name="joint_6" />
<joint name="end_effector" />
<joint name="tool_frame_joint" />
</group>
<group name="gripper">
<link name="gripper_base_link" />
Expand Down Expand Up @@ -63,7 +64,7 @@
<joint name="right_finger_tip_joint" value="0" />
</group_state>
<!--END EFFECTOR: Purpose: Represent information about an end effector.-->
<end_effector name="end_effector" parent_link="dummy_link" group="arm" />
<end_effector name="end_effector" parent_link="tool_frame" group="arm" />
<!--PASSIVE JOINT: Purpose: this element is used to mark joints that are not actuated-->
<passive_joint name="right_finger_tip_joint" />
<passive_joint name="left_finger_tip_joint" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<joint name="joint_5" />
<joint name="joint_6" />
<joint name="end_effector" />
<joint name="tool_frame_joint" />
</group>
<!--GROUP STATES: Purpose: Define a named state for a particular group, in terms of joint values. This is useful to define states like 'folded arms'-->
<group_state name="home" group="arm">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<joint name="joint_6" />
<joint name="joint_7" />
<joint name="end_effector" />
<joint name="tool_frame_joint" />
</group>
<!--GROUP STATES: Purpose: Define a named state for a particular group, in terms of joint values. This is useful to define states like 'folded arms'-->
<group_state name="home" group="arm">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<joint name="joint_5" />
<joint name="joint_6" />
<joint name="end_effector" />
<joint name="tool_frame_joint" />
</group>
<group name="gripper">
<joint name="gripper_base_joint" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<joint name="joint_6" />
<joint name="joint_7" />
<joint name="end_effector" />
<joint name="tool_frame_joint" />
</group>
<group name="gripper">
<joint name="gripper_base_joint" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<joint name="joint_5" />
<joint name="joint_6" />
<joint name="end_effector" />
<joint name="tool_frame_joint" />
</group>
<group name="gripper">
<joint name="gripper_base_joint" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<joint name="joint_6" />
<joint name="joint_7" />
<joint name="end_effector" />
<joint name="tool_frame_joint" />
</group>
<group name="gripper">
<joint name="gripper_base_joint" />
Expand Down