From b39dcd03849e7f81b797d070b150efab90325499 Mon Sep 17 00:00:00 2001 From: John Ingve Olsen Date: Thu, 19 Oct 2023 15:31:53 +0200 Subject: [PATCH] Support for Zivid SDK 2.10.1 This release adds support for the Zivid 2+ models L110 and M60. --- README.md | 4 ++-- continuous-integration/deployment/expected-version.txt | 2 +- continuous-integration/versions.json | 4 ++-- modules/zivid/camera_info.py | 4 ++++ setup.py | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a40941dd..d989e415 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Zivid Python is the official Python package for Zivid 3D cameras. Read more abou ### Dependencies * [Python](https://www.python.org/) version 3.7 or higher -* [Zivid SDK][zivid-download-software-url] version 2.10.0 (see [here][zivid-software-installation-url] for help) +* [Zivid SDK][zivid-download-software-url] version 2.10.1 (see [here][zivid-software-installation-url] for help) * [Compiler](doc/CompilerInstallation.md) with C++17 support *Ubuntu users must install Python headers (`apt install python3-dev`) in addition to the regular `python3` package.* @@ -189,4 +189,4 @@ Please visit [Zivid Knowledge Base][zivid-knowledge-base-url] for general inform [zivid-software-url]: http://www.zivid.com/software [zivid-python-releases-url]: https://pypi.org/project/zivid/#history [zivid-studio-guide-url]: https://support.zivid.com/en/latest/getting-started/studio-guide.html -[zivid-two-standard-settings-url]: https://support.zivid.com/en/latest/reference-articles/standard-acquisition-settings-zivid-two.html \ No newline at end of file +[zivid-two-standard-settings-url]: https://support.zivid.com/en/latest/reference-articles/standard-acquisition-settings-zivid-two.html diff --git a/continuous-integration/deployment/expected-version.txt b/continuous-integration/deployment/expected-version.txt index 522e4064..5777c832 100644 --- a/continuous-integration/deployment/expected-version.txt +++ b/continuous-integration/deployment/expected-version.txt @@ -1 +1 @@ -2.10.0.2.10.0 \ No newline at end of file +2.10.1.2.10.1 diff --git a/continuous-integration/versions.json b/continuous-integration/versions.json index 2af8a9b1..3ec47841 100644 --- a/continuous-integration/versions.json +++ b/continuous-integration/versions.json @@ -1,4 +1,4 @@ { - "ZIVID_SDK_EXACT_VERSION": "2.10.0+8ce7dae3-2", + "ZIVID_SDK_EXACT_VERSION": "2.10.1+50b274e8-7", "ZIVID_TELICAM_EXACT_VERSION": "3.0.1.1-3" -} \ No newline at end of file +} diff --git a/modules/zivid/camera_info.py b/modules/zivid/camera_info.py index cd2c31c6..33994658 100644 --- a/modules/zivid/camera_info.py +++ b/modules/zivid/camera_info.py @@ -106,7 +106,9 @@ def __str__(self): return str(_to_internal_camera_info_user_data(self)) class Model: + zivid2PlusL110 = "zivid2PlusL110" zivid2PlusM130 = "zivid2PlusM130" + zivid2PlusM60 = "zivid2PlusM60" zividOnePlusLarge = "zividOnePlusLarge" zividOnePlusMedium = "zividOnePlusMedium" zividOnePlusSmall = "zividOnePlusSmall" @@ -114,7 +116,9 @@ class Model: zividTwoL100 = "zividTwoL100" _valid_values = { + "zivid2PlusL110": _zivid.CameraInfo.Model.zivid2PlusL110, "zivid2PlusM130": _zivid.CameraInfo.Model.zivid2PlusM130, + "zivid2PlusM60": _zivid.CameraInfo.Model.zivid2PlusM60, "zividOnePlusLarge": _zivid.CameraInfo.Model.zividOnePlusLarge, "zividOnePlusMedium": _zivid.CameraInfo.Model.zividOnePlusMedium, "zividOnePlusSmall": _zivid.CameraInfo.Model.zividOnePlusSmall, diff --git a/setup.py b/setup.py index 6f662856..bd757d75 100644 --- a/setup.py +++ b/setup.py @@ -10,11 +10,11 @@ # To be replaced by: from setuptools_scm import get_version def get_version(): - return "2.10.0" + return "2.10.1" def _zivid_sdk_version(): - return "2.10.0" + return "2.10.1" def _zivid_python_version():