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

Improve lab sim example objectives with story telling #49

Merged
merged 23 commits into from
Jan 6, 2025

Conversation

davetcoleman
Copy link
Member

Need to cherry pick this to main - can you do that @MikeWrock ?

@MikeWrock MikeWrock force-pushed the improve_lab_sim_examples branch from 973f81f to 15f1393 Compare December 12, 2024 23:22
@davetcoleman
Copy link
Member Author

@MikeWrock can you retarget this to 7.0 please? I'd like to get it merged for that release.

@MikeWrock MikeWrock changed the base branch from v6.5 to main December 31, 2024 22:07
@@ -52,6 +52,7 @@
<disable_collisions link1="base_link_inertia" link2="shoulder_link" reason="Adjacent"/>
<disable_collisions link1="forearm_link" link2="upper_arm_link" reason="Adjacent"/>
<disable_collisions link1="forearm_link" link2="wrist_1_link" reason="Adjacent"/>
<disable_collisions link1="base_link_inertia" link2="upper_arm_link" reason="Adjacent"/>
Copy link
Collaborator

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

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jeremydbronson please test

@@ -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">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jeremydbronson please test this objective

@MikeWrock
Copy link
Collaborator

@jeremydbronson can you test this against 7.0 by navigating to the example workspace and git checkout improve_lab_sim_examples then git submodule update --recursive and moveit-pro build user_workspace. There are two objectives to test, I've tagged you in them.

  • Push Button
  • Move Beakers to Burners

@jeremydbronson jeremydbronson self-requested a review January 1, 2025 15:05
jeremydbronson
jeremydbronson previously approved these changes Jan 1, 2025
@jeremydbronson jeremydbronson merged commit 39fc596 into main Jan 6, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants