Sync 6.5 to main #37
Merged
Sync 6.5 to main #37
Conversation
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
…ites mobile_manipulation_config: revisit favorites
*colcon ignoring example behaviors
…ple_behaviors repository (#33) Co-authored-by: Nathan Brooks <[email protected]>
* fix(workspace): categories readded for lab_sim
mewtwoshaurd
approved these changes
Dec 5, 2024
| @@ -39,7 +40,7 @@ | |||
| /> | |||
| <Action ID="PlanMTCTask" solution="{mtc_solution}" task="{mtc_task}" /> | |||
| <Action ID="WaitForUserTrajectoryApproval" /> | |||
| <!-- The following behavior can be found in the example_behaviors package. Remove the COLCON_IGNORE file and `moveit_pro build user_workspace` to use. --> | |||
| <!--The following behavior can be found in the example_behaviors package.--> | |||
There was a problem hiding this comment.
small nit, this is referring to the source code right? Maybe it should read "The following behavior's code can be found in the example_behaviors package"
MikeWrock
added a commit
that referenced
this pull request
Dec 6, 2024
b360dc0 Merge commit '7e8c6066177e2fd16ea46cfb16d8c207e17fd929' a71ffeb fixed build and test for example behaviors (#39) 72ad640 Sam naming (#38) 46a17ce Sync 6.5 to main (#37) d41f38d Add example SAM 2 behavior and objective (#23) f6ac548 Sync V6.5 to main (#29) e932e45 Merge branch 'main' into pr-update-to-make-ports-explicit 6a14c44 Fix depend of moveit_studio_behavior 1416547 version bump 5f6056a formatting a06f504 pre-commit formatting 5bfeaa5 Moving registration behaviors 93dd16f Added mtc to jtc converter git-subtree-dir: src/example_behaviors git-subtree-split: b360dc0970f6dbe4b633cb33edb9ef75042f00d7
MikeWrock
added a commit
that referenced
this pull request
Dec 6, 2024
e620d305 Merge pull request #2 from PickNikRobotics/subtree-sync 62008ced Sam naming (#38) 5690add5 Sync 6.5 to main (#37) ee7dd7dd Add example SAM 2 behavior and objective (#23) 4c700980 Sync V6.5 to main (#29) e8f315ed added descriptions 86a6350b Updating objectives ca65f4df formatting e01d58aa more fixes c0f151e9 Merge branch 'main' into pr-update-to-make-ports-explicit 3c5a9af8 Fix pick ApriTag object aafc6e5c Update ports explicitly 6987b5bc version bump 9375a38b Updating xacro and favourites 51e72413 formatting 8eea418b formatting 9dcf6b86 Moving registration behaviors cfeeac7d Add pick and place example using custom MTC example behavior d9bc48d4 Added mtc to jtc converter git-subtree-dir: src/lab_sim git-subtree-split: e620d305b8a75b8880a8734c3b40cc88779c0d55
MikeWrock
added a commit
that referenced
this pull request
Dec 6, 2024
…e46c 66c2e46c Merge pull request #1 from PickNikRobotics/subtree-sync b3c8f59f Sync 6.5 to main (#37) 1fdeeda2 Sync V6.5 to main (#29) 61d5ed47 added dependency (#21) 171c0725 version bump b4d170cf formatting git-subtree-dir: src/moveit_pro_kinova_configs git-subtree-split: 66c2e46c6f13964470c5f22c6b8f4b9d2d4ff070
MikeWrock
added a commit
that referenced
this pull request
Dec 6, 2024
….6faac6f3 6faac6f3 Merge pull request #5 from PickNikRobotics/subtree-sync 86bb4e2e Merge commit '3f3ff51b8dff7152f011f0319c39e8e73ec944cc' afdc1bcd Sync 6.5 to main (#37) b0b5b90d Sync V6.5 to main (#29) git-subtree-dir: src/moveit_pro_mobile_manipulation git-subtree-split: 6faac6f3b0fb5e5579c7093cab5668211d068c46
MikeWrock
added a commit
that referenced
this pull request
Dec 6, 2024
6bf7e238 Merge pull request #1 from PickNikRobotics/subtree-sync 6c95bd1c Sync 6.5 to main (#37) 964e43fb Sync V6.5 to main (#29) baf81139 patching fanuc (#22) 6db5e61f Removes visualization pane changes in teleoperation ca45e9aa version bump c19efc19 formatting git-subtree-dir: src/fanuc_sim git-subtree-split: 6bf7e238341a69ffc88faca491423f88de4a31d9
dyackzan
pushed a commit
that referenced
this pull request
Jan 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.