diff --git a/.github/workflows/codecov_ci_action.yml b/.github/workflows/codecov_ci_action.yml index 440ed30..6873fed 100644 --- a/.github/workflows/codecov_ci_action.yml +++ b/.github/workflows/codecov_ci_action.yml @@ -6,7 +6,7 @@ jobs: codecov_ci: runs-on: ubuntu-latest container: - image: ros:humble-perception-jammy + image: ros:jazzy-perception-noble steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index cb4dafc..b6bd038 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -7,10 +7,10 @@ jobs: strategy: matrix: env: - - {ROS_DISTRO: humble, ROS_REPO: testing} - - {ROS_DISTRO: humble, ROS_REPO: main} + - {ROS_DISTRO: jazzy, ROS_REPO: testing} + - {ROS_DISTRO: jazzy, ROS_REPO: main} runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: 'ros-industrial/industrial_ci@master' - env: ${{matrix.env}} \ No newline at end of file + env: ${{matrix.env}} diff --git a/Dockerfile b/Dockerfile index 1f87bd6..ab034ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,10 @@ -FROM ros:humble-perception-jammy +FROM ros:jazzy-perception-noble MAINTAINER Bey Hao Yun -# Add user -RUN adduser --quiet --disabled-password user - # Install OpenCV RUN apt-get update && \ apt-get install -y xauth xxd x11-xserver-utils && \ rm -rf /var/lib/apt/lists/* -USER user - WORKDIR /home/user diff --git a/README.md b/README.md index c6e0ba4..bbbd929 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ A ROS2 package that **simulates a camera**, providing ROS messages from **playin ## **Dependencies** 1. [OpenCV](https://docs.opencv.org/master/d7/d9f/tutorial_linux_install.html) -2. ROS2 [Humble Hawksbill](https://docs.ros.org/en/humble/Installation.html) +2. ROS2 [Jazzy Jalisco](https://docs.ros.org/en/jazzy/Installation.html) ## **Setup** :hammer: @@ -21,7 +21,7 @@ A ROS2 package that **simulates a camera**, providing ROS messages from **playin cd $HOME git clone https://github.com/cardboardcode/virtual_camera.git --branch humble_devel --single-branch --depth 1 cd ~/virtual_camera -source /opt/ros/humble/setup.bash +source /opt/ros/jazzy/setup.bash colcon build ``` @@ -77,7 +77,7 @@ This section is for **users who do not want to worry about installing all depend **Build** the docker image. ```bash -docker build --tag vcam_image:humble . +docker build --tag vcam_image:jazzy . ``` **Run** the docker image. @@ -89,14 +89,14 @@ xhost +local:docker docker run -it \ --ipc host \ --net host \ ---name vcam_humble_test_container \ +--name vcam_jazzy_test_container \ -v $(pwd):/home/user/virtual_camera \ -e DISPLAY=$DISPLAY \ -v /tmp/.X11-unix:/tmp/.X11-unix \ -u 1000 \ - vcam_image:humble /bin/bash + vcam_image:jazzy /bin/bash # For subsequent run. -docker start vcam_humble_test_container && docker exec -it vcam_humble_test_container bash +docker start vcam_jazzy_test_container && docker exec -it vcam_humble_test_container bash ``` diff --git a/ci.sh b/ci.sh index ef19100..73ead68 100644 --- a/ci.sh +++ b/ci.sh @@ -9,10 +9,10 @@ pip install -U colcon-lcov-result # Install ROS 2 dependencies rosdep update -rosdep install -y --from-paths ./ --ignore-src --rosdistro humble +rosdep install -y --from-paths ./ --ignore-src --rosdistro jazzy # Build virtual_camera ROS 2 package -source /opt/ros/humble/setup.bash +source /opt/ros/jazzy/setup.bash colcon build --symlink-install --cmake-args \ -DCMAKE_CXX_FLAGS='-fprofile-arcs -ftest-coverage' \ -DCMAKE_C_FLAGS='-fprofile-arcs -ftest-coverage' diff --git a/include/virtual_camera/image_viewer.hpp b/include/virtual_camera/image_viewer.hpp index 8bf3d5b..5759130 100644 --- a/include/virtual_camera/image_viewer.hpp +++ b/include/virtual_camera/image_viewer.hpp @@ -19,7 +19,7 @@ #include #include -#include "cv_bridge/cv_bridge.h" +#include "cv_bridge/cv_bridge.hpp" #include "rclcpp/rclcpp.hpp" #include "std_msgs/msg/string.hpp" #include "sensor_msgs/msg/image.hpp" diff --git a/include/virtual_camera/virtual_camera.hpp b/include/virtual_camera/virtual_camera.hpp index 3e075d9..397e3ae 100644 --- a/include/virtual_camera/virtual_camera.hpp +++ b/include/virtual_camera/virtual_camera.hpp @@ -20,7 +20,7 @@ #include #include -#include "cv_bridge/cv_bridge.h" +#include "cv_bridge/cv_bridge.hpp" #include "rclcpp/rclcpp.hpp" #include "std_msgs/msg/string.hpp" #include "sensor_msgs/msg/image.hpp" diff --git a/scripts/build.bash b/scripts/build.bash index 3e743ec..7d55316 100755 --- a/scripts/build.bash +++ b/scripts/build.bash @@ -1,4 +1,4 @@ #!/usr/bin/env bash -source /opt/ros/humble/setup.bash +source /opt/ros/jazzy/setup.bash colcon build diff --git a/scripts/change_fps.bash b/scripts/change_fps.bash index 8f81137..1043c9a 100755 --- a/scripts/change_fps.bash +++ b/scripts/change_fps.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -source /opt/ros/foxy/setup.bash +source /opt/ros/jazzy/setup.bash echo "Please input the FPS integer (1-200)" read input diff --git a/scripts/generate_cov_report.bash b/scripts/generate_cov_report.bash index 1fff208..7e75575 100644 --- a/scripts/generate_cov_report.bash +++ b/scripts/generate_cov_report.bash @@ -1,6 +1,6 @@ # Source local ROS2 distro -source /opt/ros/humble/setup.bash +source /opt/ros/jazzy/setup.bash if [[ $1 == "update" ]]; then sudo rm -r build/ install/ log/ lcov/ diff --git a/scripts/run.bash b/scripts/run.bash index aa41f63..a5e68aa 100755 --- a/scripts/run.bash +++ b/scripts/run.bash @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source /opt/ros/humble/setup.bash +source /opt/ros/jazzy/setup.bash source install/setup.bash ros2 run virtual_camera virtual_camera diff --git a/scripts/show_image.bash b/scripts/show_image.bash index 84a009a..d1da002 100755 --- a/scripts/show_image.bash +++ b/scripts/show_image.bash @@ -1,5 +1,5 @@ #!/bin/env bash -source /opt/ros/humble/setup.bash +source /opt/ros/jazzy/setup.bash source install/setup.bash ros2 launch virtual_camera showimageraw.launch.py use_image_viewer:=true diff --git a/test/image_viewer_test.cpp b/test/image_viewer_test.cpp index 038de63..6795a28 100644 --- a/test/image_viewer_test.cpp +++ b/test/image_viewer_test.cpp @@ -19,7 +19,7 @@ #include #include -#include "cv_bridge/cv_bridge.h" +#include "cv_bridge/cv_bridge.hpp" #include "rclcpp/rclcpp.hpp" #include "std_msgs/msg/string.hpp" #include "sensor_msgs/msg/image.hpp" diff --git a/test/virtual_camera_test.cpp b/test/virtual_camera_test.cpp index 607ac45..c1b8d71 100644 --- a/test/virtual_camera_test.cpp +++ b/test/virtual_camera_test.cpp @@ -19,7 +19,7 @@ #include #include -#include "cv_bridge/cv_bridge.h" +#include "cv_bridge/cv_bridge.hpp" #include "rclcpp/rclcpp.hpp" #include "std_msgs/msg/string.hpp" #include "sensor_msgs/msg/image.hpp"