Skip to content

Commit 5c89737

Browse files
Abishalinimergify[bot]
authored andcommitted
Fix CI (#826)
* Add ros2 kortex to upstream repos * Update to commit with planning pipeline refactor change * Add ros2_robotiq_gripper repo for source build * Add serial to .repos file * Add ros2_robotiq_gripper to moveit2_tutorials.repo * Remove dead link (cherry picked from commit b2cd6c0) # Conflicts: # .github/upstream.repos # moveit2_tutorials.repos
1 parent 88dafc7 commit 5c89737

File tree

3 files changed

+41
-1
lines changed

3 files changed

+41
-1
lines changed

.github/upstream.repos

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,25 @@ repositories:
1515
type: git
1616
url: https://github.com/PickNikRobotics/rosparam_shortcuts
1717
version: ros2
18+
<<<<<<< HEAD
19+
=======
20+
rviz_visual_tools:
21+
type: git
22+
url: https://github.com/PickNikRobotics/rviz_visual_tools.git
23+
version: ros2
24+
# Remove ros2_kortex when rolling binaries are available.
25+
ros2_kortex:
26+
type: git
27+
url: https://github.com/Kinovarobotics/ros2_kortex.git
28+
version: main
29+
# Remove ros2_robotiq_gripper when rolling binaries are available.
30+
ros2_robotiq_gripper:
31+
type: git
32+
url: https://github.com/PickNikRobotics/ros2_robotiq_gripper.git
33+
version: main
34+
# Serial is a dependency of ros2_robotiq_gripper. Remove when ros2_robotiq_gripper binaries are available.
35+
serial:
36+
type: git
37+
url: https://github.com/tylerjw/serial.git
38+
version: ros2
39+
>>>>>>> b2cd6c0 (Fix CI (#826))

doc/examples/planning_adapters/planning_adapters_tutorial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ To achieve this, follow the steps:
5353
default_planner_request_adapters/FixStartStatePathConstraints
5454
chomp/OptimizerAdapter" />
5555

56-
#. 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.
56+
#. 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.
5757

5858
#. 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: ::
5959

moveit2_tutorials.repos

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,25 @@ repositories:
2121
version: ros2
2222
rosparam_shortcuts:
2323
type: git
24+
<<<<<<< HEAD
2425
url: https://github.com/PickNikRobotics/rosparam_shortcuts
26+
=======
27+
url: https://github.com/Kinovarobotics/ros2_kortex.git
28+
version: main
29+
# Remove ros2_robotiq_gripper when rolling binaries are available.
30+
ros2_robotiq_gripper:
31+
type: git
32+
url: https://github.com/PickNikRobotics/ros2_robotiq_gripper.git
33+
version: main
34+
# Serial is a dependency of ros2_robotiq_gripper. Remove when ros2_robotiq_gripper binaries are available.
35+
serial:
36+
type: git
37+
url: https://github.com/tylerjw/serial.git
38+
version: ros2
39+
rviz_visual_tools:
40+
type: git
41+
url: https://github.com/PickNikRobotics/rviz_visual_tools.git
42+
>>>>>>> b2cd6c0 (Fix CI (#826))
2543
version: ros2
2644
srdfdom:
2745
type: git

0 commit comments

Comments
 (0)