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.

Sign up for GitHub

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

Jump to bottom

Subtree sync 2 #2

Draft
wants to merge 25 commits into
base: main
Choose a base branch
from
Draft

Subtree sync 2 #2

wants to merge 25 commits into from

Conversation

danwahl
Copy link

@danwahl danwahl commented Jan 17, 2025

No description provided.

@danwahl danwahl self-assigned this Jan 17, 2025
@danwahl danwahl mentioned this pull request Jan 17, 2025
Merged
@danwahl danwahl requested a review from MikeWrock January 17, 2025 19:41
@danwahl danwahl closed this Jan 27, 2025
@danwahl danwahl reopened this Jan 27, 2025
marioprats and others added 24 commits February 22, 2025 16:24
@marioprats @danwahl
Merge v7.0 into main (#58)
686f2d4 
* use slik as the pose IK solver in all configs, remove deps to trac_ik

* remove unused kinematics.yaml files

* rename slik -> pose_ik
@dyackzan @danwahl
Remove unused pick_ik dependency
5d6b2f1
@marioprats @danwahl
Make Pro-RRT the default in all configs
2b51eb3
@dyackzan @danwahl
Update ForEach[Type] -> ForEach
512ffc6
@dyackzan @danwahl
Update kinova objectives
5701b17
@MikeWrock @danwahl
added a movetowaypoint
a588c2e
@dyackzan @danwahl
Use new Pro RRT SetupMTCPlanTo_ behaviors
96ecbe1 
These new behaviors expose more planning parameters for the Pro RRT
Connect planner.

Replace:
* `SetupMTCMoveToPose` -> `SetupMTCPlanToPose`
* `SetupMTCMoveToJointState` -> `SetupMTCPlanToJointState`

Update planning configuration ports:
* Remove deprecated `planner_interface` port.
* use `keep_orientation` and `keep_orientation_tolerance` ports instead
  of `constraints` port
* Lower `link_padding` where it causes self collisions
@dyackzan @danwahl
Add trajectory stitching demo objective
6fd3216
@marioprats @danwahl
remove RetryUntilSuccessful decorators around planning Behaviors
1211a46
@sjahr @danwahl
Format
9a81505
@danwahl
Add moveit pro ignore file
25f1bd2
@danwahl
fix: updated categories and objectives
ad81134
@danwahl
format: pre-commit
abf371e
@danwahl
Rename kinova_gen3_mujoco_config to kinove_sim
3f0468e
@MikeWrock @danwahl
Pulled kinova changes
307e636
@danwahl
Import picknik_kinova_satellite_sim into new space_satellite_sim
53aa998
@danwahl
Reorganize scene, add space skybox
977a0e7
@danwahl
Remove unused assets, reorganize into subfolders
a03d52d
@danwahl
Add landsat and servicer platform to scene
9f8cbd8
@danwahl
Add servicer platform to xacro, fix arm mounting transform
46e9f46
@danwahl
Add AR markers and adjust april tag detection, update view_tag keyframe
e2ec314
@danwahl
Fix formatting for pre-commit
c68fcbb
@EzraBrooks @danwahl
Import all missing LFS files
109e8eb
@pac48 @danwahl
Make meshes LFS
97b30f6 
Signed-off-by: Paul Gesel <[email protected]>
@danwahl
Copy link
Author

danwahl commented Feb 22, 2025

@MikeWrock I think this is back up-to-date with example_ws. Not 100% if I'm remembering the correct procedure, but I tried to do it in such a way that we:

  1. Preserve local history in this repo
  2. Match all the commits in example_ws that are relevant to this subtree

Which basically involved adding example_ws as a remote and then the following (assuming 4f40bad^..1ce3631 is the range of new commits in example_ws that we want to grab):

git log --reverse --format="%H" 4f40bad^..1ce3631 -- src/moveit_pro_kinova_configs > /tmp/commits_to_pick.txt
git cherry-pick --strategy=recursive --strategy-option=subtree=src/moveit_pro_kinova_configs -m 1 $(cat /tmp/commits_to_pick.txt)

Let me know if this makes sense, or if I'm missing something, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MikeWrock MikeWrock Awaiting requested review from MikeWrock

Assignees

@danwahl danwahl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@danwahl @marioprats @dyackzan @MikeWrock @sjahr @EzraBrooks @pac48