-
Notifications
You must be signed in to change notification settings - Fork 311
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #199 in SWDEV/franka_ros from refactor-franka-desc…
…ription-to-support-fr3 to develop * commit '7e8be0dd968f6c4b80aa54d4f6bcc06bd0e7284f': fix cartesian pose example generalize over arm_id in franka_example_controllers.yaml CHANGE: Parameterize tests for both panda + fr3 FIX: Make <arg> in `franka_robot` macro property CHANGE: Extract <limits> & <safety_controller> into custom macro update CHANGELOG.md allow selecting fr3 urdf for launch files define joint limits for fr3 load joint limits directly in top-level URDf use correct urdfs in launch files refactor franka_description to support for fr3
- Loading branch information
Showing
39 changed files
with
462 additions
and
331 deletions.
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
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
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
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
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
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
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
2 changes: 1 addition & 1 deletion
2
franka_description/robots/hand.xacro → ...scription/robots/common/franka_hand.xacro
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
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 |
---|---|---|
@@ -0,0 +1,93 @@ | ||
<?xml version='1.0' encoding='utf-8'?> | ||
<robot xmlns:xacro="http://www.ros.org/wiki/xacro"> | ||
<xacro:macro name="franka_robot" params="arm_id joint_limits"> | ||
<!-- Name of this panda --> | ||
<!-- Should a franka_gripper be mounted at the flange?" --> | ||
<xacro:arg name="hand" default="false" /> | ||
<!-- Positional offset between $(arm_id)_hand -> $(arm_id)_hand_tcp [m]. Only used when hand:=true --> | ||
<xacro:arg name="tcp_xyz" default="0 0 0.1034" /> | ||
<!-- Rotational offset between $(arm_id)_hand -> $(arm_id)_hand_tcp [rad]. Only used when hand:=true --> | ||
<xacro:arg name="tcp_rpy" default="0 0 0" /> | ||
<!-- Is the robot being simulated in gazebo?" --> | ||
<xacro:arg name="gazebo" default="false" /> | ||
|
||
<xacro:include filename="$(find franka_description)/robots/common/utils.xacro" /> | ||
<xacro:include filename="$(find franka_description)/robots/common/franka_arm.xacro" /> | ||
|
||
<xacro:franka_arm arm_id="${arm_id}" safety_distance="0.03" gazebo="$(arg gazebo)" joint_limits="${joint_limits}"/> | ||
|
||
<xacro:if value="$(arg hand)"> | ||
<xacro:include filename="$(find franka_description)/robots/common/franka_hand.xacro"/> | ||
<xacro:franka_hand | ||
arm_id="$(arg arm_id)" | ||
rpy="0 0 ${-pi/4}" | ||
tcp_xyz="$(arg tcp_xyz)" | ||
tcp_rpy="$(arg tcp_rpy)" | ||
connected_to="$(arg arm_id)_link8" | ||
safety_distance="0.03" | ||
gazebo="$(arg gazebo)" | ||
/> | ||
</xacro:if> | ||
|
||
<!-- Define additional Gazebo tags --> | ||
<xacro:if value="$(arg gazebo)"> | ||
|
||
<xacro:arg name="xyz" default="0 0 0" /> | ||
<xacro:arg name="rpy" default="0 0 0" /> | ||
|
||
<!-- Gazebo requires a joint to a link called "world" for statically mounted robots --> | ||
<link name="world" /> | ||
<joint name="world_joint" type="fixed"> | ||
<origin xyz="$(arg xyz)" rpy="$(arg rpy)" /> | ||
<parent link="world" /> | ||
<child link="$(arg arm_id)_link0" /> | ||
</joint> | ||
|
||
<xacro:gazebo-joint joint="${arm_id}_joint1" transmission="hardware_interface/PositionJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint2" transmission="hardware_interface/PositionJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint3" transmission="hardware_interface/PositionJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint4" transmission="hardware_interface/PositionJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint5" transmission="hardware_interface/PositionJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint6" transmission="hardware_interface/PositionJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint7" transmission="hardware_interface/PositionJointInterface" /> | ||
|
||
<xacro:gazebo-joint joint="${arm_id}_joint1" transmission="hardware_interface/VelocityJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint2" transmission="hardware_interface/VelocityJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint3" transmission="hardware_interface/VelocityJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint4" transmission="hardware_interface/VelocityJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint5" transmission="hardware_interface/VelocityJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint6" transmission="hardware_interface/VelocityJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint7" transmission="hardware_interface/VelocityJointInterface" /> | ||
|
||
<xacro:gazebo-joint joint="${arm_id}_joint1" transmission="hardware_interface/EffortJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint2" transmission="hardware_interface/EffortJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint3" transmission="hardware_interface/EffortJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint4" transmission="hardware_interface/EffortJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint5" transmission="hardware_interface/EffortJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint6" transmission="hardware_interface/EffortJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_joint7" transmission="hardware_interface/EffortJointInterface" /> | ||
|
||
<xacro:transmission-franka-state arm_id="${arm_id}" /> | ||
<xacro:transmission-franka-model arm_id="${arm_id}" | ||
root="${arm_id}_joint1" | ||
tip="${arm_id}_joint8" | ||
/> | ||
|
||
<xacro:if value="$(arg hand)"> | ||
<xacro:gazebo-joint joint="${arm_id}_finger_joint1" transmission="hardware_interface/EffortJointInterface" /> | ||
<xacro:gazebo-joint joint="${arm_id}_finger_joint2" transmission="hardware_interface/EffortJointInterface" /> | ||
<!-- Friction specific material for Rubber/Rubber contact --> | ||
<xacro:gazebo-friction link="${arm_id}_leftfinger" mu="1.13" /> | ||
<xacro:gazebo-friction link="${arm_id}_rightfinger" mu="1.13" /> | ||
</xacro:if> | ||
|
||
<gazebo> | ||
<plugin name="gazebo_ros_control" filename="libgazebo_ros_control.so"> | ||
<controlPeriod>0.001</controlPeriod> | ||
<robotSimType>franka_gazebo/FrankaHWSim</robotSimType> | ||
</plugin> | ||
<self_collide>true</self_collide> | ||
</gazebo> | ||
</xacro:if> | ||
</xacro:macro> | ||
</robot> |
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 |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="hand"> | ||
<xacro:include filename="$(find franka_description)/robots/common/utils.xacro" /> | ||
<xacro:include filename="franka_hand.xacro"/> | ||
<xacro:franka_hand arm_id="panda" safety_distance="0.03"/> | ||
</robot> |
File renamed without changes.
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
36 changes: 36 additions & 0 deletions
36
franka_description/robots/dual_panda/dual_panda_example.urdf.xacro
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 |
---|---|---|
@@ -0,0 +1,36 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="panda"> | ||
<xacro:arg name="arm_id_1" default="panda_1" /> | ||
<xacro:arg name="arm_id_2" default="panda_2" /> | ||
|
||
<xacro:include filename="$(find franka_description)/robots/common/franka_arm.xacro"/> | ||
<xacro:include filename="$(find franka_description)/robots/common/franka_hand.xacro"/> | ||
|
||
<!-- box shaped table as base for the 2 Pandas --> | ||
<link name="base"> | ||
<visual> | ||
<origin xyz="0 0 0.5" rpy="0 0 0"/> | ||
<geometry> | ||
<box size="1 2 1" /> | ||
</geometry> | ||
<material name="White"> | ||
<color rgba="1.0 1.0 1.0 1.0"/> | ||
</material> | ||
</visual> | ||
<collision> | ||
<origin xyz="0 0 0.5" rpy="0 0 0"/> | ||
<geometry> | ||
<box size="1 2 1" /> | ||
</geometry> | ||
</collision> | ||
</link> | ||
|
||
<!-- right arm with gripper --> | ||
<xacro:franka_arm arm_id="$(arg arm_id_1)" connected_to="base" xyz="0 -0.5 1" safety_distance="0.03" joint_limits="${xacro.load_yaml('$(find franka_description)/robots/panda/joint_limits.yaml')}"/> | ||
<xacro:franka_hand arm_id="$(arg arm_id_1)" rpy="0 0 ${-pi/4}" connected_to="$(arg arm_id_1)_link8" safety_distance="0.03"/> | ||
|
||
<!-- left arm with gripper --> | ||
<xacro:franka_arm arm_id="$(arg arm_id_2)" connected_to="base" xyz="0 0.5 1" safety_distance="0.03" joint_limits="${xacro.load_yaml('$(find franka_description)/robots/panda/joint_limits.yaml')}"/> | ||
<xacro:franka_hand arm_id="$(arg arm_id_2)" rpy="0 0 ${-pi/4}" connected_to="$(arg arm_id_2)_link8" safety_distance="0.03"/> | ||
|
||
</robot> |
Oops, something went wrong.