Skip to content

Release 2.20.1 #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
themarpe merged 4 commits into from
Jan 24, 2023
Merged

Release 2.20.1 #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4cb537
Modified OpenVINO::VERSION_UNIVERSAL
themarpe Jan 24, 2023
d8a1f3b
Updated Bootloader to 0.0.24
themarpe Jan 24, 2023
774763d
Bump version and FW to 2.20.1 (Status LEDs improvement)
themarpe Jan 24, 2023
01fdd7d
calibration_flash example fix
themarpe Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmake/Depthai/DepthaiBootloaderConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion cmake/Depthai/DepthaiDeviceSideConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
2 changes: 1 addition & 1 deletion examples/calibration/calibration_flash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::OpenVINO::VERSION_UNIVERSAL, dai::UsbSpeed::HIGH);

dai::CalibrationHandler deviceCalib = device.readCalibration();
deviceCalib.eepromToJsonFile(calibBackUpFile);
Expand Down
2 changes: 1 addition & 1 deletion include/depthai/device/Device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
12 changes: 6 additions & 6 deletions include/depthai/device/DeviceBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class DeviceBase {
* @param version Version of OpenVINO which firmware will support
* @returns Firmware binary
*/
static std::vector<std::uint8_t> getEmbeddedDeviceBinary(bool usb2Mode, OpenVINO::Version version = OpenVINO::DEFAULT_VERSION);
static std::vector<std::uint8_t> getEmbeddedDeviceBinary(bool usb2Mode, OpenVINO::Version version = OpenVINO::VERSION_UNIVERSAL);

/**
* Gets device firmware binary for a specific configuration
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -287,15 +287,15 @@ 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
*/
DeviceBase(const DeviceInfo& devInfo);

/**
* 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
Expand All @@ -304,15 +304,15 @@ 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
*/
DeviceBase(std::string nameOrDeviceId);

/**
* 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
Expand Down
2 changes: 1 addition & 1 deletion include/depthai/openvino/OpenVINO.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/device/DeviceBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/pipeline/Pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ tl::optional<OpenVINO::Version> 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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/utility/Resources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/utility/Resources.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Resources {
void operator=(Resources const&) = delete;

// Available resources
std::vector<std::uint8_t> getDeviceFirmware(bool usb2Mode, OpenVINO::Version version = OpenVINO::DEFAULT_VERSION) const;
std::vector<std::uint8_t> getDeviceFirmware(bool usb2Mode, OpenVINO::Version version = OpenVINO::VERSION_UNIVERSAL) const;
std::vector<std::uint8_t> getDeviceFirmware(Device::Config config, dai::Path pathToMvcmd = {}) const;
std::vector<std::uint8_t> getBootloaderFirmware(DeviceBootloader::Type type = DeviceBootloader::Type::USB) const;

Expand Down