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

Rebase v7.2 on v7.0 #13

Closed

Conversation

mkhansenbot
Copy link

This fixes issue #10587 on my machine

I rebased v7.2 onto v7.0, HOWEVER, there were some merge conflicts to resolve, and I attempted to resolve them BUT someone should review them carefully to make sure I didn't break something else!

git-subtree-dir: src/fanuc_sim
git-subtree-split: 0b1e054ccb6a4fa20b2658ad318ebc1acfd64bb6
git-subtree-dir: src/lab_sim
git-subtree-split: 2ee0461a27dc2165441ce9362a81db44303177d4
git-subtree-dir: src/moveit_pro_kinova_configs
git-subtree-split: 178a37c6d6bfd703ea6018266aa79872802f31b9
…367b7

git-subtree-dir: src/moveit_pro_mobile_manipulation
git-subtree-split: e5367b79e08113218f72804beda69ebe94a2b175
git-subtree-dir: src/moveit_pro_ur_configs
git-subtree-split: fe3c9a7f6f0a27cf881a34aa551ed6b2b876c8af
… commit 3db6acb

git-subtree-dir: src/moveit_pro_mobile_manipulation/ridgeback
git-subtree-split: 3db6acb098765ff28952642fbab6dc3261efe973
git-subtree-dir: src/ros2_robotiq_gripper
git-subtree-split: 77e60927cd5cdcc7c75b8837ac3104b826a4bb99
…om commit 77e6092

git-subtree-dir: src/external_dependencies/ros2_robotiq_gripper
git-subtree-split: 77e60927cd5cdcc7c75b8837ac3104b826a4bb99
…db6acb

git-subtree-dir: src/external_dependencies/ridgeback
git-subtree-split: 3db6acb098765ff28952642fbab6dc3261efe973
git-subtree-dir: src/external_dependencies/serial
git-subtree-split: d8d160678aa0b31cdf467c052b954fa287cc6cdf
…om 77e6092..2ff8545

2ff8545 update urdf mesh filenames to use package path (#50) (#68)
93ecde7 Replace fake_sensor_commands with 'mock_sensor_commands (#62)
REVERT: 77e6092 update urdf mesh filenames to use package path (#50)
REVERT: 27ecc36 Replace fake_sensor_commands with 'mock_sensor_commands (#61)
REVERT: 5f0c39a Remove mimic tags and rename `sim_ignition` to `sim_gazebo` (#54)

git-subtree-dir: src/external_dependencies/ros2_robotiq_gripper
git-subtree-split: 2ff85455d4b9f973c4b0bab1ce95fb09367f0d26
git-subtree-dir: src/picknik_registration
git-subtree-split: 220e5c96aac04bf4879b4106f16238fee2a46825
git-subtree-dir: src/example_behaviors
git-subtree-split: d1451e331ba27aee0af9bbaafaefc8bf37a48aca
dyackzan and others added 26 commits January 13, 2025 15:20
…lay-motion

Don't use MTC in Plan and Save Trajectory objective
…onfig

update ACM for links that don't collide
…onfig

set mobile_manipulation_config keyframe to zero
Use core segmentation behavior in `lab_sim`
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
@mkhansenbot
Copy link
Author

Argh, wrong workspace!!

@mkhansenbot mkhansenbot closed this Feb 3, 2025
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.

10 participants