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

Update FANUC launch file and cleanup of deprecated XML files #120

Merged
merged 6 commits into from
Apr 12, 2022
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
8 changes: 8 additions & 0 deletions fanuc_moveit_config/config/chomp_planning.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
planning_plugin: chomp_interface/CHOMPPlanner
request_adapters: >-
default_planner_request_adapters/AddTimeParameterization
default_planner_request_adapters/FixWorkspaceBounds
default_planner_request_adapters/FixStartStateBounds
default_planner_request_adapters/FixStartStateCollision
default_planner_request_adapters/FixStartStatePathConstraints
start_state_max_bounds_error: 0.1
planning_time_limit: 10.0
max_iterations: 200
max_iterations_after_collision_free: 5
Expand Down
12 changes: 0 additions & 12 deletions fanuc_moveit_config/config/fake_controllers.yaml

This file was deleted.

55 changes: 55 additions & 0 deletions fanuc_moveit_config/config/fanuc.ros2_control.xacro
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>
12 changes: 12 additions & 0 deletions fanuc_moveit_config/config/fanuc.urdf.xacro
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>
8 changes: 8 additions & 0 deletions fanuc_moveit_config/config/initial_positions.yaml
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
23 changes: 23 additions & 0 deletions fanuc_moveit_config/config/moveit_controllers.yaml
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
9 changes: 9 additions & 0 deletions fanuc_moveit_config/config/ompl_planning.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
planning_plugin: ompl_interface/OMPLPlanner
request_adapters: >-
default_planner_request_adapters/AddTimeOptimalParameterization
default_planner_request_adapters/ResolveConstraintFrames
default_planner_request_adapters/FixWorkspaceBounds
default_planner_request_adapters/FixStartStateBounds
default_planner_request_adapters/FixStartStateCollision
default_planner_request_adapters/FixStartStatePathConstraints
start_state_max_bounds_error: 0.1
planner_configs:
AnytimePathShortening:
type: geometric::AnytimePathShortening
Expand Down
26 changes: 26 additions & 0 deletions fanuc_moveit_config/config/ros2_controllers.yaml
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
35 changes: 0 additions & 35 deletions fanuc_moveit_config/config/ros_controllers.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions fanuc_moveit_config/launch/chomp_planning_pipeline.launch.xml

This file was deleted.

15 changes: 0 additions & 15 deletions fanuc_moveit_config/launch/default_warehouse_db.launch

This file was deleted.

62 changes: 0 additions & 62 deletions fanuc_moveit_config/launch/demo.launch

This file was deleted.

Loading