Merge remote-tracking branch 'upstream/rolling' into rolling

.github/workflows/basic-build-ci.yaml

@@ -8,21 +8,54 @@ on:
 
 jobs:
   build-rolling:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    container:
+      image: osrf/ros2:devel
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v4
+    - name: Create Workspace
+      run: |
+        mkdir src_tmp
+        mv `find -maxdepth 1 -not -name . -not -name src_tmp` src_tmp/
+        mv src_tmp/ src/
+    - name: Install Prerequisites
+      run: |
+        bash -c 'source /opt/ros/rolling/setup.bash; \
+        apt-get update && apt-get upgrade -y && rosdep update; \
+        rosdep install --from-paths src --ignore-src --rosdistro=rolling -y'
+    - name: Build Workspace
+      run: |
+        bash -c 'source /opt/ros/rolling/setup.bash; \
+        colcon build'
+    - name: Run Tests
+      run: |
+        bash -c 'source /opt/ros/rolling/setup.bash; \
+        colcon test; \
+        colcon test-result --verbose'
+  build-rolling-testing:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     container:
       image: osrf/ros2:testing
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Create Workspace
       run: |
         mkdir src_tmp
         mv `find -maxdepth 1 -not -name . -not -name src_tmp` src_tmp/
         mv src_tmp/ src/
     - name: Install Prerequisites
       run: |
+        apt update -qq
+        apt install -qq -y lsb-release wget curl gnupg2 git
+        curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros2-testing-archive-keyring.gpg
+        echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros2-testing-archive-keyring.gpg] http://packages.ros.org/ros2-testing/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null
+        apt-get update && apt-get upgrade -q -y
         bash -c 'source /opt/ros/$ROS_DISTRO/setup.bash; \
         apt-get update && apt-get upgrade -y && rosdep update; \
         rosdep install --from-paths src --ignore-src -y'

camera_calibration/CHANGELOG.rst

@@ -2,6 +2,38 @@
 Changelog for package camera_calibration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+6.0.3 (2024-08-20)
+------------------
+* Refactoring calibration code (`#1000 <https://github.com/ros-perception/image_pipeline/issues/1000>`_)
+  Co-authored-by: Alejandro Hernández Cordero <[email protected]>
+* Contributors: Myron Rodrigues
+
+6.0.2 (2024-07-23)
+------------------
+
+6.0.1 (2024-07-22)
+------------------
+* Change camera info message to lower case (`#1005 <https://github.com/ros-perception/image_pipeline/issues/1005>`_)
+  Change camera info message to lower case since message type had been
+  change in rolling and humble.
+  [](https://github.com/ros2/common_interfaces/blob/rolling/sensor_msgs/msg/CameraInfo.msg)
+* Formatting calib code before refactoring (`#999 <https://github.com/ros-perception/image_pipeline/issues/999>`_)
+  As discussed in `#975 <https://github.com/ros-perception/image_pipeline/issues/975>`_ and `#973 <https://github.com/ros-perception/image_pipeline/issues/973>`_
+  doing the linting first.
+  using style from
+  [here](https://github.com/ament/ament_lint/blob/rolling/ament_pycodestyle/ament_pycodestyle/configuration/ament_pycodestyle.ini)
+* Added stereo calibration using charuco board (`#976 <https://github.com/ros-perception/image_pipeline/issues/976>`_)
+  From `#972 <https://github.com/ros-perception/image_pipeline/issues/972>`_
+  Doing this first for rolling.
+  This was a TODO in the repository, opening this PR to add this feature.
+  - The main issue why this wasn't possible imo is the way `mk_obj_points`
+  works. I'm using the inbuilt opencv function to get the points there.
+  - The other is a condition when aruco markers are detected they are
+  added as good points, This is fine in case of mono but in stereo these
+  have to be the same number as the object points to find matches although
+  this should be possible with aruco.
+* Contributors: Myron Rodrigues, SFhmichael
+
 6.0.0 (2024-05-27)
 ------------------
 * fix: cv2.aruco.interpolateCornersCharuco is deprecated (`#979 <https://github.com/ros-perception/image_pipeline/issues/979>`_)

camera_calibration/doc/api.rst

@@ -1,8 +1,8 @@
 API Documentation
 =================
 
-.. autoclass:: camera_calibration.calibrator.MonoCalibrator
+.. autoclass:: camera_calibration.mono_calibrator.MonoCalibrator
     :members:
 
-.. autoclass:: camera_calibration.calibrator.StereoCalibrator
+.. autoclass:: camera_calibration.stereo_calibrator.StereoCalibrator
     :members:

camera_calibration/package.xml

@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>camera_calibration</name>
-  <version>6.0.0</version>
+  <version>6.0.3</version>
   <description>
      camera_calibration allows easy calibration of monocular or stereo
      cameras using a checkerboard calibration target.

camera_calibration/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='6.0.0',
+    version='6.0.3',
     packages=["camera_calibration", "camera_calibration.nodes"],
     data_files=[
         ('share/ament_index/resource_index/packages',