Skip to content

Commit

Permalink
Bump to SDK 2.14.0
Browse files Browse the repository at this point in the history
This commit bumps to the latest version of the Zivid SDK, 2.14.0 and
regenerates the datamodels. New features will be implemented in
following commits.

This commit adds a TypeName specialization for nested datamodel.
TypeName returns the name of the Python type that represents a data
model node. For a nested datamodel this is the wrapped class of
the nested datamodel.

This commit also updates checkerboard ZDFs and multicamera transforms.
In 2.14, we dropped support for legacy checkerboards that lack Aruco
markers. This commit replaces the checkerboard frames which had legacy
checkerboards with new frames. Also the multicamera transforms are
updated based on the new frames.
  • Loading branch information
johningve committed Dec 5, 2024
1 parent 8786f01 commit 8dfc5eb
Show file tree
Hide file tree
Showing 17 changed files with 671 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.md
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
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
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
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
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

0 comments on commit 8dfc5eb

Please sign in to comment.