Skip to content

Commit d08d53b

Browse files
Merge pull request #215 from luxonis/develop
Release 2.2.0.0
2 parents b689b07 + b86bb0d commit d08d53b

Some content is hidden

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

47 files changed

+1416
-66
lines changed

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ _builds/
2525

2626
#git
2727
*.orig
28+
*_REMOTE_*
29+
*_LOCAL_*
30+
*_BACKUP_*
31+
*_BASE_*
2832

2933
#ci
3034
wheelhouse/
31-
32-
# Example blobs/files
33-
examples/models/

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ See: [depthai-core dependencies](https://github.com/luxonis/depthai-core#depende
3333

3434
To build a shared library from source perform the following:
3535
```
36+
git submodule update --init --recursive
3637
mkdir build && cd build
3738
cmake .. [-D PYTHON_EXECUTABLE=/full/path/to/python]
3839
cmake --build . --parallel
@@ -54,6 +55,7 @@ python3 -m pip install .
5455

5556
To run the tests build the library with the following options
5657
```
58+
git submodule update --init --recursive
5759
mkdir build_tests && cd build_tests
5860
cmake .. -D DEPTHAI_PYTHON_ENABLE_TESTS=ON -D DEPTHAI_PYTHON_ENABLE_EXAMPLES=ON -D DEPTHAI_PYTHON_TEST_EXAMPLES=ON
5961
cmake --build . --parallel
@@ -68,7 +70,6 @@ ctest
6870
- Raspbian 10;
6971
- macOS 10.14.6, 10.15.4;
7072

71-
7273
### Building documentation
7374

7475
- **Using [Docker](https://docs.docker.com/) (with [Docker Compose](https://docs.docker.com/compose/install/))**
@@ -78,36 +79,35 @@ ctest
7879
sudo docker-compose build
7980
sudo docker-compose up
8081
```
81-
82-
> ℹ️ You can leave out the `sudo` if you have added your user to the `docker` group (or are using rootless docker).
8382
83+
> ℹ️ You can leave out the `sudo` if you have added your user to the `docker` group (or are using rootless docker).
8484
Then open [http://localhost:8000](http://localhost:8000).
85-
85+
8686
This docker container will watch changes in the `docs/source` directory and rebuild the docs automatically
8787
8888
- **Linux**
89-
89+
9090
First, please install the required [dependencies](#Dependencies)
91-
91+
9292
Then run the following commands to build the docs website
93-
93+
9494
```
9595
python3 -m pip install -U pip
9696
python3 -m pip install -r docs/requirements.txt
9797
cmake -S . -B build -D DEPTHAI_BUILD_DOCS=ON -D DEPTHAI_PYTHON_BUILD_DOCS=ON
9898
cmake --build build --parallel --target sphinx
9999
python3 -m http.server --bind 0.0.0.0 8000 --directory build/docs/sphinx
100100
```
101-
101+
102102
Then open [http://localhost:8000](http://localhost:8000).
103103
104104
This will build documentation based on current sources, so if some new changes will be made, run this command
105105
in a new terminal window to update the website source
106-
106+
107107
```
108108
cmake --build build --parallel --target sphinx
109109
```
110-
110+
111111
Then refresh your page - it should load the updated website that was just built
112112
113113
## Troubleshooting
@@ -121,7 +121,7 @@ Build failure on Ubuntu 18.04 ("relocation ..." link error) with gcc 7.4.0 (defa
121121
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 70
122122
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 70
123123
### Hunter
124-
Hunter is a CMake-only dependency manager for C/C++ projects.
124+
Hunter is a CMake-only dependency manager for C/C++ projects.
125125
126126
If you are stuck with error message which mentions external libraries (subdirectory of `.hunter`) like the following:
127127
```
@@ -145,7 +145,7 @@ del C:/[user]/.hunter
145145
146146
### LTO - link time optimization
147147
148-
If following message appears:
148+
If following message appears:
149149
```
150150
lto1: internal compiler error: in add_symbol_to_partition_1, at lto/lto-partition.c:152
151151
Please submit a full bug report,

depthai-core

Submodule depthai-core updated 37 files

docs/source/index.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ Now, pick a tutorial or code sample and start utilizing Gen2 capabilities
8585
samples/11_rgb_encoding_mono_mobilenet.rst
8686
samples/12_rgb_encoding_mono_mobilenet_depth.rst
8787
samples/13_encoding_max_limit.rst
88-
samples/14_color_camera_control.rst
88+
samples/14_1_color_camera_control.rst
89+
samples/14_2_mono_camera_control.rst
90+
samples/14_3_depth_crop_control.rst
8991
samples/15_rgb_mobilenet_4k.rst
9092
samples/16_device_queue_event.rst
9193
samples/17_video_mobilenet.rst
@@ -102,6 +104,10 @@ Now, pick a tutorial or code sample and start utilizing Gen2 capabilities
102104
samples/26_3_spatial_tiny_yolo.rst
103105
samples/27_spatial_location_calculator.rst
104106
samples/28_camera_video_example.rst
107+
samples/29_1_object_tracker.rst
108+
samples/29_2_spatial_object_tracker.rst
109+
samples/29_3_object_tracker_video.rst
110+
samples/30_stereo_depth_from_host.rst
105111

106112
.. toctree::
107113
:maxdepth: 1

docs/source/samples/09_mono_mobilenet.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Demo
1010
.. raw:: html
1111

1212
<div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
13-
<iframe src="https://www.youtube.com/embed/liTGGyJwZ_8" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
13+
<iframe src="https://www.youtube.com/embed/8Jih63NWFdI" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
1414
</div>
1515

1616
Setup

docs/source/samples/10_mono_depth_mobilenetssd.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
10 - Mono & MobilenetSSD & Encoding
2-
===================================
1+
10 - Mono & MobilenetSSD & Depth
2+
================================
33

44
This example shows how to run MobileNetv2SSD on the left grayscale camera in parallel with running
55
the disparity depth results, displaying both the depth map and the right grayscale stream, with the
@@ -11,7 +11,7 @@ Demo
1111
.. raw:: html
1212

1313
<div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
14-
<iframe src="https://www.youtube.com/embed/D_hefNl134M" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
14+
<iframe src="https://www.youtube.com/embed/aCT0CRXx1qI" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
1515
</div>
1616

1717
Setup

docs/source/samples/11_rgb_encoding_mono_mobilenet.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Demo
1818
.. raw:: html
1919

2020
<div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
21-
<iframe src="https://www.youtube.com/embed/qzwt9XXNsow" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
21+
<iframe src="https://www.youtube.com/embed/3n549_6dANo" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
2222
</div>
2323

2424
Setup

docs/source/samples/12_rgb_encoding_mono_mobilenet_depth.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Demo
2020
.. raw:: html
2121

2222
<div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
23-
<iframe src="https://www.youtube.com/embed/Yeuzo1H24KQ" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
23+
<iframe src="https://www.youtube.com/embed/3sijxVDVFY8" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
2424
</div>
2525

2626
Setup

docs/source/samples/14_color_camera_control.rst renamed to docs/source/samples/14_1_color_camera_control.rst

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
14 - Color Camera Control
2-
=========================
1+
14.1 - Color Camera Control
2+
===========================
33

44
This example shows how to controll the device-side crop and camera triggers.
55
An output is a displayed RGB cropped frame, that can be manipulated using the following keys:
@@ -9,6 +9,12 @@ An output is a displayed RGB cropped frame, that can be manipulated using the fo
99
#. `w` will move the crop up
1010
#. `s` will move the crop down
1111
#. `c` will trigger a `still` event, causing the current frame to be captured and sent over `still` output from camera node
12+
#. `t` will trigger autofocus
13+
#. `f` will trigger autofocus continuously
14+
#. `e` will trigger autoexposure
15+
#. `i` and `o` will decrease/increase the exposure time
16+
#. `k` and `l` will decrease/increase the sensitivity iso
17+
#. `,` and `.` will decrease/increase the focus range
1218

1319
Demo
1420
####
@@ -27,9 +33,9 @@ Setup
2733
Source code
2834
###########
2935

30-
Also `available on GitHub <https://github.com/luxonis/depthai-python/blob/main/examples/14_color_camera_control.py>`__
36+
Also `available on GitHub <https://github.com/luxonis/depthai-python/blob/main/examples/14_1_color_camera_control.py>`__
3137

32-
.. literalinclude:: ../../../examples/14_color_camera_control.py
38+
.. literalinclude:: ../../../examples/14_1_color_camera_control.py
3339
:language: python
3440
:linenos:
3541

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
14.2 - Mono Camera Control
2+
==========================
3+
4+
This example shows how to controll the device-side crop and camera triggers.
5+
TWo output is a displayed mono cropped frame, that can be manipulated using the following keys:
6+
7+
#. `a` will move the crop left
8+
#. `d` will move the crop right
9+
#. `w` will move the crop up
10+
#. `s` will move the crop down
11+
#. `e` will trigger autoexposure
12+
#. `i` and `o` will decrease/increase the exposure time
13+
#. `k` and `l` will decrease/increase the sensitivity iso
14+
15+
16+
Demo
17+
####
18+
19+
20+
Setup
21+
#####
22+
23+
.. include:: /includes/install_from_pypi.rst
24+
25+
Source code
26+
###########
27+
28+
Also `available on GitHub <https://github.com/luxonis/depthai-python/blob/main/examples/14_2_mono_camera_control.py>`__
29+
30+
.. literalinclude:: ../../../examples/14_2_mono_camera_control.py
31+
:language: python
32+
:linenos:
33+
34+
.. include:: /includes/footer-short.rst

0 commit comments

Comments
 (0)