forked from PickNikRobotics/moveit_pro_empty_ws
-
Notifications
You must be signed in to change notification settings - Fork 6
Improve lab sim example objectives with story telling #49
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
Merged
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
fb8bf92
mobile_manipulation_config: revisit favorites
marioprats d064820
Merge pull request #16 from PickNikRobotics/mobile-manipulation-favor…
davetcoleman 2a8a2ef
Merge branch 'main' into v6.5
MikeWrock 9ece954
Syncing main to 6.5 (#25)
MikeWrock 63f19d8
Ci fix (#28)
MikeWrock d46cfba
fixing-kinovas (#26)
MikeWrock 8d44152
Colcon ignoring example behaviors (#27)
MikeWrock 2535e9c
Merge branch 'main' into v6.5
MikeWrock d765ec8
Fixes for kinova (#30)
MikeWrock 77e4dcd
removing ignored dependency
MikeWrock 6f98b9e
Added categories for more objectives
MikeWrock 45cf19f
Add 'Example' prefix to all behavior classnames and filenames in exam…
MikeWrock bee9479
Updated commentsin example objectives
MikeWrock c9986ee
fix(workspace): categories readded for lab_sim (#35)
shaur-k 95c43b9
Updating favourites (#36)
MikeWrock 916b049
Improve lab sim example objectives with story telling
davetcoleman efdcc91
Added move beakers to burners
davetcoleman 15f1393
Updating pick orientation
MikeWrock 507c2d9
updated waypoints and formatting
MikeWrock 0d12a45
Merge branch 'main' into improve_lab_sim_examples
MikeWrock a8d310a
added links to SRDF to fix objective
MikeWrock 651cc2c
updating metadata
MikeWrock 07fd3b3
Merge branch 'main' into improve_lab_sim_examples
MikeWrock 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 contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,33 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <root BTCPP_format="4" main_tree_to_execute="_Scan Scene"> | ||
| <!--//////////--> | ||
| <BehaviorTree | ||
| ID="_Scan Scene" | ||
| _description="Move robot our of scene to enable full snapshot of scene." | ||
| _favorite="true" | ||
| > | ||
| <Control ID="Sequence" name="TopLevelSequence"> | ||
| <Action ID="ClearSnapshot" /> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| _collapsed="true" | ||
| joint_group_name="manipulator" | ||
| planner_interface="moveit_default" | ||
| controller_names="/joint_trajectory_controller" | ||
| waypoint_name="Park Far Right" | ||
| /> | ||
| <SubTree ID="Take scene camera snapshot" _collapsed="true" /> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| _collapsed="true" | ||
| joint_group_name="manipulator" | ||
| planner_interface="moveit_default" | ||
| controller_names="/joint_trajectory_controller" | ||
| waypoint_name="Look at Table" | ||
| /> | ||
| </Control> | ||
| </BehaviorTree> | ||
| <TreeNodesModel> | ||
| <SubTree ID="_Scan Scene" /> | ||
| </TreeNodesModel> | ||
| </root> |
106 changes: 106 additions & 0 deletions
106
src/lab_sim/objectives/constrained_pick_and_place_subtree.xml
This file contains hidden or 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,106 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <root | ||
| BTCPP_format="4" | ||
| main_tree_to_execute="Constrained Pick and Place Subtree" | ||
| > | ||
| <!--//////////--> | ||
| <BehaviorTree | ||
| ID="Constrained Pick and Place Subtree" | ||
| _subtreeOnly="true" | ||
| _description="" | ||
| > | ||
| <Control ID="Sequence"> | ||
| <!--Create a special type of motion planning configuration that includes an upwards orientation requirement--> | ||
| <Action | ||
| ID="InitializeMotionConstraints" | ||
| constraints_name="gripper pointing down" | ||
| constraints="{constraints}" | ||
| /> | ||
| <Action | ||
| ID="AppendOrientationConstraint" | ||
| config_file_name="my_constraints.yaml" | ||
| constraints="{constraints}" | ||
| /> | ||
| <!--Move to pick location--> | ||
| <!--Note: Sampling based planners can be non-deterministic. The retry decorator improves the likelihood of success--> | ||
| <Decorator ID="RetryUntilSuccessful" num_attempts="3"> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| waypoint_name="{pre_pick}" | ||
| joint_group_name="manipulator" | ||
| controller_names="/joint_trajectory_controller /robotiq_gripper_controller" | ||
| planner_interface="moveit_default" | ||
| constraints="{constraints}" | ||
| /> | ||
| </Decorator> | ||
| <Decorator ID="RetryUntilSuccessful" num_attempts="3"> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| waypoint_name="{pick}" | ||
| joint_group_name="manipulator" | ||
| controller_names="/joint_trajectory_controller /robotiq_gripper_controller" | ||
| planner_interface="moveit_default" | ||
| constraints="{constraints}" | ||
| /> | ||
| </Decorator> | ||
| <!--We force success as the gripper closes, since we are commanding a position it will never reach (fingers fully closed)--> | ||
| <Decorator ID="ForceSuccess"> | ||
| <SubTree ID="Close Gripper" /> | ||
| </Decorator> | ||
| <!--Move to place (drop) location--> | ||
| <Decorator ID="RetryUntilSuccessful" num_attempts="3"> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller /robotiq_gripper_controller" | ||
| joint_group_name="manipulator" | ||
| planner_interface="moveit_default" | ||
| constraints="{constraints}" | ||
| _collapsed="true" | ||
| waypoint_name="{pre_pick}" | ||
| /> | ||
| </Decorator> | ||
| <Decorator ID="RetryUntilSuccessful" num_attempts="3"> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller /robotiq_gripper_controller" | ||
| joint_group_name="manipulator" | ||
| planner_interface="moveit_default" | ||
| constraints="{constraints}" | ||
| _collapsed="true" | ||
| waypoint_name="{pre_place}" | ||
| /> | ||
| </Decorator> | ||
| <Decorator ID="RetryUntilSuccessful" num_attempts="3"> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller /robotiq_gripper_controller" | ||
| joint_group_name="manipulator" | ||
| planner_interface="moveit_default" | ||
| constraints="{constraints}" | ||
| _collapsed="true" | ||
| waypoint_name="{place}" | ||
| /> | ||
| </Decorator> | ||
| <SubTree ID="Open Gripper" /> | ||
| <Decorator ID="RetryUntilSuccessful" num_attempts="3"> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller /robotiq_gripper_controller" | ||
| joint_group_name="manipulator" | ||
| planner_interface="moveit_default" | ||
| constraints="{constraints}" | ||
| _collapsed="true" | ||
| waypoint_name="{pre_place}" | ||
| /> | ||
| </Decorator> | ||
| </Control> | ||
| </BehaviorTree> | ||
| <TreeNodesModel> | ||
| <SubTree ID="Constrained Pick and Place Subtree"> | ||
| <inout_port name="pre_pick" default="" /> | ||
| <inout_port name="pick" default="" /> | ||
| <inout_port name="pre_place" default="" /> | ||
| <inout_port name="place" default="" /> | ||
| </SubTree> | ||
| </TreeNodesModel> | ||
| </root> |
This file contains hidden or 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 |
|---|---|---|
| @@ -1,16 +1,18 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <root BTCPP_format="4" main_tree_to_execute="Constrained Pick and Place"> | ||
| <root BTCPP_format="4" main_tree_to_execute="Move Beakers to Burners"> | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @jeremydbronson please test this objective |
||
| <!--//////////--> | ||
| <BehaviorTree | ||
| ID="Constrained Pick and Place" | ||
| _description="More advanced example of picking and placing an (invisible) object with orientation constraints enforced on the gripper's motion" | ||
| _favorite="false" | ||
| ID="Move Beakers to Burners" | ||
| _description="Example of picking and placing objects with orientation constraints enforced on the arm's motion" | ||
| _favorite="true" | ||
| _subtreeOnly="false" | ||
| > | ||
| <Control ID="Sequence"> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| _collapsed="true" | ||
| waypoint_name="Look at Table" | ||
| constraints="{constraints}" | ||
| waypoint_name="Beaker 1a - Pre Pick" | ||
| joint_group_name="manipulator" | ||
| controller_names="/joint_trajectory_controller" | ||
| velocity_scale_factor="1.0" | ||
|
|
@@ -20,139 +22,33 @@ | |
| keep_orientation="false" | ||
| /> | ||
| <SubTree ID="Open Gripper" /> | ||
| <Decorator ID="KeepRunningUntilFailure"> | ||
| <Control ID="Sequence"> | ||
| <!--Move to pick location--> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| waypoint_name="Above Pick Cube" | ||
| joint_group_name="manipulator" | ||
| controller_names="/joint_trajectory_controller" | ||
| velocity_scale_factor="1.0" | ||
| acceleration_scale_factor="1.0" | ||
| link_padding="0.01" | ||
| keep_orientation_tolerance="0.05" | ||
| keep_orientation="true" | ||
| /> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| waypoint_name="Pick Cube" | ||
| joint_group_name="manipulator" | ||
| controller_names="/joint_trajectory_controller" | ||
| velocity_scale_factor="1.0" | ||
| acceleration_scale_factor="1.0" | ||
| link_padding="0.01" | ||
| keep_orientation_tolerance="0.05" | ||
| keep_orientation="true" | ||
| /> | ||
| <!--We force success as the gripper closes, since we are commanding a position it will never reach (fingers fully closed)--> | ||
| <Decorator ID="ForceSuccess"> | ||
| <SubTree ID="Close Gripper" /> | ||
| </Decorator> | ||
| <!--Move to place (drop) location--> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller" | ||
| joint_group_name="manipulator" | ||
| _collapsed="true" | ||
| waypoint_name="Above Pick Cube" | ||
| velocity_scale_factor="1.0" | ||
| acceleration_scale_factor="1.0" | ||
| link_padding="0.01" | ||
| keep_orientation_tolerance="0.05" | ||
| keep_orientation="true" | ||
| /> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller" | ||
| joint_group_name="manipulator" | ||
| _collapsed="true" | ||
| waypoint_name="Above Place Cube" | ||
| velocity_scale_factor="1.0" | ||
| acceleration_scale_factor="1.0" | ||
| link_padding="0.01" | ||
| keep_orientation_tolerance="0.05" | ||
| keep_orientation="true" | ||
| /> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller" | ||
| joint_group_name="manipulator" | ||
| _collapsed="true" | ||
| waypoint_name="Place Cube" | ||
| velocity_scale_factor="1.0" | ||
| acceleration_scale_factor="1.0" | ||
| link_padding="0.01" | ||
| keep_orientation_tolerance="0.05" | ||
| keep_orientation="true" | ||
| /> | ||
| <SubTree ID="Open Gripper" /> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller" | ||
| joint_group_name="manipulator" | ||
| _collapsed="true" | ||
| waypoint_name="Above Place Cube" | ||
| velocity_scale_factor="1.0" | ||
| acceleration_scale_factor="1.0" | ||
| link_padding="0.01" | ||
| keep_orientation_tolerance="0.05" | ||
| keep_orientation="true" | ||
| /> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller" | ||
| joint_group_name="manipulator" | ||
| _collapsed="true" | ||
| waypoint_name="Place Cube" | ||
| velocity_scale_factor="1.0" | ||
| acceleration_scale_factor="1.0" | ||
| link_padding="0.01" | ||
| keep_orientation_tolerance="0.05" | ||
| keep_orientation="true" | ||
| /> | ||
| <SubTree ID="Close Gripper" /> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller" | ||
| joint_group_name="manipulator" | ||
| _collapsed="true" | ||
| waypoint_name="Above Place Cube" | ||
| velocity_scale_factor="1.0" | ||
| acceleration_scale_factor="1.0" | ||
| link_padding="0.01" | ||
| keep_orientation_tolerance="0.05" | ||
| keep_orientation="true" | ||
| /> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| controller_names="/joint_trajectory_controller" | ||
| joint_group_name="manipulator" | ||
| _collapsed="true" | ||
| waypoint_name="Above Pick Cube" | ||
| velocity_scale_factor="1.0" | ||
| acceleration_scale_factor="1.0" | ||
| link_padding="0.01" | ||
| keep_orientation_tolerance="0.05" | ||
| keep_orientation="true" | ||
| /> | ||
| <SubTree | ||
| ID="Move to Waypoint" | ||
| waypoint_name="Pick Cube" | ||
| joint_group_name="manipulator" | ||
| controller_names="/joint_trajectory_controller" | ||
| velocity_scale_factor="1.0" | ||
| acceleration_scale_factor="1.0" | ||
| link_padding="0.01" | ||
| keep_orientation_tolerance="0.05" | ||
| keep_orientation="true" | ||
| /> | ||
| <SubTree ID="Open Gripper" /> | ||
| </Control> | ||
| </Decorator> | ||
| <SubTree | ||
| ID="Constrained Pick and Place Subtree" | ||
| pre_pick="Beaker 1a - Pre Pick" | ||
| pick="Beaker 1b - Pick" | ||
| pre_place="Beaker 1c - Pre Place" | ||
| place="Beaker 1d - Place" | ||
| name="Beaker 1" | ||
| /> | ||
| <SubTree | ||
| ID="Constrained Pick and Place Subtree" | ||
| pre_pick="Beaker 2a - Pre Pick" | ||
| pick="Beaker 2b - Pick" | ||
| pre_place="Beaker 2c - Pre Place" | ||
| place="Beaker 2d - Place" | ||
| name="Beaker 2" | ||
| /> | ||
| <SubTree | ||
| ID="Constrained Pick and Place Subtree" | ||
| pre_pick="Beaker 3a - Pre Pick" | ||
| pick="Beaker 3b - Pick" | ||
| pre_place="Beaker 3c - Pre Place" | ||
| place="Beaker 3d - Place" | ||
| name="Beaker 3" | ||
| /> | ||
| </Control> | ||
| </BehaviorTree> | ||
| <TreeNodesModel> | ||
| <SubTree ID="Constrained Pick and Place" /> | ||
| <SubTree ID="Move Beakers to Burners" /> | ||
| </TreeNodesModel> | ||
| </root> | ||
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
I don't know why these links end up in collision after planning a waypoint, but this is my workaround