Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 3 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,12 @@
[submodule "src/external/mujoco_ros2_control"]
path = src/external/mujoco_ros2_control
url = https://github.com/ros-controls/mujoco_ros2_control.git
[submodule "external/roboplan-ros"]
path = src/external/roboplan-ros
url = https://github.com/open-planning/roboplan-ros.git
[submodule "src/external/imetro_behavior"]
path = src/external/imetro_behavior
url = https://github.com/NASA-JSC-Robotics/imetro_behavior.git
[submodule "src/external/color_tools"]
path = src/external/color_tools
url = https://github.com/NASA-JSC-Robotics/color_tools.git
[submodule "src/external/roboplan"]
path = src/external/roboplan
url = https://github.com/open-planning/roboplan.git
[submodule "src/external/roboplan-ros"]
path = src/external/roboplan-ros
url = https://github.com/open-planning/roboplan-ros.git
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
COPY --chown=${USERNAME}:${USERNAME} src/ src/

# Setup colcon default mixins and add default settings
RUN touch /home/${USERNAME}/.netrc
RUN colcon mixin add default \
https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml && \
colcon mixin update || true
Expand Down
2 changes: 0 additions & 2 deletions config/colcon-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ build:
- build-testing-on
- ccache
- compile-commands
packages-ignore:
- btcpp_ros2_samples
test:
event-handlers:
- console_direct+
4,226 changes: 2,550 additions & 1,676 deletions pixi.lock

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ mold = ">=2.40.4,<3"
colcon-common-extensions = ">=0.3.0,<0.4"
colcon-mixin = ">=0.2.3,<0.3"
pip = "*"
nanobind = ">=2.8.0,<3"
nanobind = ">=2.12.0,<3"
# This is dark but if we don't match the exact version of what was used in
# core roboplan objects will not be able to be shared in the bindings.
nanobind-abi = "==20"
trimesh = ">=4.11.4,<5"
pycollada = ">=0.9.3,<0.10"
viser = ">=1.0.29,<2"
Expand Down Expand Up @@ -119,6 +122,14 @@ ros-jazzy-ur-robot-driver = "*"
ros-jazzy-velocity-controllers = "*"
ros-jazzy-xacro = "*"

# RoboPlan dependencies
ros-jazzy-roboplan = "*"
ros-jazzy-roboplan-cartesian-planning = "*"
ros-jazzy-roboplan-oink = "*"
ros-jazzy-roboplan-rrt = "*"
ros-jazzy-roboplan-simple-ik = "*"
ros-jazzy-roboplan-toppra = "*"

# Dependencies that not available on conda-forge and must be fetched from PyPi.
# Try not to use this section unless absolutely necessary.
[pypi-dependencies]
Expand Down
4 changes: 4 additions & 0 deletions src/clr_demos/clr_roboplan_demos/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@
<buildtool_depend>ament_cmake_python</buildtool_depend>

<depend>roboplan</depend>
<depend>roboplan_cartesian_planning</depend>
<depend>roboplan_simple_ik</depend>
<depend>roboplan_oink</depend>
<depend>roboplan_rrt</depend>
<depend>roboplan_toppra</depend>
<depend>roboplan_ros_py</depend>
<depend>roboplan_ros_cpp</depend>
<depend>roboplan_ros_visualization</depend>
<depend>xacro</depend>

<export>
Expand Down
1 change: 0 additions & 1 deletion src/external/roboplan
Submodule roboplan deleted from ac29aa
Loading