From 8bb3df2899997bceefbe703ca6c98b55e107eded Mon Sep 17 00:00:00 2001 From: Myron Rodrigues <41271144+MRo47@users.noreply.github.com> Date: Mon, 29 Apr 2024 09:34:30 +0100 Subject: [PATCH 1/2] [Iron] Fix aruco dictionary names (#971) There was a aruco dictionary naming issue in `iron`, this seems to be fixed in `rolling`. where the `x` had to be changed to `X` --- .../src/camera_calibration/calibrator.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/camera_calibration/src/camera_calibration/calibrator.py b/camera_calibration/src/camera_calibration/calibrator.py index 6f7744612..f0fe63cf5 100644 --- a/camera_calibration/src/camera_calibration/calibrator.py +++ b/camera_calibration/src/camera_calibration/calibrator.py @@ -80,14 +80,14 @@ def __init__(self, pattern="chessboard", n_cols = 0, n_rows = 0, dim = 0.0, mark "5x5_100" : cv2.aruco.DICT_5X5_100, "5x5_250" : cv2.aruco.DICT_5X5_250, "5x5_1000" : cv2.aruco.DICT_5X5_1000, - "6x6_50" : cv2.aruco.DICT_6x6_50, - "6x6_100" : cv2.aruco.DICT_6x6_100, - "6x6_250" : cv2.aruco.DICT_6x6_250, - "6x6_1000" : cv2.aruco.DICT_6x6_1000, - "7x7_50" : cv2.aruco.DICT_7x7_50, - "7x7_100" : cv2.aruco.DICT_7x7_100, - "7x7_250" : cv2.aruco.DICT_7x7_250, - "7x7_1000" : cv2.aruco.DICT_7x7_1000}[aruco_dict]) + "6x6_50" : cv2.aruco.DICT_6X6_50, + "6x6_100" : cv2.aruco.DICT_6X6_100, + "6x6_250" : cv2.aruco.DICT_6X6_250, + "6x6_1000" : cv2.aruco.DICT_6X6_1000, + "7x7_50" : cv2.aruco.DICT_7X7_50, + "7x7_100" : cv2.aruco.DICT_7X7_100, + "7x7_250" : cv2.aruco.DICT_7X7_250, + "7x7_1000" : cv2.aruco.DICT_7X7_1000}[aruco_dict]) self.charuco_board = cv2.aruco.CharucoBoard_create(self.n_cols, self.n_rows, self.dim, self.marker_size, self.aruco_dict) From 544562baaf80ba88701d0783de74122cbc2c83f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Tue, 30 Apr 2024 10:15:18 +0200 Subject: [PATCH 2/2] updated iron CI (#974) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero --- .github/workflows/basic-build-ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/basic-build-ci.yaml b/.github/workflows/basic-build-ci.yaml index e308066fb..377321aae 100644 --- a/.github/workflows/basic-build-ci.yaml +++ b/.github/workflows/basic-build-ci.yaml @@ -2,20 +2,20 @@ name: Basic Build Workflow on: push: - branches: [rolling] + branches: [iron] pull_request: types: [opened, reopened, synchronize] jobs: - build-rolling: + build-iron: runs-on: ubuntu-latest strategy: fail-fast: false container: - image: osrf/ros2:testing + image: ros:iron-ros-core steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Create Workspace run: | mkdir src_tmp @@ -24,7 +24,7 @@ jobs: - name: Install Prerequisites run: | bash -c 'source /opt/ros/$ROS_DISTRO/setup.bash; \ - apt-get update && apt-get upgrade -y && rosdep update; \ + apt-get update && apt-get upgrade -y && apt-get install ros-dev-tools -y && rosdep init && rosdep update; \ rosdep install --from-paths src --ignore-src -y' - name: Build Workspace run: |