Skip to content

Commit 19c9863

Browse files
committed
Merge remote-tracking branch 'origin/main' into ros-release
2 parents df4081e + ce09638 commit 19c9863

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+930
-101
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
name: Bug report
3+
about: Create a bug report to help us improve the DepthAI
4+
title: "[BUG] {Title of the bug}"
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Check if issue already exists**
11+
12+
- Google it (e.g. *error xy* github luxonis depthai)
13+
- Check [troubleshooting](https://docs.luxonis.com/en/latest/pages/troubleshooting/) in documentation.
14+
15+
**Describe the bug**
16+
A clear and concise description of what the bug is.
17+
18+
**Minimal Reproducible Example**
19+
Append the MRE to the bug report, [instructions here](https://docs.luxonis.com/en/latest/pages/support/#creating-minimal-reproducible-example)
20+
21+
**Expected behavior**
22+
A clear and concise description of what you expected to happen.
23+
24+
**Screenshots**
25+
If applicable, add screenshots to help explain your problem.
26+
27+
**Pipeline Graph**
28+
29+
Please also provide a screenshot of your pipeline using the [DepthAI Pipeline Graph](https://github.com/geaxgx/depthai_pipeline_graph).
30+
31+
**Attach system log**
32+
- Provide output of [log_system_information.py](https://github.com/luxonis/depthai/blob/main/log_system_information.py)
33+
34+
**Additional context**
35+
Add any other context about the problem here.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature request
3+
about: Request a new feature
4+
title: "[Feature-Request] {Title of feature request}"
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
### Start with the `why`:
11+
Describe why this feature would be useful to you and to other users.
12+
13+
### Move to the `what`:
14+
A clear and concise description of the feature you would like to get added to the `depthai`.
15+
16+
### Move to the `how`:
17+
If you already have an idea of how this new feature could be implemented, describe it here.

.github/workflows/main.workflow.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ jobs:
111111
- name: Build (old CMake, gcc/Clang)
112112
if: matrix.cmake == '3.10.x' && matrix.os != 'windows-latest'
113113
run: |
114-
cmake -H. -Bbuild -D'DEPTHAI_BUILD_EXAMPLES=ON' -D'DEPTHAI_BUILD_TESTS=ON' ${{ env.CMAKE_ARGS }}
115-
cmake --build build -- -j4
114+
cmake -H. -Bbuild -D'CMAKE_BUILD_TYPE=Release' -D'HUNTER_CONFIGURATION_TYPES=Release' -D'DEPTHAI_BUILD_EXAMPLES=ON' -D'DEPTHAI_BUILD_TESTS=ON' ${{ env.CMAKE_ARGS }}
115+
cmake --build build --config Release -- -j4
116116
117117
# CMake binaries unavailable
118118
# - name: Build (old CMake, MSVC)
@@ -124,8 +124,8 @@ jobs:
124124
- name: Build (newest CMake)
125125
if: matrix.cmake != '3.10.x'
126126
run: |
127-
cmake -S . -B build -D DEPTHAI_BUILD_EXAMPLES=ON -D DEPTHAI_BUILD_TESTS=ON ${{ env.CMAKE_ARGS }}
128-
cmake --build build --parallel 4
127+
cmake -S . -B build -D CMAKE_BUILD_TYPE=Release -D HUNTER_CONFIGURATION_TYPES=Release -D DEPTHAI_BUILD_EXAMPLES=ON -D DEPTHAI_BUILD_TESTS=ON ${{ env.CMAKE_ARGS }}
128+
cmake --build build --parallel 4 --config Release
129129
130130
integration:
131131
runs-on: ${{ matrix.os }}
@@ -192,14 +192,14 @@ jobs:
192192
run: cmake --build build --config ${{ matrix.build-type }} --target install --parallel 4
193193

194194
- name: Upload Win64 shared library
195-
if: matrix.os == 'windows-latest' && matrix.shared == 'Shared' && matrix.platform == 'x64'
195+
if: matrix.os == 'windows-latest' && matrix.shared && matrix.platform == 'x64'
196196
uses: actions/[email protected]
197197
with:
198198
name: windows-prebuilt-win64
199199
path: ${{ env.GITHUB_WORKSPACE }}/depthai_install/
200200

201201
- name: Upload Win32 shared library
202-
if: matrix.os == 'windows-latest' && matrix.shared == 'Shared' && matrix.platform == 'Win32'
202+
if: matrix.os == 'windows-latest' && matrix.shared && matrix.platform == 'Win32'
203203
uses: actions/[email protected]
204204
with:
205205
name: windows-prebuilt-win32-no-opencv

CMakeLists.txt

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if(WIN32)
4343
endif()
4444

4545
# Create depthai project
46-
project(depthai VERSION "2.17.0" LANGUAGES CXX C)
46+
project(depthai VERSION "2.17.3" LANGUAGES CXX C)
4747
get_directory_property(has_parent PARENT_DIRECTORY)
4848
if(has_parent)
4949
set(DEPTHAI_VERSION ${PROJECT_VERSION} PARENT_SCOPE)
@@ -457,6 +457,28 @@ if(DEPTHAI_USB2_PATCH_ONLY_MODE)
457457
target_compile_definitions(${TARGET_CORE_NAME} PRIVATE DEPTHAI_PATCH_ONLY_MODE)
458458
endif()
459459

460+
# Helper function
461+
function(add_runtime_dependencies depending_target dependency)
462+
if(WIN32)
463+
if(TARGET ${dependency})
464+
get_property(imported_configs TARGET ${dependency} PROPERTY IMPORTED_CONFIGURATIONS)
465+
set(dlls "")
466+
foreach(cfg ${imported_configs})
467+
get_property(dll TARGET ${dependency} PROPERTY IMPORTED_LOCATION_${cfg})
468+
set(dlls ${depthai_dll_libraries} $<$<CONFIG:${cfg}>:${dll}>)
469+
endforeach()
470+
endif()
471+
file(GLOB depthai_dll_libraries "${HUNTER_INSTALL_PREFIX}/bin/*.dll")
472+
# Copy the required dlls
473+
add_custom_command(TARGET ${depending_target} POST_BUILD COMMAND
474+
${CMAKE_COMMAND} -E copy_if_different ${dlls} ${depthai_dll_libraries} $<TARGET_FILE_DIR:${depending_target}>
475+
COMMAND_EXPAND_LISTS
476+
)
477+
endif()
478+
endfunction()
479+
# Add libusb dll in build time
480+
add_runtime_dependencies(${TARGET_CORE_NAME} usb-1.0)
481+
460482
########################
461483
# OpenCV Support
462484
########################

cmake/Depthai/DepthaiBootloaderConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ set(DEPTHAI_BOOTLOADER_MATURITY "release")
33
# set(DEPTHAI_BOOTLOADER_MATURITY "snapshot")
44

55
# "version if applicable"
6-
set(DEPTHAI_BOOTLOADER_VERSION "0.0.19")
6+
set(DEPTHAI_BOOTLOADER_VERSION "0.0.20")
77
# set(DEPTHAI_BOOTLOADER_VERSION "0.0.19+4af3b8fe5c0dc6f9a31dedac17affe2e490f81a0")

cmake/Depthai/DepthaiDeviceSideConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot")
33

44
# "full commit hash of device side binary"
5-
set(DEPTHAI_DEVICE_SIDE_COMMIT "6df2ae14def3d70c1b92ef8ce5a471b10ae30bd5")
5+
set(DEPTHAI_DEVICE_SIDE_COMMIT "602822fe9eaca68a72c666497dc4979b29291b3e")
66

77
# "version if applicable"
88
set(DEPTHAI_DEVICE_SIDE_VERSION "")

cmake/Hunter/config.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ hunter_config(
88
hunter_config(
99
XLink
1010
VERSION "luxonis-2021.4.2-develop"
11-
URL "https://github.com/luxonis/XLink/archive/117fdee6990dfbf7ad7e056775df75f91ac902aa.tar.gz"
12-
SHA1 "edc1fd791e2e3f02df8d22adf9e297111adc734a"
11+
URL "https://github.com/luxonis/XLink/archive/b8a37de143d98cb0beb5393055fcdc9d621765bb.tar.gz"
12+
SHA1 "f8f91f0056bc46bba825bfff868136734f8585be"
1313
)
1414

1515
hunter_config(

cmake/depthaiDependencies.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ if(NOT CONFIG_MODE OR (CONFIG_MODE AND NOT DEPTHAI_SHARED_LIBS))
4949
if(DEPTHAI_ENABLE_BACKWARD)
5050
# Disable automatic check for additional stack unwinding libraries
5151
# Just use the default compiler one
52-
set(STACK_DETAILS_AUTO_DETECT FALSE)
52+
set(STACK_DETAILS_AUTO_DETECT FALSE CACHE BOOL "Auto detect backward's stack details dependencies")
5353
find_package(Backward ${_QUIET} CONFIG REQUIRED)
54-
set(STACK_DETAILS_AUTO_DETECT)
54+
unset(STACK_DETAILS_AUTO_DETECT)
5555
endif()
5656

5757
endif()

examples/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@ dai_add_example(mono_depth_mobilenetssd mixed/mono_depth_mobilenetssd.cpp ON)
250250
dai_add_example(rgb_encoding_mono_mobilenet mixed/rgb_encoding_mono_mobilenet.cpp ON)
251251
dai_add_example(rgb_encoding_mono_mobilenet_depth mixed/rgb_encoding_mono_mobilenet_depth.cpp ON)
252252
dai_add_example(rgb_encoding_mobilenet mixed/rgb_encoding_mobilenet.cpp ON)
253+
dai_add_example(multiple_devices mixed/multiple_devices.cpp OFF)
254+
dai_add_example(frame_sync mixed/frame_sync.cpp ON)
253255

254256
target_compile_definitions(mono_depth_mobilenetssd PRIVATE BLOB_PATH="${mobilenet_blob}")
255257
target_compile_definitions(rgb_encoding_mono_mobilenet PRIVATE BLOB_PATH="${mobilenet_blob}")
@@ -303,6 +305,8 @@ dai_add_example(script_http_server Script/script_http_server.cpp OFF)
303305
dai_add_example(script_mjpeg_server Script/script_mjpeg_server.cpp OFF)
304306
dai_add_example(script_nndata_example Script/script_nndata_example.cpp ON)
305307
dai_add_example(script_json_communication Script/script_json_communication.cpp ON)
308+
dai_add_example(script_change_pipeline_flow Script/script_change_pipeline_flow.cpp OFF)
309+
target_compile_definitions(script_change_pipeline_flow PRIVATE BLOB_PATH="${mobilenet_5shaves_blob}")
306310

307311
# SpatialDetection
308312
dai_add_example(spatial_location_calculator SpatialDetection/spatial_location_calculator.cpp ON)

examples/ObjectTracker/object_tracker_video.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ int main(int argc, char** argv) {
132132
if(frame.empty()) break;
133133

134134
auto img = std::make_shared<dai::ImgFrame>();
135-
frame = resizeKeepAspectRatio(frame, cv::Size(1280, 720), cv::Scalar(0));
135+
frame = resizeKeepAspectRatio(frame, cv::Size(1920, 1080), cv::Scalar(0));
136136
toPlanar(frame, img->getData());
137137
img->setTimestamp(baseTs);
138138
baseTs += steady_clock::duration(static_cast<int64_t>((1000 * 1000 * 1000 / simulatedFps)));
139-
img->setWidth(1280);
140-
img->setHeight(720);
139+
img->setWidth(1920);
140+
img->setHeight(1080);
141141
img->setType(dai::ImgFrame::Type::BGR888p);
142142
qIn->send(img);
143143

0 commit comments

Comments
 (0)