Skip to content

Commit

Permalink
Merge pull request #126 from zivid/update-to-sdk-2.14.1
Browse files Browse the repository at this point in the history
Update to Zivid SDK 2.14.1
  • Loading branch information
apartridge authored Jan 29, 2025
2 parents 40f8658 + f976e83 commit 6c6e4f3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ROS-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- cron: '0 22 * * *'

env:
NEWEST_ZIVID_VERSION: '2.14.0+e4a0c4a9-1'
NEWEST_ZIVID_VERSION: '2.14.1+b4e8f261-1'

jobs:
code-analysis:
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
strategy:
fail-fast: true
matrix:
zivid-version: ['2.9.0+4dbba385-1', '2.10.0+8ce7dae3-2', '2.10.1+50b274e8-7', '2.11.0+95829246-1', '2.11.1+de9b5dae-1', '2.12.0+6afd4961-1', '2.13.0+99a4ce9e-1', '2.13.1+18e79e79-1']
zivid-version: ['2.9.0+4dbba385-1', '2.10.0+8ce7dae3-2', '2.10.1+50b274e8-7', '2.11.0+95829246-1', '2.11.1+de9b5dae-1', '2.12.0+6afd4961-1', '2.13.0+99a4ce9e-1', '2.13.1+18e79e79-1', '2.14.0+e4a0c4a9-1']
ros-distro: ['ros:humble-ros-base-jammy']
steps:
- name: Check out code
Expand All @@ -87,7 +87,7 @@ jobs:
CI_TEST_ZIVID_VERSION=${{ matrix.zivid-version }} \
CI_TEST_OS=${{ matrix.ros-distro }} \
CI_TEST_COMPILER="g++" \
CI_TEST_DOWNLOAD_TELICAM=${{ (matrix.zivid-version == '2.12.0+6afd4961-1' || matrix.zivid-version == '2.13.0+99a4ce9e-1' || matrix.zivid-version == '2.13.1+18e79e79-1') && '0' || '1' }} \
CI_TEST_DOWNLOAD_TELICAM=${{ (matrix.zivid-version == '2.12.0+6afd4961-1' || matrix.zivid-version == '2.13.0+99a4ce9e-1' || matrix.zivid-version == '2.13.1+18e79e79-1' || matrix.zivid-version == '2.14.0+e4a0c4a9-1') && '0' || '1' }} \
./continuous-integration/run_build_and_test_in_docker.sh
- name: Notify Teams
if: ${{ failure() && github.ref == 'refs/heads/master' }}
Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

This is the official ROS driver for [Zivid 3D cameras](https://www.zivid.com/).

This driver provides support for ROS2. If you are looking for ROS1 support, please see the [`ros1-master` branch](https://github.com/zivid/zivid-ros/tree/ros1-master).
This driver provides support for ROS2.

If you are looking for the Zivid ROS1 driver, please use the [`ros1-master` branch](https://github.com/zivid/zivid-ros/tree/ros1-master) if
you are using Zivid SDK 2.13 or older, or use the [`ros1-sdk-2.14.0` branch](https://github.com/zivid/zivid-ros/tree/ros1-sdk-2.14.0) if you
are using Zivid SDK 2.14 or newer.

[![Build Status][ci-badge]][ci-url]
![Zivid Image][header-image]
Expand All @@ -26,12 +30,14 @@ This driver provides support for ROS2. If you are looking for ROS1 support, plea
### Support

This driver supports Ubuntu 20.04 / 22.04 / 24.04 with ROS2. Follow the official [ROS installation instructions](https://docs.ros.org/) for
your OS. If you are looking for the ROS1 driver, please see
the [`ros1-master` branch](https://github.com/zivid/zivid-ros/tree/ros1-master).
your OS.

If you are looking for the Zivid ROS1 driver, please use the [`ros1-master` branch](https://github.com/zivid/zivid-ros/tree/ros1-master) for
Zivid SDK 2.13 or older, or use the [`ros1-sdk-2.14.0` branch](https://github.com/zivid/zivid-ros/tree/ros1-sdk-2.14.0) for Zivid SDK 2.14 or newer.

### Zivid SDK

To use the ROS driver you need to download and install the "Zivid Core" package. Zivid SDK version 2.9.0 to 2.14.0 is
To use the ROS driver you need to download and install the "Zivid Core" package. Zivid SDK version 2.9.0 to 2.14.1 is
supported. See [releases](https://github.com/zivid/zivid-ros/releases) for older ROS driver releases
that supports older SDK versions.

Expand Down

0 comments on commit 6c6e4f3

Please sign in to comment.