diff --git a/depthai-core b/depthai-core index 49a036445..01fdd7d26 160000 --- a/depthai-core +++ b/depthai-core @@ -1 +1 @@ -Subproject commit 49a036445d3a750477cf32ff4b23ed718e14d3b1 +Subproject commit 01fdd7d26341b8a800cce6292cc6f9a21c75bce7 diff --git a/examples/Camera/camera_preview.py b/examples/Camera/camera_preview.py index ba9aa108a..88c5cc3c3 100755 --- a/examples/Camera/camera_preview.py +++ b/examples/Camera/camera_preview.py @@ -5,7 +5,7 @@ import time # Connect to device and start pipeline -with dai.Device(dai.OpenVINO.DEFAULT_VERSION, dai.UsbSpeed.SUPER_PLUS) as device: +with dai.Device() as device: # Device name print('Device name:', device.getDeviceName()) # Bootloader version diff --git a/examples/calibration/calibration_flash.py b/examples/calibration/calibration_flash.py index 34a552d50..325902921 100755 --- a/examples/calibration/calibration_flash.py +++ b/examples/calibration/calibration_flash.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 from pathlib import Path -import cv2 import depthai as dai import argparse @@ -13,7 +12,7 @@ args = parser.parse_args() # Connect device -with dai.Device(dai.OpenVINO.VERSION_2021_4, dai.UsbSpeed.HIGH) as device: +with dai.Device(dai.OpenVINO.VERSION_UNIVERSAL, dai.UsbSpeed.HIGH) as device: deviceCalib = device.readCalibration() deviceCalib.eepromToJsonFile(calibBackUpFile) diff --git a/src/DeviceBindings.cpp b/src/DeviceBindings.cpp index a61e3e770..976354b8b 100644 --- a/src/DeviceBindings.cpp +++ b/src/DeviceBindings.cpp @@ -250,7 +250,7 @@ static void bindConstructors(ARG& arg){ auto dev = deviceSearchHelper(); py::gil_scoped_release release; return std::make_unique(version, dev); - }), py::arg("version") = OpenVINO::DEFAULT_VERSION, DOC(dai, DeviceBase, DeviceBase, 10)) + }), py::arg("version") = OpenVINO::VERSION_UNIVERSAL, DOC(dai, DeviceBase, DeviceBase, 10)) .def(py::init([](OpenVINO::Version version, bool usb2Mode){ auto dev = deviceSearchHelper(); py::gil_scoped_release release; @@ -491,7 +491,7 @@ void DeviceBindings::bind(pybind11::module& m, void* pCallstack){ .def_static("getAnyAvailableDevice", [](){ return DeviceBase::getAnyAvailableDevice(); }, DOC(dai, DeviceBase, getAnyAvailableDevice, 2)) .def_static("getFirstAvailableDevice", &DeviceBase::getFirstAvailableDevice, py::arg("skipInvalidDevices") = true, DOC(dai, DeviceBase, getFirstAvailableDevice)) .def_static("getAllAvailableDevices", &DeviceBase::getAllAvailableDevices, DOC(dai, DeviceBase, getAllAvailableDevices)) - .def_static("getEmbeddedDeviceBinary", py::overload_cast(&DeviceBase::getEmbeddedDeviceBinary), py::arg("usb2Mode"), py::arg("version") = OpenVINO::DEFAULT_VERSION, DOC(dai, DeviceBase, getEmbeddedDeviceBinary)) + .def_static("getEmbeddedDeviceBinary", py::overload_cast(&DeviceBase::getEmbeddedDeviceBinary), py::arg("usb2Mode"), py::arg("version") = OpenVINO::VERSION_UNIVERSAL, DOC(dai, DeviceBase, getEmbeddedDeviceBinary)) .def_static("getEmbeddedDeviceBinary", py::overload_cast(&DeviceBase::getEmbeddedDeviceBinary), py::arg("config"), DOC(dai, DeviceBase, getEmbeddedDeviceBinary, 2)) .def_static("getDeviceByMxId", &DeviceBase::getDeviceByMxId, py::arg("mxId"), DOC(dai, DeviceBase, getDeviceByMxId)) .def_static("getAllConnectedDevices", &DeviceBase::getAllConnectedDevices, DOC(dai, DeviceBase, getAllConnectedDevices)) diff --git a/src/openvino/OpenVINOBindings.cpp b/src/openvino/OpenVINOBindings.cpp index e2b9e1451..8ebd32198 100644 --- a/src/openvino/OpenVINOBindings.cpp +++ b/src/openvino/OpenVINOBindings.cpp @@ -52,6 +52,7 @@ void OpenVINOBindings::bind(pybind11::module& m, void* pCallstack){ .value("VERSION_2021_3", OpenVINO::Version::VERSION_2021_3) .value("VERSION_2021_4", OpenVINO::Version::VERSION_2021_4) .value("VERSION_2022_1", OpenVINO::Version::VERSION_2022_1) + .value("VERSION_UNIVERSAL", OpenVINO::Version::VERSION_UNIVERSAL) .export_values() ; // DEFAULT_VERSION binding diff --git a/src/pipeline/PipelineBindings.cpp b/src/pipeline/PipelineBindings.cpp index cfdd9f588..12eb4ee07 100644 --- a/src/pipeline/PipelineBindings.cpp +++ b/src/pipeline/PipelineBindings.cpp @@ -94,7 +94,7 @@ void PipelineBindings::bind(pybind11::module& m, void* pCallstack){ .def("unlink", &Pipeline::unlink, DOC(dai, Pipeline, unlink), DOC(dai, Pipeline, unlink)) .def("getAssetManager", static_cast(&Pipeline::getAssetManager), py::return_value_policy::reference_internal, DOC(dai, Pipeline, getAssetManager)) .def("getAssetManager", static_cast(&Pipeline::getAssetManager), py::return_value_policy::reference_internal, DOC(dai, Pipeline, getAssetManager)) - .def("setOpenVINOVersion", &Pipeline::setOpenVINOVersion, py::arg("version") = OpenVINO::DEFAULT_VERSION, DOC(dai, Pipeline, setOpenVINOVersion)) + .def("setOpenVINOVersion", &Pipeline::setOpenVINOVersion, py::arg("version"), DOC(dai, Pipeline, setOpenVINOVersion)) .def("getOpenVINOVersion", &Pipeline::getOpenVINOVersion, DOC(dai, Pipeline, getOpenVINOVersion)) .def("getRequiredOpenVINOVersion", &Pipeline::getRequiredOpenVINOVersion, DOC(dai, Pipeline, getRequiredOpenVINOVersion)) .def("setCameraTuningBlobPath", &Pipeline::setCameraTuningBlobPath, py::arg("path"), DOC(dai, Pipeline, setCameraTuningBlobPath))