Skip to content

Commit

Permalink
Merge pull request #922 from luxonis/device_bl_init_lock_bugfix
Browse files Browse the repository at this point in the history
Improved Monitor&WD handling in DeviceBootloader
  • Loading branch information
moratom authored Dec 11, 2023
2 parents 0cae1b0 + cf7e7e0 commit 7930da4
Show file tree
Hide file tree
Showing 4 changed files with 220 additions and 211 deletions.
2 changes: 1 addition & 1 deletion cmake/Depthai/DepthaiDeviceSideConfig.cmake
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 "afcf303d4bee6a0e313fc763ecb390fcf1a4886e")
set(DEPTHAI_DEVICE_SIDE_COMMIT "a95f582a61ec9bdbd0f72dec84822455872ffaf7")

# "version if applicable"
set(DEPTHAI_DEVICE_SIDE_VERSION "")
4 changes: 2 additions & 2 deletions cmake/Hunter/config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ hunter_config(
hunter_config(
XLink
VERSION "luxonis-2021.4.2-xlink-linkid-race-fix"
URL "https://github.com/luxonis/XLink/archive/14d4056d9d9dc21de2c6089a4648ddb9e981f418.tar.gz"
SHA1 "14613474368971d67c520f6f911cf88fb6384506"
URL "https://github.com/luxonis/XLink/archive/e9eb1ef38030176ad70cddd3b545d5e6c509f1e1.tar.gz"
SHA1 "b1e4ded41cd7b9c37189468e2aaddbb10cbda9f6"
CMAKE_ARGS
XLINK_ENABLE_LIBUSB=${DEPTHAI_ENABLE_LIBUSB}
)
Expand Down
3 changes: 3 additions & 0 deletions include/depthai/device/DeviceBootloader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,9 @@ class DeviceBootloader {
std::tuple<bool, std::string> readCustom(
Memory memory, size_t offset, size_t size, uint8_t* data, std::string filename, std::function<void(float)> progressCb);

void createWatchdog();
void destroyWatchdog();

// private variables
std::shared_ptr<XLinkConnection> connection;
DeviceInfo deviceInfo = {};
Expand Down
Loading

0 comments on commit 7930da4

Please sign in to comment.