From 3aa5d54c55a9978e85a92bb55acc0feb7255a110 Mon Sep 17 00:00:00 2001 From: Aniel Alexa Date: Wed, 6 Sep 2023 17:19:32 +0300 Subject: [PATCH 1/6] getConnectivity feature --- include/depthai/device/DeviceBase.hpp | 8 ++++++++ shared/depthai-shared | 2 +- src/device/DeviceBase.cpp | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/depthai/device/DeviceBase.hpp b/include/depthai/device/DeviceBase.hpp index 569b68c9b..0beecd099 100644 --- a/include/depthai/device/DeviceBase.hpp +++ b/include/depthai/device/DeviceBase.hpp @@ -30,6 +30,7 @@ #include "depthai-shared/common/ChipTemperature.hpp" #include "depthai-shared/common/CpuUsage.hpp" #include "depthai-shared/common/MemoryInfo.hpp" +#include "depthai-shared/common/Connectivity.hpp" #include "depthai-shared/datatype/RawIMUData.hpp" #include "depthai-shared/device/BoardConfig.hpp" #include "depthai-shared/device/CrashDump.hpp" @@ -564,6 +565,13 @@ class DeviceBase { */ std::vector getConnectedCameras(); + /** + * Get connectivity for device + * + * @returns Vector of connection type + */ + std::vector getConnectivity(); + /** * Get cameras that are connected to the device with their features/properties * diff --git a/shared/depthai-shared b/shared/depthai-shared index 5f823e0ae..27baa0028 160000 --- a/shared/depthai-shared +++ b/shared/depthai-shared @@ -1 +1 @@ -Subproject commit 5f823e0aec1a3c62561ef4b0aef1f43298c1a79f +Subproject commit 27baa0028ed3667d8b3e647288fc559557e8cedc diff --git a/src/device/DeviceBase.cpp b/src/device/DeviceBase.cpp index a2bb2ddcb..a2846a472 100644 --- a/src/device/DeviceBase.cpp +++ b/src/device/DeviceBase.cpp @@ -964,6 +964,10 @@ std::vector DeviceBase::getConnectedCameras() { return pimpl->rpcClient->call("getConnectedCameras").as>(); } +std::vector DeviceBase::getConnectivity(){ + return pimpl->rpcClient->call("getConnectivity").as>(); +} + std::vector DeviceBase::getConnectedCameraFeatures() { return pimpl->rpcClient->call("getConnectedCameraFeatures").as>(); } From 6d43342ae8d61002c80e44c085b30821095fc722 Mon Sep 17 00:00:00 2001 From: Aniel Alexa Date: Thu, 7 Sep 2023 15:25:19 +0300 Subject: [PATCH 2/6] add corespoding SHA --- cmake/Depthai/DepthaiDeviceSideConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Depthai/DepthaiDeviceSideConfig.cmake b/cmake/Depthai/DepthaiDeviceSideConfig.cmake index 64d58e613..a1b6126d0 100644 --- a/cmake/Depthai/DepthaiDeviceSideConfig.cmake +++ b/cmake/Depthai/DepthaiDeviceSideConfig.cmake @@ -2,7 +2,7 @@ set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot") # "full commit hash of device side binary" -set(DEPTHAI_DEVICE_SIDE_COMMIT "aab183746ea27261c159fd71681b55f65232e2db") +set(DEPTHAI_DEVICE_SIDE_COMMIT "581cb36462307800b85b16c1843be85fcb59cb2a") # "version if applicable" set(DEPTHAI_DEVICE_SIDE_VERSION "") From 7042f218da5ed8d1e78b681264c1276174b543a8 Mon Sep 17 00:00:00 2001 From: asahtik Date: Wed, 8 Nov 2023 09:22:32 +0100 Subject: [PATCH 3/6] Bump device --- cmake/Depthai/DepthaiDeviceSideConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Depthai/DepthaiDeviceSideConfig.cmake b/cmake/Depthai/DepthaiDeviceSideConfig.cmake index 99876d274..db6b4fe15 100644 --- a/cmake/Depthai/DepthaiDeviceSideConfig.cmake +++ b/cmake/Depthai/DepthaiDeviceSideConfig.cmake @@ -2,7 +2,7 @@ set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot") # "full commit hash of device side binary" -set(DEPTHAI_DEVICE_SIDE_COMMIT "1cf15832ab1f408d8e4dab72e901ce050bf8850b") +set(DEPTHAI_DEVICE_SIDE_COMMIT "2b14e8bdf9c4ee3cc04f6b9d9e306155bf62ee0c") # "version if applicable" set(DEPTHAI_DEVICE_SIDE_VERSION "") From 268b6b84478885c93a9950f418632d6da5546656 Mon Sep 17 00:00:00 2001 From: asahtik Date: Fri, 10 Nov 2023 11:41:41 +0100 Subject: [PATCH 4/6] Renamed getConnectivity --- include/depthai/device/DeviceBase.hpp | 4 ++-- src/device/DeviceBase.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/depthai/device/DeviceBase.hpp b/include/depthai/device/DeviceBase.hpp index 6089dbf8c..018dfdcb5 100644 --- a/include/depthai/device/DeviceBase.hpp +++ b/include/depthai/device/DeviceBase.hpp @@ -28,9 +28,9 @@ // shared #include "depthai-shared/common/ChipTemperature.hpp" +#include "depthai-shared/common/Connectivity.hpp" #include "depthai-shared/common/CpuUsage.hpp" #include "depthai-shared/common/MemoryInfo.hpp" -#include "depthai-shared/common/Connectivity.hpp" #include "depthai-shared/datatype/RawIMUData.hpp" #include "depthai-shared/device/BoardConfig.hpp" #include "depthai-shared/device/CrashDump.hpp" @@ -576,7 +576,7 @@ class DeviceBase { * * @returns Vector of connection type */ - std::vector getConnectivity(); + std::vector getAvailableInterfaces(); /** * Get cameras that are connected to the device with their features/properties diff --git a/src/device/DeviceBase.cpp b/src/device/DeviceBase.cpp index b758b5199..6b2d79553 100644 --- a/src/device/DeviceBase.cpp +++ b/src/device/DeviceBase.cpp @@ -961,7 +961,7 @@ std::vector DeviceBase::getConnectedCameras() { return pimpl->rpcClient->call("getConnectedCameras").as>(); } -std::vector DeviceBase::getConnectivity(){ +std::vector DeviceBase::getAvailableInterfaces() { return pimpl->rpcClient->call("getConnectivity").as>(); } From 8b2df03e9f3987d39061cb79620f3581efacb2e0 Mon Sep 17 00:00:00 2001 From: asahtik Date: Mon, 13 Nov 2023 09:34:29 +0100 Subject: [PATCH 5/6] Renamed getAvailableInterfaces --- include/depthai/device/DeviceBase.hpp | 2 +- src/device/DeviceBase.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/depthai/device/DeviceBase.hpp b/include/depthai/device/DeviceBase.hpp index 018dfdcb5..4f1489d97 100644 --- a/include/depthai/device/DeviceBase.hpp +++ b/include/depthai/device/DeviceBase.hpp @@ -576,7 +576,7 @@ class DeviceBase { * * @returns Vector of connection type */ - std::vector getAvailableInterfaces(); + std::vector getConnectionInterfaces(); /** * Get cameras that are connected to the device with their features/properties diff --git a/src/device/DeviceBase.cpp b/src/device/DeviceBase.cpp index 6b2d79553..4941c0f5c 100644 --- a/src/device/DeviceBase.cpp +++ b/src/device/DeviceBase.cpp @@ -961,7 +961,7 @@ std::vector DeviceBase::getConnectedCameras() { return pimpl->rpcClient->call("getConnectedCameras").as>(); } -std::vector DeviceBase::getAvailableInterfaces() { +std::vector DeviceBase::getConnectionInterfaces() { return pimpl->rpcClient->call("getConnectivity").as>(); } From 22e513efce56403053642ae5273afcf9400923c9 Mon Sep 17 00:00:00 2001 From: asahtik Date: Mon, 20 Nov 2023 13:30:09 +0100 Subject: [PATCH 6/6] Bump fw --- cmake/Depthai/DepthaiDeviceSideConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Depthai/DepthaiDeviceSideConfig.cmake b/cmake/Depthai/DepthaiDeviceSideConfig.cmake index db6b4fe15..087db1521 100644 --- a/cmake/Depthai/DepthaiDeviceSideConfig.cmake +++ b/cmake/Depthai/DepthaiDeviceSideConfig.cmake @@ -2,7 +2,7 @@ set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot") # "full commit hash of device side binary" -set(DEPTHAI_DEVICE_SIDE_COMMIT "2b14e8bdf9c4ee3cc04f6b9d9e306155bf62ee0c") +set(DEPTHAI_DEVICE_SIDE_COMMIT "3181f130742ed4f18341970a936afbdcfeaddbc9") # "version if applicable" set(DEPTHAI_DEVICE_SIDE_VERSION "")