From b4cb5378cab41c1965a166f5ae3e8ec9302ae92c Mon Sep 17 00:00:00 2001 From: TheMarpe Date: Tue, 24 Jan 2023 13:20:55 +0200 Subject: [PATCH 1/4] Modified OpenVINO::VERSION_UNIVERSAL --- examples/calibration/calibration_flash.cpp | 2 +- include/depthai/device/Device.hpp | 2 +- include/depthai/device/DeviceBase.hpp | 12 ++++++------ include/depthai/openvino/OpenVINO.hpp | 2 +- src/device/DeviceBase.cpp | 10 +++++----- src/pipeline/Pipeline.cpp | 2 +- src/utility/Resources.cpp | 2 +- src/utility/Resources.hpp | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/calibration/calibration_flash.cpp b/examples/calibration/calibration_flash.cpp index a2a68c436..59b0b2413 100644 --- a/examples/calibration/calibration_flash.cpp +++ b/examples/calibration/calibration_flash.cpp @@ -13,7 +13,7 @@ int main(int argc, char** argv) { } // Connect device - dai::Device device(dai::OpenVINO::DEFAULT_VERSION, dai::UsbSpeed::HIGH); + dai::Device device(dai::UsbSpeed::HIGH); dai::CalibrationHandler deviceCalib = device.readCalibration(); deviceCalib.eepromToJsonFile(calibBackUpFile); diff --git a/include/depthai/device/Device.hpp b/include/depthai/device/Device.hpp index 788cadab5..39bb8921c 100644 --- a/include/depthai/device/Device.hpp +++ b/include/depthai/device/Device.hpp @@ -84,7 +84,7 @@ class Device : public DeviceBase { /** * Connects to any available device with a DEFAULT_SEARCH_TIME timeout. - * Uses OpenVINO version OpenVINO::DEFAULT_VERSION + * Uses OpenVINO version OpenVINO::VERSION_UNIVERSAL */ Device(); diff --git a/include/depthai/device/DeviceBase.hpp b/include/depthai/device/DeviceBase.hpp index f80d75b33..869237154 100644 --- a/include/depthai/device/DeviceBase.hpp +++ b/include/depthai/device/DeviceBase.hpp @@ -135,7 +135,7 @@ class DeviceBase { * @param version Version of OpenVINO which firmware will support * @returns Firmware binary */ - static std::vector getEmbeddedDeviceBinary(bool usb2Mode, OpenVINO::Version version = OpenVINO::DEFAULT_VERSION); + static std::vector getEmbeddedDeviceBinary(bool usb2Mode, OpenVINO::Version version = OpenVINO::VERSION_UNIVERSAL); /** * Gets device firmware binary for a specific configuration @@ -207,7 +207,7 @@ class DeviceBase { /** * Connects to any available device with a DEFAULT_SEARCH_TIME timeout. - * Uses OpenVINO version OpenVINO::DEFAULT_VERSION + * Uses OpenVINO version OpenVINO::VERSION_UNIVERSAL */ DeviceBase(); @@ -287,7 +287,7 @@ class DeviceBase { /** * Connects to any available device with a DEFAULT_SEARCH_TIME timeout. - * Uses OpenVINO version OpenVINO::DEFAULT_VERSION + * Uses OpenVINO version OpenVINO::VERSION_UNIVERSAL * * @param devInfo DeviceInfo which specifies which device to connect to */ @@ -295,7 +295,7 @@ class DeviceBase { /** * Connects to any available device with a DEFAULT_SEARCH_TIME timeout. - * Uses OpenVINO version OpenVINO::DEFAULT_VERSION + * Uses OpenVINO version OpenVINO::VERSION_UNIVERSAL * * @param devInfo DeviceInfo which specifies which device to connect to * @param maxUsbSpeed Maximum allowed USB speed @@ -304,7 +304,7 @@ class DeviceBase { /** * Connects to any available device with a DEFAULT_SEARCH_TIME timeout. - * Uses OpenVINO version OpenVINO::DEFAULT_VERSION + * Uses OpenVINO version OpenVINO::VERSION_UNIVERSAL * * @param nameOrDeviceId Creates DeviceInfo with nameOrDeviceId to connect to */ @@ -312,7 +312,7 @@ class DeviceBase { /** * Connects to any available device with a DEFAULT_SEARCH_TIME timeout. - * Uses OpenVINO version OpenVINO::DEFAULT_VERSION + * Uses OpenVINO version OpenVINO::VERSION_UNIVERSAL * * @param nameOrDeviceId Creates DeviceInfo with nameOrDeviceId to connect to * @param maxUsbSpeed Maximum allowed USB speed diff --git a/include/depthai/openvino/OpenVINO.hpp b/include/depthai/openvino/OpenVINO.hpp index a50b90a71..f22d60dfc 100644 --- a/include/depthai/openvino/OpenVINO.hpp +++ b/include/depthai/openvino/OpenVINO.hpp @@ -51,7 +51,7 @@ class OpenVINO { }; /// Main OpenVINO version - constexpr static const Version DEFAULT_VERSION = VERSION_UNIVERSAL; + constexpr static const Version DEFAULT_VERSION = VERSION_2022_1; /** * @returns Supported versions diff --git a/src/device/DeviceBase.cpp b/src/device/DeviceBase.cpp index d1d90c9eb..190f76652 100644 --- a/src/device/DeviceBase.cpp +++ b/src/device/DeviceBase.cpp @@ -330,16 +330,16 @@ DeviceBase::DeviceBase(OpenVINO::Version version, const DeviceInfo& devInfo, con init(version, false, pathToCmd); } -DeviceBase::DeviceBase() : DeviceBase(OpenVINO::DEFAULT_VERSION) {} +DeviceBase::DeviceBase() : DeviceBase(OpenVINO::VERSION_UNIVERSAL) {} -DeviceBase::DeviceBase(const DeviceInfo& devInfo) : DeviceBase(OpenVINO::DEFAULT_VERSION, devInfo) {} +DeviceBase::DeviceBase(const DeviceInfo& devInfo) : DeviceBase(OpenVINO::VERSION_UNIVERSAL, devInfo) {} -DeviceBase::DeviceBase(const DeviceInfo& devInfo, UsbSpeed maxUsbSpeed) : DeviceBase(OpenVINO::DEFAULT_VERSION, devInfo, maxUsbSpeed) {} +DeviceBase::DeviceBase(const DeviceInfo& devInfo, UsbSpeed maxUsbSpeed) : DeviceBase(OpenVINO::VERSION_UNIVERSAL, devInfo, maxUsbSpeed) {} -DeviceBase::DeviceBase(std::string nameOrDeviceId) : DeviceBase(OpenVINO::DEFAULT_VERSION, dai::DeviceInfo(std::move(nameOrDeviceId))) {} +DeviceBase::DeviceBase(std::string nameOrDeviceId) : DeviceBase(OpenVINO::VERSION_UNIVERSAL, dai::DeviceInfo(std::move(nameOrDeviceId))) {} DeviceBase::DeviceBase(std::string nameOrDeviceId, UsbSpeed maxUsbSpeed) - : DeviceBase(OpenVINO::DEFAULT_VERSION, dai::DeviceInfo(std::move(nameOrDeviceId)), maxUsbSpeed) {} + : DeviceBase(OpenVINO::VERSION_UNIVERSAL, dai::DeviceInfo(std::move(nameOrDeviceId)), maxUsbSpeed) {} DeviceBase::DeviceBase(OpenVINO::Version version) { tryGetDevice(); diff --git a/src/pipeline/Pipeline.cpp b/src/pipeline/Pipeline.cpp index 9fa0a6f8f..406455905 100644 --- a/src/pipeline/Pipeline.cpp +++ b/src/pipeline/Pipeline.cpp @@ -286,7 +286,7 @@ tl::optional PipelineImpl::getPipelineOpenVINOVersion() const Device::Config PipelineImpl::getDeviceConfig() const { Device::Config config; - config.version = getPipelineOpenVINOVersion().value_or(OpenVINO::DEFAULT_VERSION); + config.version = getPipelineOpenVINOVersion().value_or(OpenVINO::VERSION_UNIVERSAL); config.board = board; return config; } diff --git a/src/utility/Resources.cpp b/src/utility/Resources.cpp index 2dde549f5..9f8b3d7ea 100644 --- a/src/utility/Resources.cpp +++ b/src/utility/Resources.cpp @@ -44,7 +44,7 @@ constexpr static auto CMRC_DEPTHAI_DEVICE_TAR_XZ = "depthai-device-fwp-" DEPTHAI // Main FW constexpr static auto DEPTHAI_CMD_OPENVINO_UNIVERSAL_PATH = "depthai-device-openvino-universal-" DEPTHAI_DEVICE_VERSION ".cmd"; constexpr static auto MAIN_FW_PATH = DEPTHAI_CMD_OPENVINO_UNIVERSAL_PATH; -constexpr static auto& MAIN_FW_VERSION = OpenVINO::DEFAULT_VERSION; +constexpr static auto MAIN_FW_VERSION = OpenVINO::VERSION_UNIVERSAL; // Patches from Main FW constexpr static auto DEPTHAI_CMD_OPENVINO_2020_4_PATCH_PATH = "depthai-device-openvino-2020.4-" DEPTHAI_DEVICE_VERSION ".patch"; diff --git a/src/utility/Resources.hpp b/src/utility/Resources.hpp index 6d39fb156..8cf962515 100644 --- a/src/utility/Resources.hpp +++ b/src/utility/Resources.hpp @@ -38,7 +38,7 @@ class Resources { void operator=(Resources const&) = delete; // Available resources - std::vector getDeviceFirmware(bool usb2Mode, OpenVINO::Version version = OpenVINO::DEFAULT_VERSION) const; + std::vector getDeviceFirmware(bool usb2Mode, OpenVINO::Version version = OpenVINO::VERSION_UNIVERSAL) const; std::vector getDeviceFirmware(Device::Config config, dai::Path pathToMvcmd = {}) const; std::vector getBootloaderFirmware(DeviceBootloader::Type type = DeviceBootloader::Type::USB) const; From d8a1f3b0bc2cbc03ba179b28078cb20850d73ae3 Mon Sep 17 00:00:00 2001 From: TheMarpe Date: Tue, 24 Jan 2023 13:21:12 +0200 Subject: [PATCH 2/4] Updated Bootloader to 0.0.24 --- cmake/Depthai/DepthaiBootloaderConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Depthai/DepthaiBootloaderConfig.cmake b/cmake/Depthai/DepthaiBootloaderConfig.cmake index 049ddd12b..9302acfdf 100644 --- a/cmake/Depthai/DepthaiBootloaderConfig.cmake +++ b/cmake/Depthai/DepthaiBootloaderConfig.cmake @@ -3,5 +3,5 @@ set(DEPTHAI_BOOTLOADER_MATURITY "release") # set(DEPTHAI_BOOTLOADER_MATURITY "snapshot") # "version if applicable" -set(DEPTHAI_BOOTLOADER_VERSION "0.0.23") +set(DEPTHAI_BOOTLOADER_VERSION "0.0.24") # set(DEPTHAI_BOOTLOADER_VERSION "0.0.23+9704fa354a72599286e0be08663cee084266fda6") From 774763d4ea684ba8d004e94f5d90919319e61a0d Mon Sep 17 00:00:00 2001 From: TheMarpe Date: Tue, 24 Jan 2023 14:38:48 +0200 Subject: [PATCH 3/4] Bump version and FW to 2.20.1 (Status LEDs improvement) --- CMakeLists.txt | 2 +- cmake/Depthai/DepthaiDeviceSideConfig.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 390ecf556..1492a661e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ if(WIN32) endif() # Create depthai project -project(depthai VERSION "2.20.0" LANGUAGES CXX C) +project(depthai VERSION "2.20.1" LANGUAGES CXX C) get_directory_property(has_parent PARENT_DIRECTORY) if(has_parent) set(DEPTHAI_VERSION ${PROJECT_VERSION} PARENT_SCOPE) diff --git a/cmake/Depthai/DepthaiDeviceSideConfig.cmake b/cmake/Depthai/DepthaiDeviceSideConfig.cmake index 282281e6f..aa07e9607 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 "7271eb450f49e21300089fe76ca0b5b6081f1902") +set(DEPTHAI_DEVICE_SIDE_COMMIT "f888710ca677ca662a4a83103e57c5a1ae2a5c7f") # "version if applicable" set(DEPTHAI_DEVICE_SIDE_VERSION "") From 01fdd7d26341b8a800cce6292cc6f9a21c75bce7 Mon Sep 17 00:00:00 2001 From: TheMarpe Date: Tue, 24 Jan 2023 16:05:08 +0200 Subject: [PATCH 4/4] calibration_flash example fix --- examples/calibration/calibration_flash.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/calibration/calibration_flash.cpp b/examples/calibration/calibration_flash.cpp index 59b0b2413..ecc41d30b 100644 --- a/examples/calibration/calibration_flash.cpp +++ b/examples/calibration/calibration_flash.cpp @@ -13,7 +13,7 @@ int main(int argc, char** argv) { } // Connect device - dai::Device device(dai::UsbSpeed::HIGH); + dai::Device device(dai::OpenVINO::VERSION_UNIVERSAL, dai::UsbSpeed::HIGH); dai::CalibrationHandler deviceCalib = device.readCalibration(); deviceCalib.eepromToJsonFile(calibBackUpFile);