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

Backport of Fix CI (#826) to humble #827

Closed
wants to merge 1 commit into from
Closed

Backport of Fix CI (#826) to humble #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions .github/upstream.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,25 @@ repositories:
type: git
url: https://github.com/PickNikRobotics/rosparam_shortcuts
version: ros2
<<<<<<< HEAD
=======
rviz_visual_tools:
type: git
url: https://github.com/PickNikRobotics/rviz_visual_tools.git
version: ros2
# Remove ros2_kortex when rolling binaries are available.
ros2_kortex:
type: git
url: https://github.com/Kinovarobotics/ros2_kortex.git
version: main
# Remove ros2_robotiq_gripper when rolling binaries are available.
ros2_robotiq_gripper:
type: git
url: https://github.com/PickNikRobotics/ros2_robotiq_gripper.git
version: main
# Serial is a dependency of ros2_robotiq_gripper. Remove when ros2_robotiq_gripper binaries are available.
serial:
type: git
url: https://github.com/tylerjw/serial.git
version: ros2
>>>>>>> b2cd6c0 (Fix CI (#826))
2 changes: 1 addition & 1 deletion doc/examples/planning_adapters/planning_adapters_tutorial.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ To achieve this, follow the steps:
default_planner_request_adapters/FixStartStatePathConstraints
chomp/OptimizerAdapter" />

#. The values of the ``planning_adapters`` is the order in which the mentioned adapters are called / invoked. Order here matters. Inside the CHOMP adapter, a :moveit_codedir:`call <moveit_planners/chomp/chomp_optimizer_adapter/src/chomp_optimizer_adapter.cpp#L169>` to OMPL is made before invoking the CHOMP optimization solver, so CHOMP takes the initial path computed by OMPL as the starting point to further optimize it.
#. The values of the ``planning_adapters`` is the order in which the mentioned adapters are called / invoked. Order here matters. Inside the CHOMP adapter, a call to OMPL is made before invoking the CHOMP optimization solver, so CHOMP takes the initial path computed by OMPL as the starting point to further optimize it.

#. Find the line where ``<rosparam command="load" file="$(find panda_moveit_config)/config/ompl_planning.yaml"/>`` is mentioned and after this line, add the following: ::

Expand Down
18 changes: 18 additions & 0 deletions moveit2_tutorials.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,25 @@ repositories:
version: ros2
rosparam_shortcuts:
type: git
<<<<<<< HEAD
url: https://github.com/PickNikRobotics/rosparam_shortcuts
=======
url: https://github.com/Kinovarobotics/ros2_kortex.git
version: main
# Remove ros2_robotiq_gripper when rolling binaries are available.
ros2_robotiq_gripper:
type: git
url: https://github.com/PickNikRobotics/ros2_robotiq_gripper.git
version: main
# Serial is a dependency of ros2_robotiq_gripper. Remove when ros2_robotiq_gripper binaries are available.
serial:
type: git
url: https://github.com/tylerjw/serial.git
version: ros2
rviz_visual_tools:
type: git
url: https://github.com/PickNikRobotics/rviz_visual_tools.git
>>>>>>> b2cd6c0 (Fix CI (#826))
version: ros2
srdfdom:
type: git
Expand Down
Loading