Skip to content
Open
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
7 changes: 5 additions & 2 deletions robots/common/franka_arm.ros2_control.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
gazebo:=false
hand:=false
gazebo_effort:=false
arm_prefix:=''">
arm_prefix:=''
controller_yaml:='$(find franka_gazebo_bringup)/config/franka_gazebo_controllers.yaml' ">

<xacro:property name="arm_prefix_modified" value="${'' if arm_prefix == '' else arm_prefix + '_'}" />
<ros2_control name="${arm_prefix_modified}FrankaHardwareInterface" type="system">
Expand Down Expand Up @@ -104,7 +105,9 @@
<xacro:if value="${gazebo}">
<gazebo>
<plugin filename="franka_gz_ros2_control-system" name="gz_ros2_control::GZROS2ControlPlugin">
<parameters>$(find franka_gazebo_bringup)/config/franka_gazebo_controllers.yaml</parameters>

<parameters>${controller_yaml}</parameters>

</plugin>
</gazebo>
</xacro:if>
Expand Down
6 changes: 4 additions & 2 deletions robots/common/franka_robot.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
no_prefix:='false'
arm_prefix:=''
description_pkg:='franka_description'
connected_to:='base'">
connected_to:='base'
controller_yaml:='' ">

<xacro:include filename="$(find franka_description)/robots/common/utils.xacro" />

Expand Down Expand Up @@ -158,12 +159,13 @@
<xacro:franka_arm_ros2_control
arm_id="${arm_id}"
robot_ip="${robot_ip}"
use_fake_hardware="${use_fake_hardware}"
use_fake_hardware="${use_fake_hardware}"
fake_sensor_commands="${fake_sensor_commands}"
gazebo="${gazebo}"
hand="${hand}"
gazebo_effort="${gazebo_effort}"
arm_prefix="${arm_prefix}"
controller_yaml="${controller_yaml}"
/>
</xacro:if>

Expand Down