diff --git a/README.md b/README.md index dd5cac73..5e9a9142 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.* diff --git a/continuous-integration/deployment/expected-version.txt b/continuous-integration/deployment/expected-version.txt index 522e4064..532b9a6b 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 \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/fedora-35/setup.sh b/continuous-integration/linux/platform-dependent/fedora-35/setup.sh index aa1f45c6..54fe2896 100755 --- a/continuous-integration/linux/platform-dependent/fedora-35/setup.sh +++ b/continuous-integration/linux/platform-dependent/fedora-35/setup.sh @@ -32,5 +32,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/fedora-36/setup.sh b/continuous-integration/linux/platform-dependent/fedora-36/setup.sh index dfaebe0b..2502c135 100755 --- a/continuous-integration/linux/platform-dependent/fedora-36/setup.sh +++ b/continuous-integration/linux/platform-dependent/fedora-36/setup.sh @@ -30,5 +30,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/fedora-37/setup.sh b/continuous-integration/linux/platform-dependent/fedora-37/setup.sh index dfaebe0b..2502c135 100755 --- a/continuous-integration/linux/platform-dependent/fedora-37/setup.sh +++ b/continuous-integration/linux/platform-dependent/fedora-37/setup.sh @@ -30,5 +30,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/ubuntu-20.04/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-20.04/setup.sh index 5a57f69a..be165f14 100755 --- a/continuous-integration/linux/platform-dependent/ubuntu-20.04/setup.sh +++ b/continuous-integration/linux/platform-dependent/ubuntu-20.04/setup.sh @@ -36,5 +36,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/ubuntu-22.04/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-22.04/setup.sh index 5961650b..85955f0d 100755 --- a/continuous-integration/linux/platform-dependent/ubuntu-22.04/setup.sh +++ b/continuous-integration/linux/platform-dependent/ubuntu-22.04/setup.sh @@ -35,5 +35,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/ubuntu-22.10/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-22.10/setup.sh index 5961650b..85955f0d 100755 --- a/continuous-integration/linux/platform-dependent/ubuntu-22.10/setup.sh +++ b/continuous-integration/linux/platform-dependent/ubuntu-22.10/setup.sh @@ -35,5 +35,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/ubuntu-23.04/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-23.04/setup.sh index 5f246445..ea390133 100755 --- a/continuous-integration/linux/platform-dependent/ubuntu-23.04/setup.sh +++ b/continuous-integration/linux/platform-dependent/ubuntu-23.04/setup.sh @@ -35,5 +35,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? diff --git a/continuous-integration/versions.json b/continuous-integration/versions.json index 2af8a9b1..d6bec83e 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-preview-1+e6413fd1-1", "ZIVID_TELICAM_EXACT_VERSION": "3.0.1.1-3" } \ No newline at end of file diff --git a/continuous-integration/windows/setup.py b/continuous-integration/windows/setup.py index ad844286..712dca12 100644 --- a/continuous-integration/windows/setup.py +++ b/continuous-integration/windows/setup.py @@ -15,7 +15,7 @@ def _install_zivid_sdk(): exact_version = json.loads(versions_json)["ZIVID_SDK_EXACT_VERSION"] with tempfile.TemporaryDirectory() as temp_dir: - zivid_installer_url = f"https://downloads.zivid.com/sdk/releases/{exact_version}/windows/ZividSetup_{exact_version}.exe" + zivid_installer_url = f"https://downloads.zivid.com/sdk/previews/{exact_version}/windows/ZividSetup_{exact_version}.exe" print("Downloading {}".format(zivid_installer_url), flush=True) zivid_installer = Path(temp_dir) / "ZividSetup.exe" response = requests.get(zivid_installer_url, timeout=(25, 600)) 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():