Skip to content

Commit

Permalink
revision after feedback from ros2/rmw_zenoh#404
Browse files Browse the repository at this point in the history
  • Loading branch information
juliangaal committed Jan 10, 2025
1 parent ee948bc commit 1190be8
Show file tree
Hide file tree
Showing 12 changed files with 333 additions and 113 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "rmw_zenoh"]
path = rmw_zenoh
url = [email protected]:ros2/rmw_zenoh.git
[submodule "ouster-ros"]
path = ouster-ros
url = [email protected]:ouster-lidar/ouster-ros.git
42 changes: 42 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
FROM ros:jazzy-ros-base

ENV ROS_WS=/ros2
WORKDIR $ROS_WS

COPY rmw_zenoh src/rmw_zenoh
COPY meta src/meta

RUN apt-get update &&\
rosdep update &&\
rosdep install --from-paths src --ignore-src -y &&\
rm -rf /var/lib/apt/lists/*

SHELL ["/bin/bash", "-c"]

RUN source /opt/ros/$ROS_DISTRO/setup.bash &&\
colcon build \
--event-handlers console_direct+ \
--parallel-workers $(nproc) \
--cmake-args -DCMAKE_BUILD_TYPE=Release

ARG INSTALL_DESKTOP=false

RUN if [ "$INSTALL_DESKTOP" = "true" ]; then \
apt-get update &&\
apt-get install -y ros-${ROS_DISTRO}-desktop &&\
rm -rf /var/lib/apt/lists/*; \
fi

COPY ouster_simulator src/ouster_simulator

RUN source /opt/ros/$ROS_DISTRO/setup.bash &&\
colcon build \
--event-handlers console_direct+ \
--parallel-workers $(nproc) \
--cmake-args -DCMAKE_BUILD_TYPE=Release

ENV ROS_DOMAIN_ID=10
ENV RMW_IMPLEMENTATION=rmw_zenoh_cpp
COPY entrypoint.sh .
ENTRYPOINT ["./entrypoint.sh"]

21 changes: 0 additions & 21 deletions Dockerfile.jazzy.ouster

This file was deleted.

23 changes: 0 additions & 23 deletions Dockerfile.jazzy.zenoh

This file was deleted.

64 changes: 0 additions & 64 deletions entrypoint.ouster.sh

This file was deleted.

File renamed without changes.
1 change: 0 additions & 1 deletion meta/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

<buildtool_depend>ament_cmake</buildtool_depend>
<exec_depend>demo_nodes_cpp</exec_depend>
<exec_depend>desktop</exec_depend>
<exec_depend>foxglove_bridge</exec_depend>

</package>
Expand Down
1 change: 0 additions & 1 deletion ouster-ros
Submodule ouster-ros deleted from e4dd8b
30 changes: 30 additions & 0 deletions ouster_simulator/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
cmake_minimum_required(VERSION 3.8)
project(ouster_simulator)

set(CMAKE_CXX_STANDARD 17)

find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(sensor_msgs REQUIRED)

add_executable(ouster_publisher_node src/ouster_publisher_node.cpp)
ament_target_dependencies(
ouster_publisher_node
rclcpp
sensor_msgs
)

add_executable(ouster_subscriber_node src/ouster_subscriber_node.cpp)
ament_target_dependencies(
ouster_subscriber_node
rclcpp
sensor_msgs
)

install(
TARGETS ouster_publisher_node ouster_subscriber_node
DESTINATION lib/${PROJECT_NAME}
)

ament_package()

17 changes: 17 additions & 0 deletions ouster_simulator/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<package format="3">
<name>ouster_simulator</name>
<version>0.0.1</version>
<description>Example package that publishes/subscibes pointclouds in ouster format</description>
<maintainer email="[email protected]">Your Name</maintainer>
<license>MIT</license>
<buildtool_depend>ament_cmake</buildtool_depend>
<build_depend>rclcpp</build_depend>
<build_depend>sensor_msgs</build_depend>
<exec_depend>rclcpp</exec_depend>
<exec_depend>sensor_msgs</exec_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
</package>
Loading

0 comments on commit 1190be8

Please sign in to comment.