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

Port Pilz Industrial Motion Planner #452

Merged
merged 5 commits into from
Dec 6, 2021
Merged

Port Pilz Industrial Motion Planner #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25cc636
PILZ: Migrate planner and testutils packages to ROS 2
henningkayser Apr 19, 2021
f9660c1
PILZ: Migrate and Restructure test directory
sjahr Aug 21, 2021
e1b5982
PILZ: Build fixups, silence warnings, fix unit tests
henningkayser Nov 19, 2021
b923910
Use CallbackGroup for MoveGroupSequenceAction
henningkayser Dec 3, 2021
05fa5a2
Temporarily install moveit_resources in workspace
henningkayser Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
CXXFLAGS: "-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-deprecated-copy"
DOCKER_IMAGE: ghcr.io/ros-planning/moveit2:${{ matrix.env.IMAGE }}
UPSTREAM_WORKSPACE: moveit2.repos $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f)
# TODO(#885): Fix circular test dependency with moveit_resources and remove it from the target workspace
TARGET_WORKSPACE: $TARGET_REPO_PATH github:ros-planning/moveit_resources#ros2
# Pull any updates to the upstream workspace (after restoring it from cache)
AFTER_SETUP_UPSTREAM_WORKSPACE: vcs pull $BASEDIR/upstream_ws/src
AFTER_SETUP_DOWNSTREAM_WORKSPACE: vcs pull $BASEDIR/downstream_ws/src
Expand Down
9 changes: 5 additions & 4 deletions moveit2.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ repositories:
type: git
url: https://github.com/ros-planning/geometric_shapes
version: ros2
moveit_resources:
type: git
url: https://github.com/ros-planning/moveit_resources
version: ros2
# TODO(#885): Re-enable when circular dependency is fixed
# moveit_resources:
# type: git
# url: https://github.com/ros-planning/moveit_resources
# version: ros2
warehouse_ros:
type: git
url: https://github.com/ros-planning/warehouse_ros
Expand Down
3 changes: 0 additions & 3 deletions moveit_planners/moveit_planners/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
<exec_depend>moveit_planners_chomp</exec_depend>
-->
<exec_depend>moveit_planners_ompl</exec_depend>
<!--
TODO(#315): Enable after Pilz motion planner has been ported
<exec_depend>pilz_industrial_motion_planner</exec_depend>
-->

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down
Loading