Skip to content

Commit 9b4bc1c

Browse files
committed
Merge branch 'device_name_improvements' into develop
2 parents aceaffe + c0e05a9 commit 9b4bc1c

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

src/CalibrationHandlerBindings.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ void CalibrationHandlerBindings::bind(pybind11::module& m, void* pCallstack){
6262

6363
.def("setBoardInfo", py::overload_cast<std::string, std::string>(&CalibrationHandler::setBoardInfo), py::arg("boardName"), py::arg("boardRev"), DOC(dai, CalibrationHandler, setBoardInfo))
6464
.def("setBoardInfo", py::overload_cast<std::string, std::string, std::string, std::string, std::string, std::string, uint64_t, uint32_t, std::string>(&CalibrationHandler::setBoardInfo), py::arg("productName"), py::arg("boardName"), py::arg("boardRev"), py::arg("boardConf"), py::arg("hardwareConf"), py::arg("batchName"), py::arg("batchTime"), py::arg("boardOptions"), py::arg("boardCustom") = "", DOC(dai, CalibrationHandler, setBoardInfo, 2))
65+
.def("setBoardInfo", py::overload_cast<std::string, std::string, std::string, std::string, std::string, std::string, std::string, uint64_t, uint32_t, std::string>(&CalibrationHandler::setBoardInfo), py::arg("deviceName"), py::arg("productName"), py::arg("boardName"), py::arg("boardRev"), py::arg("boardConf"), py::arg("hardwareConf"), py::arg("batchName"), py::arg("batchTime"), py::arg("boardOptions"), py::arg("boardCustom") = "", DOC(dai, CalibrationHandler, setBoardInfo, 3))
66+
67+
.def("setDeviceName", &CalibrationHandler::setDeviceName, py::arg("deviceName"), DOC(dai, CalibrationHandler, setDeviceName))
6568
.def("setProductName", &CalibrationHandler::setProductName, py::arg("productName"), DOC(dai, CalibrationHandler, setProductName))
6669

6770
.def("setCameraIntrinsics", py::overload_cast<CameraBoardSocket, std::vector<std::vector<float>>, Size2f>(&CalibrationHandler::setCameraIntrinsics), py::arg("cameraId"), py::arg("intrinsics"), py::arg("frameSize"), DOC(dai, CalibrationHandler, setCameraIntrinsics))

src/DeviceBindings.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,7 @@ void DeviceBindings::bind(pybind11::module& m, void* pCallstack){
653653
.def("setTimesync", [](DeviceBase& d, std::chrono::milliseconds p, int s, bool r) { py::gil_scoped_release release; return d.setTimesync(p,s,r); }, DOC(dai, DeviceBase, setTimesync))
654654
.def("setTimesync", [](DeviceBase& d, bool e) { py::gil_scoped_release release; return d.setTimesync(e); }, py::arg("enable"), DOC(dai, DeviceBase, setTimesync, 2))
655655
.def("getDeviceName", [](DeviceBase& d) { std::string name; { py::gil_scoped_release release; name = d.getDeviceName(); } return py::bytes(name).attr("decode")("utf-8", "replace"); }, DOC(dai, DeviceBase, getDeviceName))
656+
.def("getProductName", [](DeviceBase& d) { std::string name; { py::gil_scoped_release release; name = d.getProductName(); } return py::bytes(name).attr("decode")("utf-8", "replace"); }, DOC(dai, DeviceBase, getProductName))
656657
;
657658

658659

src/pipeline/CommonBindings.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void CommonBindings::bind(pybind11::module& m, void* pCallstack){
6464
py::enum_<FrameEvent> frameEvent(m, "FrameEvent", DOC(dai, FrameEvent));
6565
py::class_<ProfilingData> profilingData(m, "ProfilingData", DOC(dai, ProfilingData));
6666
py::enum_<Interpolation> interpolation(m, "Interpolation", DOC(dai, Interpolation));
67-
67+
6868
///////////////////////////////////////////////////////////////////////
6969
///////////////////////////////////////////////////////////////////////
7070
///////////////////////////////////////////////////////////////////////
@@ -262,6 +262,7 @@ void CommonBindings::bind(pybind11::module& m, void* pCallstack){
262262
.def_readwrite("rectifiedRotationRight", &StereoRectification::rectifiedRotationRight)
263263
.def_readwrite("leftCameraSocket", &StereoRectification::leftCameraSocket)
264264
.def_readwrite("rightCameraSocket", &StereoRectification::rightCameraSocket)
265+
.def_readwrite("verticalCameraSocket", &StereoRectification::verticalCameraSocket)
265266
;
266267

267268
// Extrinsics
@@ -296,12 +297,16 @@ void CommonBindings::bind(pybind11::module& m, void* pCallstack){
296297
.def_readwrite("hardwareConf", &EepromData::hardwareConf)
297298
.def_readwrite("productName", &EepromData::productName)
298299
.def_readwrite("batchName", &EepromData::batchName)
300+
.def_readwrite("deviceName", &EepromData::deviceName)
299301
.def_readwrite("batchTime", &EepromData::batchTime)
300302
.def_readwrite("boardOptions", &EepromData::boardOptions)
301303
.def_readwrite("cameraData", &EepromData::cameraData)
302304
.def_readwrite("stereoRectificationData", &EepromData::stereoRectificationData)
303305
.def_readwrite("imuExtrinsics", &EepromData::imuExtrinsics)
304306
.def_readwrite("miscellaneousData", &EepromData::miscellaneousData)
307+
.def_readwrite("housingExtrinsics", &EepromData::housingExtrinsics)
308+
.def_readwrite("stereoUseSpecTranslation", &EepromData::stereoUseSpecTranslation)
309+
.def_readwrite("stereoEnableDistortionCorrection", &EepromData::stereoEnableDistortionCorrection)
305310
;
306311
// UsbSpeed
307312
usbSpeed
@@ -379,7 +384,7 @@ void CommonBindings::bind(pybind11::module& m, void* pCallstack){
379384
.value("READOUT_START", FrameEvent::READOUT_START)
380385
.value("READOUT_END", FrameEvent::READOUT_END)
381386
;
382-
387+
383388
interpolation
384389
.value("BILINEAR", Interpolation::BILINEAR)
385390
.value("BICUBIC", Interpolation::BICUBIC)

0 commit comments

Comments
 (0)