Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to SDK 2.14.0 #306

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Bump to SDK 2.14.0 #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1 (see [here][zivid-software-installation-url] for help)
* [Zivid SDK][zivid-download-software-url] version 2.14.0 (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.*
Expand Down
2 changes: 1 addition & 1 deletion continuous-integration/code-generation/datamodel_frontend_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ def generate_all_datamodels(dest_dir: Path) -> None:
(_zivid.Settings, "settings.py", ["datetime", "collections.abc"]),
(_zivid.Settings2D, "settings_2d.py", ["datetime", "collections.abc"]),
(_zivid.CameraInfo, "camera_info.py", []),
(_zivid.CameraState, "camera_state.py", []),
(_zivid.CameraState, "camera_state.py", ["collections.abc"]),
(_zivid.FrameInfo, "frame_info.py", ["datetime"]),
(
_zivid.capture_assistant.SuggestSettingsParameters,
Expand Down
2 changes: 1 addition & 1 deletion continuous-integration/deployment/expected-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.13.1.2.13.1
2.14.0.2.14.0
2 changes: 1 addition & 1 deletion continuous-integration/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ZIVID_SDK_EXACT_VERSION": "2.13.1+18e79e79-1"
"ZIVID_SDK_EXACT_VERSION": "2.14.0+e4a0c4a9-1"
}
6 changes: 6 additions & 0 deletions modules/zivid/camera_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,11 @@ def __str__(self):
class Model:

zivid2PlusL110 = "zivid2PlusL110"
zivid2PlusLR110 = "zivid2PlusLR110"
zivid2PlusM130 = "zivid2PlusM130"
zivid2PlusM60 = "zivid2PlusM60"
zivid2PlusMR130 = "zivid2PlusMR130"
zivid2PlusMR60 = "zivid2PlusMR60"
zividOnePlusLarge = "zividOnePlusLarge"
zividOnePlusMedium = "zividOnePlusMedium"
zividOnePlusSmall = "zividOnePlusSmall"
Expand All @@ -124,8 +127,11 @@ class Model:

_valid_values = {
"zivid2PlusL110": _zivid.CameraInfo.Model.zivid2PlusL110,
"zivid2PlusLR110": _zivid.CameraInfo.Model.zivid2PlusLR110,
"zivid2PlusM130": _zivid.CameraInfo.Model.zivid2PlusM130,
"zivid2PlusM60": _zivid.CameraInfo.Model.zivid2PlusM60,
"zivid2PlusMR130": _zivid.CameraInfo.Model.zivid2PlusMR130,
"zivid2PlusMR60": _zivid.CameraInfo.Model.zivid2PlusMR60,
"zividOnePlusLarge": _zivid.CameraInfo.Model.zividOnePlusLarge,
"zividOnePlusMedium": _zivid.CameraInfo.Model.zividOnePlusMedium,
"zividOnePlusSmall": _zivid.CameraInfo.Model.zividOnePlusSmall,
Expand Down
Loading
Loading