Merge pull request #119 from zivid/update-to-sdk-2.14.0

Add support for SDK 2.14.0
zivid · Dec 5, 2024 · 9a28695 · 9a28695
2 parents 7a01be9 + 08bdce4
commit 9a28695
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/ROS-commit.yml b/.github/workflows/ROS-commit.yml
@@ -8,7 +8,7 @@ on:
     - cron:  '0 22 * * *'
 
 env:
-  NEWEST_ZIVID_VERSION: '2.13.1+18e79e79-1'
+  NEWEST_ZIVID_VERSION: '2.14.0+e4a0c4a9-1'
 
 jobs:
   code-analysis:
@@ -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']
+        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']
         ros-distro: ['ros:humble-ros-base-jammy']
     steps:
       - name: Check out code
@@ -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') && '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') && '0' || '1' }} \
           ./continuous-integration/run_build_and_test_in_docker.sh
       - name: Notify Teams
         if: ${{ failure() && github.ref == 'refs/heads/master' }}

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ the [`ros1-master` branch](https://github.com/zivid/zivid-ros/tree/ros1-master).
 
 ### 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.13.1 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.0 is
 supported. See [releases](https://github.com/zivid/zivid-ros/releases) for older ROS driver releases
 that supports older SDK versions.
 

diff --git a/zivid_camera/test/test_zivid_camera.cpp b/zivid_camera/test/test_zivid_camera.cpp
@@ -531,7 +531,11 @@ TEST_F(ZividNodeTest, testServiceCameraInfoModelName)
 {
   auto model_name_request =
     doEmptySrvRequest<zivid_interfaces::srv::CameraInfoModelName>("camera_info/model_name");
+#if (ZIVID_CORE_VERSION_MAJOR == 2 && ZIVID_CORE_VERSION_MINOR <= 13)
   ASSERT_EQ(model_name_request->model_name, std::string("FileCamera-") + ZIVID_CORE_VERSION);
+#else
+  ASSERT_EQ(model_name_request->model_name, std::string("FileCamera"));
+#endif
 }
 
 TEST_F(ZividNodeTest, testServiceCameraInfoSerialNumber)
@@ -672,11 +676,9 @@ TEST_F(TestWithFileCamera, testCapture2DExceptionsReturnErrors)
   data: 3
 Settings2D:
   Acquisitions:
-    - Acquisition:
-    - Acquisition:
 )";
 
-  // This capture throws because 2D capture does not support multiple acquisitions
+  // This capture throws because acquisitions list is empty
   verifyTriggerResponseError(doCapture2DUsingFilePath(settings2DYmlInvalid));
   verifyTriggerResponseError(doCapture2DUsingYmlString(settings2DYmlInvalid));
   topics_subscriber.assert_num_topics_received(0U);