Skip to content

Commit 4d7264b

Browse files
committed
Merge branch 'release_2.20.1.0' into main
2 parents b4ca86b + f579f50 commit 4d7264b

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

examples/Camera/camera_preview.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import time
66

77
# Connect to device and start pipeline
8-
with dai.Device(dai.OpenVINO.DEFAULT_VERSION, dai.UsbSpeed.SUPER_PLUS) as device:
8+
with dai.Device() as device:
99
# Device name
1010
print('Device name:', device.getDeviceName())
1111
# Bootloader version

examples/calibration/calibration_flash.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env python3
22

33
from pathlib import Path
4-
import cv2
54
import depthai as dai
65
import argparse
76

@@ -13,7 +12,7 @@
1312
args = parser.parse_args()
1413

1514
# Connect device
16-
with dai.Device(dai.OpenVINO.VERSION_2021_4, dai.UsbSpeed.HIGH) as device:
15+
with dai.Device(dai.OpenVINO.VERSION_UNIVERSAL, dai.UsbSpeed.HIGH) as device:
1716

1817
deviceCalib = device.readCalibration()
1918
deviceCalib.eepromToJsonFile(calibBackUpFile)

src/DeviceBindings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static void bindConstructors(ARG& arg){
250250
auto dev = deviceSearchHelper<D>();
251251
py::gil_scoped_release release;
252252
return std::make_unique<D>(version, dev);
253-
}), py::arg("version") = OpenVINO::DEFAULT_VERSION, DOC(dai, DeviceBase, DeviceBase, 10))
253+
}), py::arg("version") = OpenVINO::VERSION_UNIVERSAL, DOC(dai, DeviceBase, DeviceBase, 10))
254254
.def(py::init([](OpenVINO::Version version, bool usb2Mode){
255255
auto dev = deviceSearchHelper<D>();
256256
py::gil_scoped_release release;
@@ -491,7 +491,7 @@ void DeviceBindings::bind(pybind11::module& m, void* pCallstack){
491491
.def_static("getAnyAvailableDevice", [](){ return DeviceBase::getAnyAvailableDevice(); }, DOC(dai, DeviceBase, getAnyAvailableDevice, 2))
492492
.def_static("getFirstAvailableDevice", &DeviceBase::getFirstAvailableDevice, py::arg("skipInvalidDevices") = true, DOC(dai, DeviceBase, getFirstAvailableDevice))
493493
.def_static("getAllAvailableDevices", &DeviceBase::getAllAvailableDevices, DOC(dai, DeviceBase, getAllAvailableDevices))
494-
.def_static("getEmbeddedDeviceBinary", py::overload_cast<bool, OpenVINO::Version>(&DeviceBase::getEmbeddedDeviceBinary), py::arg("usb2Mode"), py::arg("version") = OpenVINO::DEFAULT_VERSION, DOC(dai, DeviceBase, getEmbeddedDeviceBinary))
494+
.def_static("getEmbeddedDeviceBinary", py::overload_cast<bool, OpenVINO::Version>(&DeviceBase::getEmbeddedDeviceBinary), py::arg("usb2Mode"), py::arg("version") = OpenVINO::VERSION_UNIVERSAL, DOC(dai, DeviceBase, getEmbeddedDeviceBinary))
495495
.def_static("getEmbeddedDeviceBinary", py::overload_cast<DeviceBase::Config>(&DeviceBase::getEmbeddedDeviceBinary), py::arg("config"), DOC(dai, DeviceBase, getEmbeddedDeviceBinary, 2))
496496
.def_static("getDeviceByMxId", &DeviceBase::getDeviceByMxId, py::arg("mxId"), DOC(dai, DeviceBase, getDeviceByMxId))
497497
.def_static("getAllConnectedDevices", &DeviceBase::getAllConnectedDevices, DOC(dai, DeviceBase, getAllConnectedDevices))

src/openvino/OpenVINOBindings.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ void OpenVINOBindings::bind(pybind11::module& m, void* pCallstack){
5252
.value("VERSION_2021_3", OpenVINO::Version::VERSION_2021_3)
5353
.value("VERSION_2021_4", OpenVINO::Version::VERSION_2021_4)
5454
.value("VERSION_2022_1", OpenVINO::Version::VERSION_2022_1)
55+
.value("VERSION_UNIVERSAL", OpenVINO::Version::VERSION_UNIVERSAL)
5556
.export_values()
5657
;
5758
// DEFAULT_VERSION binding

src/pipeline/PipelineBindings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void PipelineBindings::bind(pybind11::module& m, void* pCallstack){
9494
.def("unlink", &Pipeline::unlink, DOC(dai, Pipeline, unlink), DOC(dai, Pipeline, unlink))
9595
.def("getAssetManager", static_cast<const AssetManager& (Pipeline::*)() const>(&Pipeline::getAssetManager), py::return_value_policy::reference_internal, DOC(dai, Pipeline, getAssetManager))
9696
.def("getAssetManager", static_cast<AssetManager& (Pipeline::*)()>(&Pipeline::getAssetManager), py::return_value_policy::reference_internal, DOC(dai, Pipeline, getAssetManager))
97-
.def("setOpenVINOVersion", &Pipeline::setOpenVINOVersion, py::arg("version") = OpenVINO::DEFAULT_VERSION, DOC(dai, Pipeline, setOpenVINOVersion))
97+
.def("setOpenVINOVersion", &Pipeline::setOpenVINOVersion, py::arg("version"), DOC(dai, Pipeline, setOpenVINOVersion))
9898
.def("getOpenVINOVersion", &Pipeline::getOpenVINOVersion, DOC(dai, Pipeline, getOpenVINOVersion))
9999
.def("getRequiredOpenVINOVersion", &Pipeline::getRequiredOpenVINOVersion, DOC(dai, Pipeline, getRequiredOpenVINOVersion))
100100
.def("setCameraTuningBlobPath", &Pipeline::setCameraTuningBlobPath, py::arg("path"), DOC(dai, Pipeline, setCameraTuningBlobPath))

0 commit comments

Comments
 (0)