Merge pull request #83 from zivid/update_to_sdk_2.9.0

Update to sdk 2.9.0
zivid · Apr 5, 2023 · 9d8783b · 9d8783b
2 parents bcd7770 + 7189da7
commit 9d8783b
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 41 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.8.1+dd4dffea-1'
+  NEWEST_ZIVID_VERSION: '2.9.0+4dbba385-1'
 
 jobs:
   code-analysis:
@@ -75,7 +75,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        zivid-version: ['2.5.0+19fa6891-1', '2.6.0+fa0036c5-1', '2.6.1+6cec8609-3', '2.7.0+e31dcbe2-1', '2.8.0+891708ba-1']
+        zivid-version: ['2.5.0+19fa6891-1', '2.6.0+fa0036c5-1', '2.6.1+6cec8609-3', '2.7.0+e31dcbe2-1', '2.8.0+891708ba-1', '2.8.1+dd4dffea-1']
         ros-distro: ['ros:noetic-ros-base-focal', 'ros:melodic-ros-base-bionic']
     steps:
       - name: Check out code

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 This project adheres to [Semantic Versioning](https://semver.org).
 
+## 2.4.0
+
+* Added support for PointXYZ and Range settings that are required for Zivid SDK 2.9.0 and newer
+* Added launch parameter to disable firmware upgrade automatically
+* Add support for loading capture settings via YML file
+
 ## 2.3.0
 
 * Add support for normals. Normals are exposed via topic "normals/xyz".

diff --git a/README.md b/README.md
diff --git a/continuous-integration/setup/setup_build_and_test.sh b/continuous-integration/setup/setup_build_and_test.sh
@@ -107,7 +107,7 @@ fi
 
 echo "Install Zivid and Telicam debian packages"
 
-ZIVID_RELEASE_DIR="https://www.zivid.com/hubfs/softwarefiles/releases/$CI_TEST_ZIVID_VERSION"
+ZIVID_RELEASE_DIR="https://downloads.zivid.com/sdk/releases/$CI_TEST_ZIVID_VERSION"
 ZIVID_TELICAM_SDK_DEB="zivid-telicam-driver_3.0.1.1-3_amd64.deb"
 
 if [[ "$UBUNTU_VERSION" == "18.04" ]]; then

diff --git a/zivid_camera/package.xml b/zivid_camera/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>zivid_camera</name>
-  <version>2.3.0</version>
+  <version>2.4.0</version>
   <description>Driver for using the Zivid 3D cameras in ROS.</description>
   <maintainer email="[email protected]">Zivid</maintainer>
   <license>BSD3</license>

diff --git a/zivid_camera/src/settings_generator.cpp b/zivid_camera/src/settings_generator.cpp
@@ -501,7 +501,7 @@ class ZividSettingsToConfigGenerator
       for (const auto comp : std::array{ "x", "y", "z" })
       {
         ss_ << "  " + cfg_id + "_" + comp + " = "
-            << "static_cast<float>(" + value_str + "." + comp + ");\n";
+            << "static_cast<double>(" + value_str + "." + comp + ");\n";
       }
     }
     else if constexpr (std::is_same_v<ValueType, Zivid::Range<double>>)

diff --git a/zivid_camera/test/test_zivid_camera.cpp b/zivid_camera/test/test_zivid_camera.cpp
@@ -511,7 +511,7 @@ TEST_F(CaptureOutputTest, testCapturePointsXYZWithROI)
     }
     return count;
   }();
-  ASSERT_EQ(numExpectedNaNZ, 2154265);
+  ASSERT_EQ(numExpectedNaNZ, 2154265U);
 
   for (size_t i = 0; i < expected.size(); ++i)
   {

diff --git a/zivid_samples/package.xml b/zivid_samples/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>zivid_samples</name>
-  <version>2.3.0</version>
+  <version>2.4.0</version>
   <description>Contains C++ and Python samples demonstrating
   use of the zivid_camera package.</description>
   <maintainer email="[email protected]">Zivid</maintainer>