-
Notifications
You must be signed in to change notification settings - Fork 115
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
Feature/irb6660 #113
Open
wlg1984
wants to merge
8
commits into
ros-industrial:kinetic-devel
Choose a base branch
from
kinneyjustin:feature/irb6660
base: kinetic-devel
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feature/irb6660 #113
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
dbd9064
Added support package for ABB IRB6660 robot variants
kinneyjustin a309247
Added MoveIt config package for ABB IRB6660_205_190 variant
kinneyjustin fb1687d
Update irb6660_100_330_macro.xacro
wlg1984 16111c9
Update abb_irb6660_100_330 and abb_irb6660_130_310 urdf's, meshes.
wlg1984 a5f4bc3
Merge branch 'feature/irb6660' of https://github.com/kinneyjustin/abb…
wlg1984 3112d96
update the correct supported variants
wlg1984 0c35ada
Change the description to a correct robot model. IRB6660
wlg1984 66918ab
adding updated joint limits for joint 3 (dynamic axis causes problems)
kinneyjustin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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,11 @@ | ||
moveit_setup_assistant_config: | ||
URDF: | ||
package: abb_irb6660_support | ||
relative_path: urdf/irb6660_100_330.xacro | ||
xacro_args: "--inorder " | ||
SRDF: | ||
relative_path: config/abb_irb6660_100_330.srdf | ||
CONFIG: | ||
author_name: WeiGo | ||
author_email: wei.go@nov.com | ||
generated_timestamp: 1553014227 |
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,10 @@ | ||
cmake_minimum_required(VERSION 2.8.3) | ||
project(abb_irb6660_100_330_moveit_config) | ||
|
||
find_package(catkin REQUIRED) | ||
|
||
catkin_package() | ||
|
||
install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} | ||
PATTERN "setup_assistant.launch" EXCLUDE) | ||
install(DIRECTORY config DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) |
36 changes: 36 additions & 0 deletions
36
abb_irb6660_100_330_moveit_config/config/abb_irb6660_100_330.srdf
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" ?> | ||
<!--This does not replace URDF, and is not an extension of URDF. | ||
This is a format for representing semantic information about the robot structure. | ||
A URDF file must exist for this robot as well, where the joints and the links that are referenced are defined | ||
--> | ||
<robot name="abb_irb6660_100_330"> | ||
<!--GROUPS: Representation of a set of joints and links. This can be useful for specifying DOF to plan for, defining arms, end effectors, etc--> | ||
<!--LINKS: When a link is specified, the parent joint of that link (if it exists) is automatically included--> | ||
<!--JOINTS: When a joint is specified, the child link of that joint (which will always exist) is automatically included--> | ||
<!--CHAINS: When a chain is specified, all the links along the chain (including endpoints) are included in the group. Additionally, all the joints that are parents to included links are also included. This means that joints along the chain and the parent joint of the base link are included in the group--> | ||
<!--SUBGROUPS: Groups can also be formed by referencing to already defined group names--> | ||
<group name="manipulators"> | ||
<chain base_link="base_link" tip_link="link_6" /> | ||
</group> | ||
<!--VIRTUAL JOINT: Purpose: this element defines a virtual joint between a robot link and an external frame of reference (considered fixed with respect to the robot)--> | ||
<virtual_joint name="fix_base" type="fixed" parent_frame="world" child_link="base_link" /> | ||
<!--DISABLE COLLISIONS: By default it is assumed that any link of the robot could potentially come into collision with any other link in the robot. This tag disables collision checking between a specified pair of links. --> | ||
<disable_collisions link1="base_link" link2="link_1" reason="Adjacent" /> | ||
<disable_collisions link1="base_link" link2="link_3" reason="Never" /> | ||
<disable_collisions link1="base_link" link2="link_4" reason="Never" /> | ||
<disable_collisions link1="base_link" link2="link_5" reason="Never" /> | ||
<disable_collisions link1="base_link" link2="link_6" reason="Never" /> | ||
<disable_collisions link1="link_1" link2="link_2" reason="Adjacent" /> | ||
<disable_collisions link1="link_1" link2="link_4" reason="Never" /> | ||
<disable_collisions link1="link_1" link2="link_5" reason="Never" /> | ||
<disable_collisions link1="link_1" link2="link_6" reason="Never" /> | ||
<disable_collisions link1="link_2" link2="link_3" reason="Adjacent" /> | ||
<disable_collisions link1="link_2" link2="link_4" reason="Never" /> | ||
<disable_collisions link1="link_2" link2="link_5" reason="Never" /> | ||
<disable_collisions link1="link_2" link2="link_6" reason="Never" /> | ||
<disable_collisions link1="link_3" link2="link_4" reason="Adjacent" /> | ||
<disable_collisions link1="link_3" link2="link_5" reason="Never" /> | ||
<disable_collisions link1="link_3" link2="link_6" reason="Never" /> | ||
<disable_collisions link1="link_4" link2="link_5" reason="Adjacent" /> | ||
<disable_collisions link1="link_5" link2="link_6" reason="Adjacent" /> | ||
</robot> |
18 changes: 18 additions & 0 deletions
18
abb_irb6660_100_330_moveit_config/config/chomp_planning.yaml
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,18 @@ | ||
planning_time_limit: 10.0 | ||
max_iterations: 200 | ||
max_iterations_after_collision_free: 5 | ||
smoothness_cost_weight: 0.1 | ||
obstacle_cost_weight: 1.0 | ||
learning_rate: 0.01 | ||
smoothness_cost_velocity: 0.0 | ||
smoothness_cost_acceleration: 1.0 | ||
smoothness_cost_jerk: 0.0 | ||
ridge_factor: 0.01 | ||
use_pseudo_inverse: false | ||
pseudo_inverse_ridge_factor: 1e-4 | ||
joint_update_limit: 0.1 | ||
collision_clearence: 0.2 | ||
collision_threshold: 0.07 | ||
use_stochastic_descent: true | ||
enable_failure_recovery: true | ||
max_recovery_attempts: 5 |
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,5 @@ | ||
controller_list: | ||
- name: "" | ||
action_ns: joint_trajectory_action | ||
type: FollowJointTrajectory | ||
joints: [joint_1, joint_2, joint_3, joint_4, joint_5, joint_6] |
9 changes: 9 additions & 0 deletions
9
abb_irb6660_100_330_moveit_config/config/fake_controllers.yaml
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,9 @@ | ||
controller_list: | ||
- name: fake_manipulators_controller | ||
joints: | ||
- joint_1 | ||
- joint_2 | ||
- joint_3 | ||
- joint_4 | ||
- joint_5 | ||
- joint_6 |
34 changes: 34 additions & 0 deletions
34
abb_irb6660_100_330_moveit_config/config/joint_limits.yaml
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,34 @@ | ||
# joint_limits.yaml allows the dynamics properties specified in the URDF to be overwritten or augmented as needed | ||
# Specific joint properties can be changed with the keys [max_position, min_position, max_velocity, max_acceleration] | ||
# Joint limits can be turned off with [has_velocity_limits, has_acceleration_limits] | ||
joint_limits: | ||
joint_1: | ||
has_velocity_limits: true | ||
max_velocity: 1.91986217719 | ||
has_acceleration_limits: false | ||
max_acceleration: 0 | ||
joint_2: | ||
has_velocity_limits: true | ||
max_velocity: 2.26892802759 | ||
has_acceleration_limits: false | ||
max_acceleration: 0 | ||
joint_3: | ||
has_velocity_limits: true | ||
max_velocity: 2.26892802759 | ||
has_acceleration_limits: false | ||
max_acceleration: 0 | ||
joint_4: | ||
has_velocity_limits: true | ||
max_velocity: 2.61799387799 | ||
has_acceleration_limits: false | ||
max_acceleration: 0 | ||
joint_5: | ||
has_velocity_limits: true | ||
max_velocity: 2.09439510239 | ||
has_acceleration_limits: false | ||
max_acceleration: 0 | ||
joint_6: | ||
has_velocity_limits: true | ||
max_velocity: 4.18879020479 | ||
has_acceleration_limits: false | ||
max_acceleration: 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,5 @@ | ||
manipulators: | ||
kinematics_solver: kdl_kinematics_plugin/KDLKinematicsPlugin | ||
kinematics_solver_search_resolution: 0.005 | ||
kinematics_solver_timeout: 0.005 | ||
kinematics_solver_attempts: 3 |
150 changes: 150 additions & 0 deletions
150
abb_irb6660_100_330_moveit_config/config/ompl_planning.yaml
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,150 @@ | ||
planner_configs: | ||
SBL: | ||
type: geometric::SBL | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
EST: | ||
type: geometric::EST | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0 setup() | ||
goal_bias: 0.05 # When close to goal select goal, with this probability. default: 0.05 | ||
LBKPIECE: | ||
type: geometric::LBKPIECE | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
border_fraction: 0.9 # Fraction of time focused on boarder default: 0.9 | ||
min_valid_path_fraction: 0.5 # Accept partially valid moves above fraction. default: 0.5 | ||
BKPIECE: | ||
type: geometric::BKPIECE | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
border_fraction: 0.9 # Fraction of time focused on boarder default: 0.9 | ||
failed_expansion_score_factor: 0.5 # When extending motion fails, scale score by factor. default: 0.5 | ||
min_valid_path_fraction: 0.5 # Accept partially valid moves above fraction. default: 0.5 | ||
KPIECE: | ||
type: geometric::KPIECE | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
goal_bias: 0.05 # When close to goal select goal, with this probability. default: 0.05 | ||
border_fraction: 0.9 # Fraction of time focused on boarder default: 0.9 (0.0,1.] | ||
failed_expansion_score_factor: 0.5 # When extending motion fails, scale score by factor. default: 0.5 | ||
min_valid_path_fraction: 0.5 # Accept partially valid moves above fraction. default: 0.5 | ||
RRT: | ||
type: geometric::RRT | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
goal_bias: 0.05 # When close to goal select goal, with this probability? default: 0.05 | ||
RRTConnect: | ||
type: geometric::RRTConnect | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
RRTstar: | ||
type: geometric::RRTstar | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
goal_bias: 0.05 # When close to goal select goal, with this probability? default: 0.05 | ||
delay_collision_checking: 1 # Stop collision checking as soon as C-free parent found. default 1 | ||
TRRT: | ||
type: geometric::TRRT | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
goal_bias: 0.05 # When close to goal select goal, with this probability? default: 0.05 | ||
max_states_failed: 10 # when to start increasing temp. default: 10 | ||
temp_change_factor: 2.0 # how much to increase or decrease temp. default: 2.0 | ||
min_temperature: 10e-10 # lower limit of temp change. default: 10e-10 | ||
init_temperature: 10e-6 # initial temperature. default: 10e-6 | ||
frountier_threshold: 0.0 # dist new state to nearest neighbor to disqualify as frontier. default: 0.0 set in setup() | ||
frountierNodeRatio: 0.1 # 1/10, or 1 nonfrontier for every 10 frontier. default: 0.1 | ||
k_constant: 0.0 # value used to normalize expresssion. default: 0.0 set in setup() | ||
PRM: | ||
type: geometric::PRM | ||
max_nearest_neighbors: 10 # use k nearest neighbors. default: 10 | ||
PRMstar: | ||
type: geometric::PRMstar | ||
FMT: | ||
type: geometric::FMT | ||
num_samples: 1000 # number of states that the planner should sample. default: 1000 | ||
radius_multiplier: 1.1 # multiplier used for the nearest neighbors search radius. default: 1.1 | ||
nearest_k: 1 # use Knearest strategy. default: 1 | ||
cache_cc: 1 # use collision checking cache. default: 1 | ||
heuristics: 0 # activate cost to go heuristics. default: 0 | ||
extended_fmt: 1 # activate the extended FMT*: adding new samples if planner does not finish successfully. default: 1 | ||
BFMT: | ||
type: geometric::BFMT | ||
num_samples: 1000 # number of states that the planner should sample. default: 1000 | ||
radius_multiplier: 1.0 # multiplier used for the nearest neighbors search radius. default: 1.0 | ||
nearest_k: 1 # use the Knearest strategy. default: 1 | ||
balanced: 0 # exploration strategy: balanced true expands one tree every iteration. False will select the tree with lowest maximum cost to go. default: 1 | ||
optimality: 1 # termination strategy: optimality true finishes when the best possible path is found. Otherwise, the algorithm will finish when the first feasible path is found. default: 1 | ||
heuristics: 1 # activates cost to go heuristics. default: 1 | ||
cache_cc: 1 # use the collision checking cache. default: 1 | ||
extended_fmt: 1 # Activates the extended FMT*: adding new samples if planner does not finish successfully. default: 1 | ||
PDST: | ||
type: geometric::PDST | ||
STRIDE: | ||
type: geometric::STRIDE | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
goal_bias: 0.05 # When close to goal select goal, with this probability. default: 0.05 | ||
use_projected_distance: 0 # whether nearest neighbors are computed based on distances in a projection of the state rather distances in the state space itself. default: 0 | ||
degree: 16 # desired degree of a node in the Geometric Near-neightbor Access Tree (GNAT). default: 16 | ||
max_degree: 18 # max degree of a node in the GNAT. default: 12 | ||
min_degree: 12 # min degree of a node in the GNAT. default: 12 | ||
max_pts_per_leaf: 6 # max points per leaf in the GNAT. default: 6 | ||
estimated_dimension: 0.0 # estimated dimension of the free space. default: 0.0 | ||
min_valid_path_fraction: 0.2 # Accept partially valid moves above fraction. default: 0.2 | ||
BiTRRT: | ||
type: geometric::BiTRRT | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
temp_change_factor: 0.1 # how much to increase or decrease temp. default: 0.1 | ||
init_temperature: 100 # initial temperature. default: 100 | ||
frountier_threshold: 0.0 # dist new state to nearest neighbor to disqualify as frontier. default: 0.0 set in setup() | ||
frountier_node_ratio: 0.1 # 1/10, or 1 nonfrontier for every 10 frontier. default: 0.1 | ||
cost_threshold: 1e300 # the cost threshold. Any motion cost that is not better will not be expanded. default: inf | ||
LBTRRT: | ||
type: geometric::LBTRRT | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
goal_bias: 0.05 # When close to goal select goal, with this probability. default: 0.05 | ||
epsilon: 0.4 # optimality approximation factor. default: 0.4 | ||
BiEST: | ||
type: geometric::BiEST | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
ProjEST: | ||
type: geometric::ProjEST | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
goal_bias: 0.05 # When close to goal select goal, with this probability. default: 0.05 | ||
LazyPRM: | ||
type: geometric::LazyPRM | ||
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() | ||
LazyPRMstar: | ||
type: geometric::LazyPRMstar | ||
SPARS: | ||
type: geometric::SPARS | ||
stretch_factor: 3.0 # roadmap spanner stretch factor. multiplicative upper bound on path quality. It does not make sense to make this parameter more than 3. default: 3.0 | ||
sparse_delta_fraction: 0.25 # delta fraction for connection distance. This value represents the visibility range of sparse samples. default: 0.25 | ||
dense_delta_fraction: 0.001 # delta fraction for interface detection. default: 0.001 | ||
max_failures: 1000 # maximum consecutive failure limit. default: 1000 | ||
SPARStwo: | ||
type: geometric::SPARStwo | ||
stretch_factor: 3.0 # roadmap spanner stretch factor. multiplicative upper bound on path quality. It does not make sense to make this parameter more than 3. default: 3.0 | ||
sparse_delta_fraction: 0.25 # delta fraction for connection distance. This value represents the visibility range of sparse samples. default: 0.25 | ||
dense_delta_fraction: 0.001 # delta fraction for interface detection. default: 0.001 | ||
max_failures: 5000 # maximum consecutive failure limit. default: 5000 | ||
manipulators: | ||
default_planner_config: RRT | ||
planner_configs: | ||
- SBL | ||
- EST | ||
- LBKPIECE | ||
- BKPIECE | ||
- KPIECE | ||
- RRT | ||
- RRTConnect | ||
- RRTstar | ||
- TRRT | ||
- PRM | ||
- PRMstar | ||
- FMT | ||
- BFMT | ||
- PDST | ||
- STRIDE | ||
- BiTRRT | ||
- LBTRRT | ||
- BiEST | ||
- ProjEST | ||
- LazyPRM | ||
- LazyPRMstar | ||
- SPARS | ||
- SPARStwo | ||
projection_evaluator: joints(joint_1,joint_2) | ||
longest_valid_segment_fraction: 0.005 |
66 changes: 66 additions & 0 deletions
66
abb_irb6660_100_330_moveit_config/config/ros_controllers.yaml
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,66 @@ | ||
abb_irb6660_100_330: | ||
# MoveIt-specific simulation settings | ||
moveit_sim_hw_interface: | ||
joint_model_group: controllers_initial_group_ | ||
joint_model_group_pose: controllers_initial_pose_ | ||
# Settings for ros_control control loop | ||
generic_hw_control_loop: | ||
loop_hz: 300 | ||
cycle_time_error_threshold: 0.01 | ||
# Settings for ros_control hardware interface | ||
hardware_interface: | ||
joints: | ||
- joint_1 | ||
- joint_2 | ||
- joint_3 | ||
- joint_4 | ||
- joint_5 | ||
- joint_6 | ||
sim_control_mode: 1 # 0: position, 1: velocity | ||
# Publish all joint states | ||
# Creates the /joint_states topic necessary in ROS | ||
joint_state_controller: | ||
type: joint_state_controller/JointStateController | ||
publish_rate: 50 | ||
controller_list: | ||
[] | ||
arm_controller: | ||
type: position_controllers/JointPositionController | ||
joints: | ||
- joint_1 | ||
- joint_2 | ||
- joint_3 | ||
- joint_4 | ||
- joint_5 | ||
- joint_6 | ||
gains: | ||
joint_1: | ||
p: 100 | ||
d: 1 | ||
i: 1 | ||
i_clamp: 1 | ||
joint_2: | ||
p: 100 | ||
d: 1 | ||
i: 1 | ||
i_clamp: 1 | ||
joint_3: | ||
p: 100 | ||
d: 1 | ||
i: 1 | ||
i_clamp: 1 | ||
joint_4: | ||
p: 100 | ||
d: 1 | ||
i: 1 | ||
i_clamp: 1 | ||
joint_5: | ||
p: 100 | ||
d: 1 | ||
i: 1 | ||
i_clamp: 1 | ||
joint_6: | ||
p: 100 | ||
d: 1 | ||
i: 1 | ||
i_clamp: 1 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As moveit configs are usually application dependant they should probably not be part of this pull request.