diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index 62551453..00000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,5 +0,0 @@ -## Related Issues & PRs - -## Summary of Changes - -## Validation diff --git a/Dockerfile b/Dockerfile index 8df6e146..2daff237 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,7 +60,6 @@ SHELL ["/bin/bash", "-c"] RUN source /opt/ros/$ROS_DISTRO/setup.bash \ && colcon build \ --symlink-install \ - -executor sequential \ --cmake-args \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" diff --git a/docker-compose.yaml b/docker-compose.yaml index b1603df0..a89a588a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,30 +1,34 @@ version: '3.8' +# lidar hostname: os1-122007000043 + services: freya-lidar: - # os1-122007000043 container_name: ouster-lidar-freya image: ghcr.io/vortexntnu/ouster-lidar-ros2-driver-humble:2023-10-09 ports: - 7502:7502/udp # lidar output port + - 7503:7503/udp # imu output port entrypoint: ["bash", "-c", "set -e \ && source ./install/setup.bash \ && ros2 launch ouster_ros sensor.launch.xml \ sensor_hostname:=169.254.154.82 \ lidar_port:=7502 \ + imu_port:=7503 \ viz:=false ", "ros-entrypoint"] - # ^Change to freya static-ip test-lidar: container_name: ouster-lidar-test image: ghcr.io/vortexntnu/ouster-lidar-ros2-driver-humble:2023-10-09 ports: - - 7503:7503/udp # lidar output port + - 7502:7502/udp # lidar output port + - 7503:7503/udp # imu output port entrypoint: ["bash", "-c", "set -e \ && source ./install/setup.bash \ && ros2 launch ouster_ros sensor.launch.xml \ sensor_hostname:=10.0.0.122 \ - lidar_port:=7503 \ + lidar_port:=7502 \ + imu_port:=7503 \ viz:=false - ", "ros-entrypoint"] + ", "ros-entrypoint"] \ No newline at end of file