Skip to content

Commit ce2627c

Browse files
Merge remote-tracking branch 'origin/develop' into HEAD
2 parents 913a4f3 + 10b598e commit ce2627c

File tree

105 files changed

+2321
-546
lines changed

Some content is hidden

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

105 files changed

+2321
-546
lines changed

.github/workflows/main.yml

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
run: |
5050
python -m pip install --upgrade pip
5151
sudo apt install libusb-1.0-0-dev
52+
python -m pip install clang==14.0 --force-reinstall
5253
python -m pip install -r docs/requirements_mkdoc.txt
5354
- name: Configure project
5455
run: cmake -S . -B build -DDEPTHAI_PYTHON_FORCE_DOCSTRINGS=ON -DDEPTHAI_PYTHON_DOCSTRINGS_OUTPUT="$PWD/docstrings/depthai_python_docstring.hpp"
@@ -155,11 +156,15 @@ jobs:
155156
run: python3 -m pip wheel . -w ./wheelhouse/ --verbose
156157
- name: Auditing wheel
157158
run: for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat linux_armv7l -w wheelhouse/audited/; done
159+
- name: Install tweaked auditwheel and add armv6l tag
160+
run: |
161+
python3 -m pip install git+https://github.com/luxonis/auditwheel@main
162+
for whl in wheelhouse/*.whl; do python3 -m auditwheel addtag -t linux_armv7l linux_armv6l -w wheelhouse/postaudited/ "$whl"; done
158163
- name: Archive wheel artifacts
159164
uses: actions/upload-artifact@v3
160165
with:
161166
name: audited-wheels
162-
path: wheelhouse/audited/
167+
path: wheelhouse/postaudited/
163168
- name: Deploy wheels to artifactory (if not a release)
164169
if: startsWith(github.ref, 'refs/tags/v') != true
165170
run: bash ./ci/upload-artifactory.sh
@@ -539,14 +544,33 @@ jobs:
539544
event-type: depthai-python-release
540545
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
541546

547+
# notify_hil_workflow_linux_x86_64:
548+
# needs: [build-linux-x86_64]
549+
# runs-on: ubuntu-latest
550+
# steps:
551+
# - name: Repository Dispatch
552+
# uses: peter-evans/repository-dispatch@v2
553+
# with:
554+
# token: ${{ secrets.HIL_CORE_DISPATCH_TOKEN }}
555+
# repository: luxonis/depthai-core-hil-tests
556+
# event-type: python-hil-event
557+
# client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
558+
542559
notify_hil_workflow_linux_x86_64:
543560
needs: [build-linux-x86_64]
544561
runs-on: ubuntu-latest
545562
steps:
546-
- name: Repository Dispatch
547-
uses: peter-evans/repository-dispatch@v2
548-
with:
549-
token: ${{ secrets.HIL_CORE_DISPATCH_TOKEN }}
550-
repository: luxonis/depthai-core-hil-tests
551-
event-type: python-hil-event
552-
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
563+
- name: Dispatch an action and get the run ID
564+
uses: codex-/return-dispatch@v1
565+
id: return_dispatch
566+
with:
567+
token: ${{ secrets.HIL_CORE_DISPATCH_TOKEN }} # Note this is NOT GITHUB_TOKEN but a PAT
568+
ref: main # or refs/heads/target_branch
569+
repo: depthai-core-hil-tests
570+
owner: luxonis
571+
workflow: regression_test.yml
572+
workflow_inputs: '{"commit": "${{ github.ref }}", "parent_url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"}'
573+
workflow_timeout_seconds: 300 # was 120 Default: 300
574+
575+
- name: Release
576+
run: echo "https://github.com/luxonis/depthai-core-hil-tests/actions/runs/${{steps.return_dispatch.outputs.run_id}}" >> $GITHUB_STEP_SUMMARY

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ pybind11_add_module(${TARGET_NAME}
127127
src/pipeline/node/AprilTagBindings.cpp
128128
src/pipeline/node/DetectionParserBindings.cpp
129129
src/pipeline/node/WarpBindings.cpp
130+
src/pipeline/node/UVCBindings.cpp
131+
src/pipeline/node/ToFBindings.cpp
130132

131133
src/pipeline/datatype/ADatatypeBindings.cpp
132134
src/pipeline/datatype/AprilTagConfigBindings.cpp
@@ -135,6 +137,7 @@ pybind11_add_module(${TARGET_NAME}
135137
src/pipeline/datatype/CameraControlBindings.cpp
136138
src/pipeline/datatype/EdgeDetectorConfigBindings.cpp
137139
src/pipeline/datatype/FeatureTrackerConfigBindings.cpp
140+
src/pipeline/datatype/ToFConfigBindings.cpp
138141
src/pipeline/datatype/ImageManipConfigBindings.cpp
139142
src/pipeline/datatype/ImgDetectionsBindings.cpp
140143
src/pipeline/datatype/ImgFrameBindings.cpp

depthai-core

Submodule depthai-core updated 104 files

docs/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ sphinx-autopackagesummary==1.3
88
autodocsumm==0.2.2
99
pathlib==1.0.1
1010
jinja2==3.0.3
11+
urllib3==1.26.15 # New urllib version breaks sphinx
1112
-r ./requirements_mkdoc.txt

docs/requirements_mkdoc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
git+https://github.com/luxonis/pybind11_mkdoc.git@47a353ae22a3ca2fe1ca47f47b38613dcfb1043b
1+
git+https://github.com/luxonis/pybind11_mkdoc.git@59746f8d1645c9f00ebfb534186334d0154b5bd6
35.4 KB
Loading
Binary file not shown.
254 KB
Loading

docs/source/_static/install_depthai.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ elif [[ $(uname -s) == "Linux" ]]; then
210210
# install python 3.10
211211
if [ "$install_python" == "true" ]; then
212212
echo "installing python 3.10"
213-
213+
214214
sudo yes "" | sudo add-apt-repository ppa:deadsnakes/ppa
215215
sudo apt -y install python3.10
216216
sudo apt -y install python3.10-venv
@@ -219,13 +219,21 @@ elif [[ $(uname -s) == "Linux" ]]; then
219219

220220
echo "Creating python virtual environment in $VENV_DIR"
221221

222-
"$python_executable" -m venv "$VENV_DIR"
222+
machine=$(uname -m)
223+
if [[ $machine != 'armv6l' && $machine != 'armv7l' && $machine != 'aarch64' && $machine != 'arm64' ]]; then
224+
"$python_executable" -m venv "$VENV_DIR"
225+
else
226+
"$python_executable" -m venv "$VENV_DIR" --system-site-packages
227+
fi
223228

224229
source "$VENV_DIR/bin/activate"
225230
python -m pip install --upgrade pip
226231

227232
pip install packaging
228-
pip install pyqt5
233+
234+
if [[ $machine != 'armv6l' && $machine != 'armv7l' && $machine != 'aarch64' && $machine != 'arm64' ]]; then
235+
pip install pyqt5
236+
fi
229237
else
230238
echo "Error: Host $(uname -s) not supported."
231239
exit 99

docs/source/components/nodes/color_camera.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Usage
8787
pipeline = dai.Pipeline()
8888
cam = pipeline.create(dai.node.ColorCamera)
8989
cam.setPreviewSize(300, 300)
90-
cam.setBoardSocket(dai.CameraBoardSocket.RGB)
90+
cam.setBoardSocket(dai.CameraBoardSocket.CAM_A)
9191
cam.setResolution(dai.ColorCameraProperties.SensorResolution.THE_1080_P)
9292
cam.setInterleaved(False)
9393
cam.setColorOrder(dai.ColorCameraProperties.ColorOrder.RGB)
@@ -97,7 +97,7 @@ Usage
9797
dai::Pipeline pipeline;
9898
auto cam = pipeline.create<dai::node::ColorCamera>();
9999
cam->setPreviewSize(300, 300);
100-
cam->setBoardSocket(dai::CameraBoardSocket::RGB);
100+
cam->setBoardSocket(dai::CameraBoardSocket::CAM_A);
101101
cam->setResolution(dai::ColorCameraProperties::SensorResolution::THE_1080_P);
102102
cam->setInterleaved(false);
103103
cam->setColorOrder(dai::ColorCameraProperties::ColorOrder::RGB);

0 commit comments

Comments
 (0)