From 7d629ae65f4ab8731938fb4bcbf36ed17297bff5 Mon Sep 17 00:00:00 2001 From: CsabaGergely Date: Fri, 4 Jun 2021 01:36:25 +0300 Subject: [PATCH 1/4] Update doc --- depthai-core | 2 +- src/DatatypeBindings.cpp | 1 - src/XLinkConnectionBindings.cpp | 6 +++--- src/pipeline/CommonBindings.cpp | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/depthai-core b/depthai-core index 95450aac0..72c7a9f1d 160000 --- a/depthai-core +++ b/depthai-core @@ -1 +1 @@ -Subproject commit 95450aac02f3cbe5e34ab7615c1de281ccbe35e6 +Subproject commit 72c7a9f1daa9b875662b7f684e535b5652211a0c diff --git a/src/DatatypeBindings.cpp b/src/DatatypeBindings.cpp index f53b4cf3a..a23ae1ebd 100644 --- a/src/DatatypeBindings.cpp +++ b/src/DatatypeBindings.cpp @@ -29,7 +29,6 @@ #include "depthai-shared/datatype/RawSystemInformation.hpp" #include "depthai-shared/datatype/RawSpatialLocationCalculatorConfig.hpp" #include "depthai-shared/datatype/RawSpatialLocations.hpp" -#include "depthai-shared/datatype/RawSpatialLocationCalculatorConfig.hpp" #include "depthai-shared/datatype/RawTracklets.hpp" diff --git a/src/XLinkConnectionBindings.cpp b/src/XLinkConnectionBindings.cpp index 1b0c20974..15dc3fe8f 100644 --- a/src/XLinkConnectionBindings.cpp +++ b/src/XLinkConnectionBindings.cpp @@ -9,7 +9,7 @@ void XLinkConnectionBindings::bind(pybind11::module& m){ using namespace dai; - py::class_(m, "DeviceInfo") + py::class_(m, "DeviceInfo", DOC(dai, DeviceInfo)) .def(py::init<>()) .def_readwrite("desc", &DeviceInfo::desc) .def_readwrite("state", &DeviceInfo::state) @@ -20,7 +20,7 @@ void XLinkConnectionBindings::bind(pybind11::module& m){ .def(py::init<>()) .def_readwrite("protocol", &deviceDesc_t::protocol) .def_readwrite("platform", &deviceDesc_t::platform) - .def_property("name", + .def_property("name", [](deviceDesc_t& o){return std::string(o.name);}, [](deviceDesc_t& o, std::string n){ std::strncpy(o.name, n.c_str(), std::min(XLINK_MAX_NAME_SIZE,(int) n.size()));} ) @@ -52,7 +52,7 @@ void XLinkConnectionBindings::bind(pybind11::module& m){ .export_values() ; - py::class_(m, "XLinkConnection") + py::class_(m, "XLinkConnection", DOC(dai, XLinkConnection)) .def(py::init>()) .def(py::init()) .def(py::init()) diff --git a/src/pipeline/CommonBindings.cpp b/src/pipeline/CommonBindings.cpp index 53bf9f167..bf233e5e1 100644 --- a/src/pipeline/CommonBindings.cpp +++ b/src/pipeline/CommonBindings.cpp @@ -16,7 +16,7 @@ void CommonBindings::bind(pybind11::module& m){ using namespace dai; - + py::class_(m, "Timestamp", DOC(dai, Timestamp)) .def(py::init<>()) .def_readwrite("sec", &Timestamp::sec) @@ -103,7 +103,7 @@ void CommonBindings::bind(pybind11::module& m){ .def_readwrite("rightCameraSocket", &StereoRectification::rightCameraSocket) ; - // Extrinsics + // Extrinsics py::class_ (m, "Extrinsics", DOC(dai, Extrinsics)) .def(py::init<>()) .def_readwrite("rotationMatrix", &Extrinsics::rotationMatrix) @@ -112,7 +112,7 @@ void CommonBindings::bind(pybind11::module& m){ .def_readwrite("toCameraSocket", &Extrinsics::toCameraSocket) ; - // CameraInfo + // CameraInfo py::class_ (m, "CameraInfo", DOC(dai, CameraInfo)) .def(py::init<>()) .def_readwrite("width", &CameraInfo::width) @@ -124,7 +124,7 @@ void CommonBindings::bind(pybind11::module& m){ .def_readwrite("specHfovDeg", &CameraInfo::specHfovDeg) ; - // EepromData + // EepromData py::class_ (m, "EepromData", DOC(dai, EepromData)) .def(py::init<>()) .def_readwrite("version", &EepromData::version) From d75f9d2d41f96a00ba5fd46bdaba057d76f72634 Mon Sep 17 00:00:00 2001 From: CsabaGergely Date: Fri, 4 Jun 2021 19:57:30 +0300 Subject: [PATCH 2/4] Update 2 --- depthai-core | 2 +- src/CalibrationHandlerBindings.cpp | 4 ++-- src/DeviceBindings.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/depthai-core b/depthai-core index 72c7a9f1d..318526077 160000 --- a/depthai-core +++ b/depthai-core @@ -1 +1 @@ -Subproject commit 72c7a9f1daa9b875662b7f684e535b5652211a0c +Subproject commit 318526077281c7faa87f31cf0e5ab7337b614884 diff --git a/src/CalibrationHandlerBindings.cpp b/src/CalibrationHandlerBindings.cpp index 5bfbf7ee1..0b0a4a578 100644 --- a/src/CalibrationHandlerBindings.cpp +++ b/src/CalibrationHandlerBindings.cpp @@ -22,7 +22,7 @@ void CalibrationHandlerBindings::bind(pybind11::module& m){ .def("getDefaultIntrinsics", &CalibrationHandler::getDefaultIntrinsics, py::arg("cameraId"), DOC(dai, CalibrationHandler, getDefaultIntrinsics)) .def("getDistortionCoefficients", &CalibrationHandler::getDistortionCoefficients, py::arg("cameraId"), DOC(dai, CalibrationHandler, getDistortionCoefficients)) - + .def("getFov", &CalibrationHandler::getFov, py::arg("cameraId"), DOC(dai, CalibrationHandler, getFov)) .def("getLensPosition", &CalibrationHandler::getLensPosition, py::arg("cameraId"), DOC(dai, CalibrationHandler, getLensPosition)) @@ -57,4 +57,4 @@ void CalibrationHandlerBindings::bind(pybind11::module& m){ .def("setStereoRight", &CalibrationHandler::setStereoRight, py::arg("cameraId"), py::arg("rectifiedRotation"), DOC(dai, CalibrationHandler, setStereoRight)); -} \ No newline at end of file +} \ No newline at end of file diff --git a/src/DeviceBindings.cpp b/src/DeviceBindings.cpp index 61bbd2110..67d45461a 100644 --- a/src/DeviceBindings.cpp +++ b/src/DeviceBindings.cpp @@ -203,7 +203,7 @@ void DeviceBindings::bind(pybind11::module& m){ .def("getQueueEvents", [](Device& d, std::size_t maxNumEvents, std::chrono::microseconds timeout) { return deviceGetQueueEventsHelper(d, d.getOutputQueueNames(), maxNumEvents, timeout); }, py::arg("maxNumEvents") = std::numeric_limits::max(), py::arg("timeout") = std::chrono::microseconds(-1), DOC(dai, Device, getQueueEvents, 4)) - + .def("readCalibration", &Device::readCalibration, DOC(dai, Device, readCalibration)) .def("flashCalibration", &Device::flashCalibration, py::arg("calibrationDataHandler"), DOC(dai, Device, flashCalibration)) From 93e74efb9531cc223629dfd3b566f57336043e46 Mon Sep 17 00:00:00 2001 From: CsabaGergely Date: Fri, 4 Jun 2021 21:55:08 +0300 Subject: [PATCH 3/4] Update core --- depthai-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depthai-core b/depthai-core index 318526077..b02bf28ad 160000 --- a/depthai-core +++ b/depthai-core @@ -1 +1 @@ -Subproject commit 318526077281c7faa87f31cf0e5ab7337b614884 +Subproject commit b02bf28ad643aeac12eed950c5cda3e1fa80a1ea From a476bb64080c7701838ed07f0da74ce5798d9d1e Mon Sep 17 00:00:00 2001 From: CsabaGergely Date: Mon, 7 Jun 2021 18:05:54 +0300 Subject: [PATCH 4/4] Update core --- depthai-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depthai-core b/depthai-core index b02bf28ad..83d06e1e0 160000 --- a/depthai-core +++ b/depthai-core @@ -1 +1 @@ -Subproject commit b02bf28ad643aeac12eed950c5cda3e1fa80a1ea +Subproject commit 83d06e1e01d575e4299b9af3f74e8a0e03f105da