-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update FANUC launch file and cleanup of deprecated XML files (#120)
Co-authored-by: Henning Kayser <henningkayser@picknik.ai>
- Loading branch information
1 parent
01f018f
commit 394a3c6
Showing
34 changed files
with
521 additions
and
1,097 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 was deleted.
Oops, something went wrong.
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,55 @@ | ||
<?xml version="1.0"?> | ||
<robot xmlns:xacro="http://www.ros.org/wiki/xacro"> | ||
|
||
<xacro:macro name="fanuc_ros2_control" params="name initial_positions_file"> | ||
<xacro:property name="initial_positions" value="${load_yaml(initial_positions_file)['initial_positions']}"/> | ||
|
||
<ros2_control name="${name}" type="system"> | ||
<hardware> | ||
<plugin>fake_components/GenericSystem</plugin> | ||
</hardware> | ||
<joint name="joint_1"> | ||
<command_interface name="position"/> | ||
<state_interface name="position"> | ||
<param name="initial_value">${initial_positions['joint_1']}</param> | ||
</state_interface> | ||
<state_interface name="velocity"/> | ||
</joint> | ||
<joint name="joint_2"> | ||
<command_interface name="position"/> | ||
<state_interface name="position"> | ||
<param name="initial_value">${initial_positions['joint_2']}</param> | ||
</state_interface> | ||
<state_interface name="velocity"/> | ||
</joint> | ||
<joint name="joint_3"> | ||
<command_interface name="position"/> | ||
<state_interface name="position"> | ||
<param name="initial_value">${initial_positions['joint_3']}</param> | ||
</state_interface> | ||
<state_interface name="velocity"/> | ||
</joint> | ||
<joint name="joint_4"> | ||
<command_interface name="position"/> | ||
<state_interface name="position"> | ||
<param name="initial_value">${initial_positions['joint_4']}</param> | ||
</state_interface> | ||
<state_interface name="velocity"/> | ||
</joint> | ||
<joint name="joint_5"> | ||
<command_interface name="position"/> | ||
<state_interface name="position"> | ||
<param name="initial_value">${initial_positions['joint_5']}</param> | ||
</state_interface> | ||
<state_interface name="velocity"/> | ||
</joint> | ||
<joint name="joint_6"> | ||
<command_interface name="position"/> | ||
<state_interface name="position"> | ||
<param name="initial_value">${initial_positions['joint_6']}</param> | ||
</state_interface> | ||
<state_interface name="velocity"/> | ||
</joint> | ||
</ros2_control> | ||
</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,12 @@ | ||
<?xml version="1.0"?> | ||
<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="fanuc"> | ||
<xacro:arg name="initial_positions_file" default="initial_positions.yaml" /> | ||
|
||
<!-- Import panda urdf file --> | ||
<xacro:include filename="$(find moveit_resources_fanuc_description)/urdf/fanuc.urdf" /> | ||
|
||
<!-- Import fanuc ros2_control description --> | ||
<xacro:include filename="fanuc.ros2_control.xacro" /> | ||
|
||
<xacro:fanuc_ros2_control name="FanucFakeSystem" initial_positions_file="$(arg initial_positions_file)"/> | ||
</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,8 @@ | ||
# Default initial positions for the FANUC arm's ros2_control fake system | ||
initial_positions: | ||
joint_1: 0.0 | ||
joint_2: 0.0 | ||
joint_3: 0.0 | ||
joint_4: 0.0 | ||
joint_5: 0.0 | ||
joint_6: 0.0 |
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,23 @@ | ||
# MoveIt uses this configuration for controller management | ||
trajectory_execution: | ||
allowed_execution_duration_scaling: 1.2 | ||
allowed_goal_duration_margin: 0.5 | ||
allowed_start_tolerance: 0.01 | ||
|
||
moveit_controller_manager: moveit_simple_controller_manager/MoveItSimpleControllerManager | ||
|
||
moveit_simple_controller_manager: | ||
controller_names: | ||
- fanuc_controller | ||
|
||
fanuc_controller: | ||
action_ns: follow_joint_trajectory | ||
type: FollowJointTrajectory | ||
default: true | ||
joints: | ||
- joint_1 | ||
- joint_2 | ||
- joint_3 | ||
- joint_4 | ||
- joint_5 | ||
- joint_6 |
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,26 @@ | ||
# This config file is used by ros2_control | ||
controller_manager: | ||
ros__parameters: | ||
update_rate: 100 # Hz | ||
|
||
fanuc_controller: | ||
type: joint_trajectory_controller/JointTrajectoryController | ||
|
||
joint_state_broadcaster: | ||
type: joint_state_broadcaster/JointStateBroadcaster | ||
|
||
|
||
fanuc_controller: | ||
ros__parameters: | ||
command_interfaces: | ||
- position | ||
state_interfaces: | ||
- position | ||
- velocity | ||
joints: | ||
- joint_1 | ||
- joint_2 | ||
- joint_3 | ||
- joint_4 | ||
- joint_5 | ||
- joint_6 |
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
fanuc_moveit_config/launch/chomp_planning_pipeline.launch.xml
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.